Finished Collision work

Finished collision work. Work on converting and integrating Todd’s
stuff underway