Add some sort of collision detection