First pass at randomized waypoints
Merge branch 'features/randomize-waypoints'