[WIP] Batching

Closes #282
I wonder if this is the best identifier now? :/