diff --git a/packages/energy/energy.yaml b/packages/energy/energy.yaml
index 5ab18b4..8d19c15 100644
--- a/packages/energy/energy.yaml
+++ b/packages/energy/energy.yaml
@@ -3,12 +3,18 @@
 # -----------------------------------------------------------------------------
 # Energy Integration Sensor
 sensor:
-  - name: envoy_total_energy
+  - name: Envoy Total Energy
     platform: integration
     source: sensor.envoy_202221032900_current_power_production
     unit_prefix: k
     unit_time: h
 
+  - name: Home Total Energy
+    platform: integration
+    source: sensor.home_power_consumption
+    unit_prefix: k
+    unit_time: h
+
 # -----------------------------------------------------------------------------
 # Average Panel Power Sensor
   - name: Envoy Inverter Average Power
@@ -393,3 +399,28 @@ template:
               ) | round(1)
           }}
         {% endif %}
+
+# -----------------------------------------------------------------------------
+# Emporia Vue To/From Grid Sensors
+    - name: Emporia Vue Net Power From Grid
+      unit_of_measurement: W
+      state: >
+        {% set net_power = states('sensor.emporia_d937d0_1min')|float %}{{
+          iif(net_power > 0, net_power, 0)
+        }}
+
+    - name: Emporia Vue Net Power To Grid
+      unit_of_measurement: W
+      state: >
+        {% set net_power = states('sensor.emporia_d937d0_1min')|float %}{{
+          iif(net_power < 0, -net_power, 0)
+        }}
+
+# -----------------------------------------------------------------------------
+# Home Total Power Consumption Sensor
+    - name: Home Power Consumption
+      unit_of_measurement: W
+      state: "{{ 
+          state('sensor.envoy_202221032900_current_power_production)|float 
+        + state('sensor.emporia_d937d0_1min')|float
+      }}"
\ No newline at end of file
diff --git a/packages/energy/energy.yaml.j2 b/packages/energy/energy.yaml.j2
index 8319d55..072dd87 100644
--- a/packages/energy/energy.yaml.j2
+++ b/packages/energy/energy.yaml.j2
@@ -1,14 +1,32 @@
 # Energy Package
 
 # -----------------------------------------------------------------------------
-# Energy Integration Sensor
+# Energy Integration Sensors
 sensor:
-  - name: envoy_total_energy
+  - name: Envoy Total Energy
     platform: integration
     source: sensor.envoy_202221032900_current_power_production
     unit_prefix: k
     unit_time: h
 
+  - name: Total Energy From Grid
+    platform: integration
+    source: sensor.emporia_vue_net_power_from_grid
+    unit_prefix: k
+    unit_time: h
+
+  - name: Total Energy To Grid
+    platform: integration
+    source: sensor.emporia_vue_net_power_to_grid
+    unit_prefix: k
+    unit_time: h
+
+  - name: Home Total Energy
+    platform: integration
+    source: sensor.home_power_consumption
+    unit_prefix: k
+    unit_time: h
+
 # -----------------------------------------------------------------------------
 # Average Panel Power Sensor
   - name: Envoy Inverter Average Power
@@ -45,3 +63,27 @@ template:
           }}
         {% endif %}
 [% endfor %]
+# -----------------------------------------------------------------------------
+# Emporia Vue To/From Grid Sensors
+    - name: Emporia Vue Net Power From Grid
+      unit_of_measurement: W
+      state: >
+        {% set net_power = states('sensor.emporia_d937d0_1min')|float %}{{
+          iif(net_power > 0, net_power, 0)
+        }}
+
+    - name: Emporia Vue Net Power To Grid
+      unit_of_measurement: W
+      state: >
+        {% set net_power = states('sensor.emporia_d937d0_1min')|float %}{{
+          iif(net_power < 0, -net_power, 0)
+        }}
+
+# -----------------------------------------------------------------------------
+# Home Total Power Consumption Sensor
+    - name: Home Power Consumption
+      unit_of_measurement: W
+      state: "{{ 
+          state('sensor.envoy_202221032900_current_power_production)|float 
+        + state('sensor.emporia_d937d0_1min')|float
+      }}"