Added a bunch of stuff, mostly WIP