Finish up dev of heat work