Collision

- redoing all of it