Add SquareCollision
Refactor Collisions