Waypoints

Waypoints Issue No. 2