Added Heater machine and laid out groundwork