Updated Collisions

Collisions now work!