diff --git a/pymyenergi/cli.py b/pymyenergi/cli.py
index 22d3b5e..d092d1f 100644
--- a/pymyenergi/cli.py
+++ b/pymyenergi/cli.py
@@ -11,6 +11,8 @@
 from pymyenergi.exceptions import WrongCredentials
 from pymyenergi.zappi import CHARGE_MODES
 
+from . import HARVI
+
 logging.basicConfig()
 logging.root.setLevel(logging.WARNING)
 
@@ -46,11 +48,11 @@ async def main(args):
             out = out + f"Energy diverted  : {client.energy_diverted/1000:.2f}kWh\n"
             out = out + "Devices:\n"
             for device in devices:
-                out = out + f"  {device.kind.capitalize()}: {device.name}\n"
+                out = out + f"  {device.kind.capitalize()}: {device.name}"
+                if device.kind != HARVI:
+                    out = out + f"\t{device.energy_total}Wh today"
+                out = out + "\n"
             print(out)
-            await client.refresh_history_today()
-            energy = client.get_energy_totals()
-            print(energy)
         elif args.command in ["zappi", "eddi", "harvi"]:
             device = device_factory(conn, args.command, args.serial)
             await device.refresh()
diff --git a/pymyenergi/eddi.py b/pymyenergi/eddi.py
index 419ee33..86cbf59 100644
--- a/pymyenergi/eddi.py
+++ b/pymyenergi/eddi.py
@@ -47,6 +47,16 @@ def power_generated(self):
         """Generated power in W"""
         return self._data.get("gen", 0)
 
+    @property
+    def energy_total(self):
+        """Device total energy from history data"""
+        return self.history_data.get("device_total", 0)
+
+    @property
+    def energy_diverted(self):
+        """Device diverted energy from history data"""
+        return self.history_data.get("device_diverted", 0)
+
     async def stop(self):
         """Stop diverting"""
         await self._connection.get(f"/cgi-eddi-mode-E{self._serialno}-0-0-0-0000")
diff --git a/pymyenergi/zappi.py b/pymyenergi/zappi.py
index 6885f41..fe0c132 100644
--- a/pymyenergi/zappi.py
+++ b/pymyenergi/zappi.py
@@ -150,6 +150,16 @@ def smart_boost_amount(self):
         """Smart boost amount of energy to add"""
         return self._data.get("sbk", -1)
 
+    @property
+    def energy_total(self):
+        """Device total energy from history data"""
+        return self.history_data.get("device_total", 0)
+
+    @property
+    def energy_diverted(self):
+        """Device diverted energy from history data"""
+        return self.history_data.get("device_diverted", 0)
+
     # @property
     # def boost_start_hour(self):
     #     """Boost starting at hour ??"""
diff --git a/setup.py b/setup.py
index b67ad54..9edbd66 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="pymyenergi",
-    version="0.0.10",
+    version="0.0.11",
     author="Johan Isaksson",
     author_email="johan@generatorhallen.se",
     description="Python library and CLI for communicating with myenergi API.",