new calibration stuff almost done

Change-Id: Ice4e2d4bfe8cf18d2268ad9d929783af51479867