Thermal module prelim commit (Issue #167)