Move to use names
Use url template in preference to harcoded urls
More urls added
More use of url template
Merge branch 'namedurls' into next