Add basic collision detection again