End of basic Waypoint refactoring