Added calibration stuff to framework, now only need to use it