Mbst 9893 more granular uploads

Ah, yes, that would be sensible.