Reorganized a bit, working on now working stuff

Bleeble blargh