Added copy in upload, ugly but first step.
Also remove hack in passing things back from async tasks