CHG: MAJOR CHANGES to calibration, porting to Calibraion2
	broke a ton of stuff