Added a bunch of stuff
Removed a bunch of stuff