Route refactor
Merge conflict resolution
Fixed waypoints