Just got a ton of stuff done.
Good enough, preparing to merge
Pushing so I can compile on Linux