Making progress on heater
Still broken