New navigation stuff complete.