#78 Can add more waypoints with waypoint list (Arragement undone)