started on the collision

thsi is the last commit for tonight