Think this is too big a change for this one. Not sure we can make it work without really replumbing all the logic of the unit batcher.