Tidy up summary printing
Add rules for testing heat
Seems to be working, more testing necessary