Sorting out a few Stuff. Considering rewrite of Heat handling