Did first round of cleanups, including beginning of navigation