Latest WIP on the contact thermo