Re-working url templating