Add circle with odometry movement, tweak move square/circle with no odometry.