Navigation overhaul. Fully func now