new navigation complete, a few bugs more to fix