Refactored WaypointGraph to be static
Merging