navigator controller now controls total route logic
fixed merge conflict