Big refactoring of calibration ...
I don't claim it works but it has been heavily refactored