Add client side collision detection