Bridge Over Troubled Water

I'm still working on the movement of the units. I want to permit up to 5 waypoints to the players, which is even too much.
Then I'll proceed to finish the processing of the movement between turns.