2013-07-15 - Jonathan Morgan - refined dealing with URLs, pushed that up to class.