Added bit of framework for catapult and arms
Merge origin/master