Heat refactor passes 'tests'