Some more nav work.