Sort it out as part of #2
Hooking up URLs for #2