Working towards functional navs.

Not quite done…