Add a bunch of stuff

Stuff works better now. Not done though.