Igcs 21 inflight waypoint selection

Not quite merge ready, but would appreciate a checkpoint review if you can...