Collision work, still a WIP. Needs more Mark!