Collision Detection

Changes to Collision Detection