TESTING:
  * added new routing options
  * commented out some functions while remodeling occurs