Waypoints

Issue No. 1