Downloader now works again, made abstraction better
Uploader seems to work