Collision engine

Completely revamp how we do steps