Batchman v2

Brings batchman into the 21st century!