Collision Detection Work

Worked on fixing the collision detection. Still many bugs