calibration compiles but it does not work as expected. commit before cleaning out stuff

Change-Id: I6575fdda2243f70c0e00b6bf7e7536c9e66c54dc