Continued CollisionDetectionRefactor, fixed critical bug.