New navigation stuff complete.
Merge with Abe's Dev branch