s3 subject uploads

Take the head commit to fix the issue if you want. The rebase merge was a bit too much for me.