WIP: a little bit more on batch engine