Put it in a useable state, for now
Really fixed it

I did what I was supposed to do in the previous commit. :P