Collisions are fixed

Collisions work!