Moving Correctly with Shapes

Rotations near completion