Modified to be able to add waypoints to when creating maps