Commits Stuff
Commits Meh
Changes
Merging back to master