Batching

Closes #282
which one?