Fixed intake API to follow standards
Improves to catapult, focused on testing.