Miscellaneous refactoring of code to continue hooking up the different calibration routines