started refactoring out Calibrator
updated interfaces
regenerified through PM optimizer