More experimental catapult code

Catapult code experimental for adjusting it. If someone has a better
way, please change.