Chopped out bad bits, replaced with Go net/url stuff, passing tests