Work on new waypoint provider