Flashing out the structure of the Calibraiton class some more. A number of methods still need to be implemented though.