Finishing rough draft of collision detection and response