Change so Waypoints are the same across maps, and offline waypoints get appeneded to the end of the MAV's waypoint list on connect