Move waypoints to own class to add options
Retain waypoint options
Fix uturn url building