Moved into IronmanActivity
Updates to add more basic shapes