Started work on waypoints