Progress towards fixing .3y285gi

Checkpoint: I've written a ton of code, and it is compiling and hasn't
broken the world, but not tested yet.