New navigation

huuuuuuuge refactor.