More work on navs.. we really need a better one