Firstly, GREAT job with the new Energy features.
We have Electricity, Gas and two Water supplies (Drinking & Recycled). It would be great to be able track these other commodities equally along side Electricity.
I support. It is also good to display the value of each consumer