More progress on batching.
Merge pull request #4 from jordandukart/7.x

More progress on batching.