Last Commit For Tonight

It's late and I have work in about 8 hours. Fixed a bunch of stuff, but
there's still a lot of errors and no useful tests.