Rewrite DownloadUrl code to be not silly goose