JC: added batch_num to model and more CN. spec passes except for step integration.