Collision detection finally working