All rejiggered per Adam's feedback to avoid race condition.  Just need to update batch message for user feedback.