Initial re-nav work
Add in-flight nav work