Got navigation working with sessions, mostly