WIP: mostly working uploader...