Batching

[WIP]