Added a lot of stuff
Merge