redo nav, start implementing controller