Lots of changes, still doesn't quite work, but it is an improvment

- Added the stupid value classes, I may remove them before deployment
- refactored navigation.py to include the name changes.
- updated requirements.txt to include the changes.