moved waypoint picking into it's own method