Made heating function additive to correct issue with overlapping events
Heating now additive rather than interrupting current event when new event starts; allows for heating envelope