Began adding retreat functions to MovementCalculator with Shaung - push.
Merge origin/master