Collisions

Started with collision calculations