Collision and integration work underway

Have shown with a basic test that collisions work. Working on
integrating Todd’s code. Still a lot to do with collisions.
Forgot a file