Renamed aggregate stuff to batch. Added completion to batches so that they don't get sent in case of exception