Changed method prototypes, removed structs. Added calibration