Major changes

Switching to using SystemHeat for heat management