I screwed up a lot of things. Nuking the last few commits