improving nav… but also this is getting jumbled.

this is where a little object-orientation goes a long way… i think?