[WIP] Batch custom step