Mbst 9893 more granular uploads

Really? It's pretty much the only thing this method does... This is getting refactored as part of the tasks work anyhow.