navigation logic refinement begun