Got batches being set correctly at upload. Now need to take care of them on delete, etc