WIP: adding heat support

initial heat support