Getting things to compile, finish raw calibration