Added waypoint idea.