Intermediate commit of Route Planner changes
Implement route memory management