This is very rough still. The calibration code is entirely untested.
This allows us to match the new mockups from Allan.