Added to catapult and added commenting and renamed stuff
renaming
Merge origin/master