Collision detection finally works