Finally fixed merge
Dealt with: calibration, turning.
TO deal with: riding.
Unmakeable in 2 days: waltz.
Added moving by vector