Updates to get waypoint config working.
Updates to get waypoint config working.