Initial work to add batch calibration