Batching

Closes #282
Doesn't need to be part of this PR though...