Added all the things
Merged