waypoint class extended