Adds first pass at secondary calibration support