Handle calibration on model layer instead of at controller / display #20