Most functionality alive.
Last changes for calibration.