@Matt it’s Ok, mostly working.
I woke up at 12:40am and checked if all was working .
It wasn’t and went to check it found another trigger based upon the Demand variable had not been fixed - fixed it worked but still having issue with detecting the heating is on so graphing still out and not setting Heating on Flg for displays using a Control Pages not working, so got to hunt those down today.
Much happier wife today as shower was hot.
So progress.