Based on groundwork by @natecook1000 Not yet ready for commit until we figure out the source compatibility/migration story. Tests are mostly fixed up, except for things like hard-coded mangled name...