Calibration pretty much working now