Support batched events. This commit got out of control