Add a bunch of stuff

I'm not really sure what was added.