Working draft, including s3 upload