nav in place, need to refactor