Collisions

Collisions now obey conservation of momentum