Bring Back Batchman v2

Reverts peterhurford/batchman#4