Fixed workspace xml. Added Calibration work, in progress.