Heat

Final review for unit test