The navigation is now completely dynamic.. We can do some clean up code to the routes but she works!