Routes module done and tested.  Refactoring done for now