Moving nav state from commander to navigator, WIP