Wip: renamed Calibrate
wip: converting to N-D