[WIP] Batching

Closes #282
Yay, better identifiers.