Thermal storage is now a native option for CHW. Not sure how to do HHW, though heating TES doesn't typically never saves energy, just cost dependent on the pricing structure, which is usually the opposite of heating, so I'm not sure what the purpose would be.