WIP version of uploading