Added a bunch of stuff
I don't even remember.