More work on collision detection/damage