Even more work on the nav