wip: more nav rewriting