[WIP] Batching

Closes #282