nav in progress
nav work, updates, fix merge conflicts