working on nav
working on nav, dealing with conflicts