Continued work on collision detection