Refactoring; routes now being assembled - sorta