Working on the upload wrapper