Added CollisionDetector that determines directions and such
fixed merge conflicts