more reworking nav, tho it's junk