Moving things around, adding calibration