Maybe fixed Ryan's code
Merge https://github.com/clifferice3/SmartNav