refactor, making urls