work on url generation.
Merge branch 'urls-2'