WIP - Uploader

Please don't merge this.