Yeah. I also renamed completedBatches to retainedCompletedBatches for semantic consistency. Have to put in the "completed" to differentiate from runningBatches, and waitingBatches.