New feature: resolve short urls.

Step 4: Make it optional.