navigation consolidation (still in progress)