Adds the calendar batcher

Closes #169