Mbst 9893 more granular uploads

That may tidy it up somewhat, yeah. This class is one of the major candidates for refactoring - the granular changes hit it hard unfortunately.