Added ability to add URLs and fixed the URLS.
A couple of TODOs