Catapult code fixed. Now with new timer capabilities!