Tukaiz develop

I think this is a good idea and may be part of a larger refactoring to the Nav class if change presents itself (as you will see in the new pull request, I have some more classes hard coded in...not ideal)