finished new catapult code development