in progress route refactoring