#653 - minor refactoring
#653 - beginning of updates
#653 - updates for thermal storage capacity
#653 - updates for thermal storage capacity