diff --git a/aquapi_config.yaml b/aquapi_config.yaml
index d79a0ee..679b259 100644
--- a/aquapi_config.yaml
+++ b/aquapi_config.yaml
@@ -1,9 +1,9 @@
 substitutions:
   # names
   name: "aquapi"
-  friendly_name: "AquaPi"
+  friendly_name: "AquaPi TEST"
   # App Version - Updated: 11/2023
-  app_version: "1.6"
+  app_version: "1.6.1-test"
 
 packages:
   device_base: !include common/device_base.yaml
@@ -20,4 +20,4 @@ packages:
   # ezo_pmp_extra: !include common/ezo_pmp_extra.yaml
   ezo_pmp_change: !include common/ezo_pmp_change.yaml
   # ezo_commands: !include common/ezo_commands.yaml
-  # debug: !include common/debug.yaml
+  debug: !include common/debug.yaml
\ No newline at end of file
diff --git a/aquapi_config_build.yaml b/aquapi_config_build.yaml
new file mode 100644
index 0000000..d79a0ee
--- /dev/null
+++ b/aquapi_config_build.yaml
@@ -0,0 +1,23 @@
+substitutions:
+  # names
+  name: "aquapi"
+  friendly_name: "AquaPi"
+  # App Version - Updated: 11/2023
+  app_version: "1.6"
+
+packages:
+  device_base: !include common/device_base.yaml
+  aquapi: !include common/aquapi.yaml
+  dallas: !include common/temperature_dallas.yaml
+  binary: !include common/binary.yaml
+  ezo_ph: !include common/ezo_ph.yaml
+  ezo_ec: !include common/ezo_ec.yaml
+  # ezo_hum: !include common/ezo_hum.yaml
+  # ezo_rtd: !include common/ezo_rtd.yaml
+  ezo_co2: !include common/ezo_co2.yaml
+  # ezo_do: !include common/ezo_do.yaml
+  ezo_pmp: !include common/ezo_pmp.yaml
+  # ezo_pmp_extra: !include common/ezo_pmp_extra.yaml
+  ezo_pmp_change: !include common/ezo_pmp_change.yaml
+  # ezo_commands: !include common/ezo_commands.yaml
+  # debug: !include common/debug.yaml
diff --git a/common/binary.yaml b/common/binary.yaml
index c3a48b5..2fa5522 100644
--- a/common/binary.yaml
+++ b/common/binary.yaml
@@ -16,7 +16,7 @@ binary_sensor:
   # Optical Sensor - LOW (yellow)
   - platform: gpio
     id: os_low
-    disabled_by_default: true
+    # disabled_by_default: true
     pin: 
       number: ${opticalLowPin}
       inverted: true
@@ -33,7 +33,7 @@ binary_sensor:
   # Optical Sensor - HIGH (blue)
   - platform: gpio
     id: os_high
-    disabled_by_default: true
+    # disabled_by_default: true
     pin: 
       number: ${opticalHighPin}
       inverted: true
diff --git a/common/ezo_pmp.yaml b/common/ezo_pmp.yaml
index 0c8dac9..f03fa57 100644
--- a/common/ezo_pmp.yaml
+++ b/common/ezo_pmp.yaml
@@ -65,6 +65,7 @@ sensor:
       icon: mdi:cube-scan
       device_class: 'volume'
       unit_of_measurement: 'mL'
+      state_class: total
   - platform: ezo_pmp
     id: ezo_pump
     total_volume_dosed:
@@ -81,6 +82,7 @@ sensor:
       name: Pump - Absolute Total Volume Dosed
       icon: mdi:timer-sand-full
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump
@@ -89,6 +91,7 @@ sensor:
       name: Pump - Last Volume Requested
       icon: mdi:history
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump
diff --git a/common/ezo_pmp_change.yaml b/common/ezo_pmp_change.yaml
index 187fd7f..aa7e814 100644
--- a/common/ezo_pmp_change.yaml
+++ b/common/ezo_pmp_change.yaml
@@ -142,6 +142,7 @@ sensor:
       name: Pump Waste - Current Volume Dosed
       icon: mdi:cube-scan
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_waste
@@ -159,6 +160,7 @@ sensor:
       name: Pump Waste - Absolute Total Volume Dosed
       icon: mdi:timer-sand-full
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_waste
@@ -166,6 +168,7 @@ sensor:
       id: last_volume_requested_waste
       name: Pump Waste - Last Volume Requested
       icon: mdi:history
+      state_class: total
       device_class: 'volume'
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
@@ -189,6 +192,7 @@ sensor:
       name: Pump Clean - Current Volume Dosed
       icon: mdi:cube-scan
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_clean
@@ -206,6 +210,7 @@ sensor:
       name: Pump Clean - Absolute Total Volume Dosed
       icon: mdi:timer-sand-full
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_clean
@@ -214,6 +219,7 @@ sensor:
       name: Pump Clean - Last Volume Requested
       icon: mdi:history
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_clean
diff --git a/common/ezo_pmp_extra.yaml b/common/ezo_pmp_extra.yaml
index f185e4b..8f92a3e 100644
--- a/common/ezo_pmp_extra.yaml
+++ b/common/ezo_pmp_extra.yaml
@@ -64,6 +64,7 @@ sensor:
       name: Pump 2 - Current Volume Dosed
       icon: mdi:cube-scan
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_2
@@ -81,6 +82,7 @@ sensor:
       name: Pump 2 - Absolute Total Volume Dosed
       icon: mdi:timer-sand-full
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_2
@@ -89,6 +91,7 @@ sensor:
       name: Pump 2 - Last Volume Requested
       icon: mdi:history
       device_class: 'volume'
+      state_class: total
       unit_of_measurement: 'mL'
   - platform: ezo_pmp
     id: ezo_pump_2