almost done with the new calibration stuff

Change-Id: If43d3ef0c10e9ab06f25e1a31bcbbc8eafdfa5d0