New feature: resolve short urls. (Work in Progress)

Step 2: Refactoring