I broke a lot of things

I broke a lot of things this update. See README for stuff that's broken.