Encoding net/url wasn't working for some reason, so I've dropped back to strings as realistically that's actually what I was storing.
Fixed a circular reference  which was causing the encoded to spin endlessly
Removed some debug
Reduced a slightly silly version wrapper, pending removal