Batcher: add more TODO's; see #19