diff --git a/components/packages/batteries/zwave_batteries.yaml b/components/packages/batteries/zwave_batteries.yaml
index 31776ec..d254743 100644
--- a/components/packages/batteries/zwave_batteries.yaml
+++ b/components/packages/batteries/zwave_batteries.yaml
@@ -15,4 +15,4 @@ sensor:
       - sensor.boys_room_multisensor_battery_level
       - sensor.dining_room_multisensor_battery_level
       - sensor.furnace_room_water_sensor_battery_level
-      - sensor.zwave_remote_battery_level
+      - sensor.z_wave_remote_battery_level
diff --git a/components/packages/imap.yaml b/components/packages/imap.yaml
index 986d2a8..cacbd71 100644
--- a/components/packages/imap.yaml
+++ b/components/packages/imap.yaml
@@ -40,6 +40,12 @@ template:
           Return-Path: "{{ trigger.event.data['headers'].get('Return-Path',['n/a'])[0] }}"
           Received-first: "{{ trigger.event.data['headers'].get('Received',['n/a'])[0] }}"
           Received-last: "{{ trigger.event.data['headers'].get('Received',['n/a'])[-1] }}"
+      # - name: PNC Balance
+      #   default_entity_id: sensor.pnc_balance
+      #   unique_id: 741fc355-76da-4a14-8c31-8d9b94bd4376
+      #   availability: "{{ states('sensor.balance_alert_messages') not in ['unknown', 'unavailable'] }}"
+      #   state: >
+      #     {{ trigger.event.data["text"] | regex_findall_index("\ x7491:\* \$([0-9.]+)") }}
     binary_sensor:
       - name: Low Balance
         device_class: problem
diff --git a/esphome/archive/circuit-sensor.yaml b/esphome/backup/circuit-sensor.yaml
similarity index 100%
rename from esphome/archive/circuit-sensor.yaml
rename to esphome/backup/circuit-sensor.yaml
diff --git a/esphome/archive/front-yard-plant-monitor.yaml b/esphome/backup/front-yard-plant-monitor.yaml
similarity index 100%
rename from esphome/archive/front-yard-plant-monitor.yaml
rename to esphome/backup/front-yard-plant-monitor.yaml
diff --git a/esphome/archive/full-power-monitor.yaml b/esphome/backup/full-power-monitor.yaml
similarity index 100%
rename from esphome/archive/full-power-monitor.yaml
rename to esphome/backup/full-power-monitor.yaml
diff --git a/esphome/archive/furnace-room-multisensor.yaml b/esphome/backup/furnace-room-multisensor.yaml
similarity index 100%
rename from esphome/archive/furnace-room-multisensor.yaml
rename to esphome/backup/furnace-room-multisensor.yaml
diff --git a/esphome/archive/hvac-multisensor-old.yaml b/esphome/backup/hvac-multisensor-old.yaml
similarity index 100%
rename from esphome/archive/hvac-multisensor-old.yaml
rename to esphome/backup/hvac-multisensor-old.yaml
diff --git a/esphome/archive/hvac-multisensor.yaml b/esphome/backup/hvac-multisensor.yaml
similarity index 100%
rename from esphome/archive/hvac-multisensor.yaml
rename to esphome/backup/hvac-multisensor.yaml
diff --git a/esphome/archive/kitchen-appliance-temps.yaml b/esphome/backup/kitchen-appliance-temps.yaml
similarity index 100%
rename from esphome/archive/kitchen-appliance-temps.yaml
rename to esphome/backup/kitchen-appliance-temps.yaml
diff --git a/esphome/archive/master-bed.yaml b/esphome/backup/master-bed.yaml
similarity index 100%
rename from esphome/archive/master-bed.yaml
rename to esphome/backup/master-bed.yaml
diff --git a/esphome/archive/new-furnace-room-multisensor.yaml b/esphome/backup/new-furnace-room-multisensor.yaml
similarity index 100%
rename from esphome/archive/new-furnace-room-multisensor.yaml
rename to esphome/backup/new-furnace-room-multisensor.yaml
diff --git a/esphome/archive/power-monitor-cs.yaml b/esphome/backup/power-monitor-cs.yaml
similarity index 100%
rename from esphome/archive/power-monitor-cs.yaml
rename to esphome/backup/power-monitor-cs.yaml
diff --git a/esphome/archive/power-monitor.yaml b/esphome/backup/power-monitor.yaml
similarity index 100%
rename from esphome/archive/power-monitor.yaml
rename to esphome/backup/power-monitor.yaml
diff --git a/esphome/archive/to-dining-room-or-garage.yaml b/esphome/backup/to-dining-room-or-garage.yaml
similarity index 100%
rename from esphome/archive/to-dining-room-or-garage.yaml
rename to esphome/backup/to-dining-room-or-garage.yaml
diff --git a/esphome/archive/water-softener-multisensor.yaml b/esphome/backup/water-softener-multisensor.yaml
similarity index 100%
rename from esphome/archive/water-softener-multisensor.yaml
rename to esphome/backup/water-softener-multisensor.yaml
diff --git a/esphome/archive/white-bed.yaml b/esphome/backup/white-bed.yaml
similarity index 100%
rename from esphome/archive/white-bed.yaml
rename to esphome/backup/white-bed.yaml
diff --git a/esphome/home-assistant-voice-097b44.yaml b/esphome/home-assistant-voice-097b44.yaml
index efccaa3..d24cd6f 100644
--- a/esphome/home-assistant-voice-097b44.yaml
+++ b/esphome/home-assistant-voice-097b44.yaml
@@ -21,12 +21,11 @@ api:
   encryption:
     key: !secret api-encryption-key
 
-ota:
-  - platform: esphome
-    password: !secret ota-password
-
 captive_portal:
 
+ota:
+  - id: !remove ota_esphome
+
 button:
   - id: !remove local_restart_button
 
diff --git a/esphome/vehicle-sensor.yaml b/esphome/vehicle-sensor.yaml
new file mode 100644
index 0000000..2d62998
--- /dev/null
+++ b/esphome/vehicle-sensor.yaml
@@ -0,0 +1,68 @@
+# Board: ESP32 DevKit V1 (Espressif)
+# Definition: definitions/boards/esp32-devkit-v1/manifest.yaml
+
+esphome:
+  name: vehicle-sensor
+  friendly_name: vehicle-sensor
+
+esp32:
+  variant: esp32
+  flash_size: 4MB
+  framework:
+    type: esp-idf
+
+logger:
+
+api:
+  encryption:
+    key: "e2u3+AiW0fFvHzQJTYe2wizTa73H/03NUBAjlkElFhU="
+
+ota:
+  - platform: esphome
+
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+  ap:
+    ssid: ${friendly_name
+    password: !secret fallback_ap_password
+substitutions:
+  devicename: vehicle-sensor
+  entity_name: vehicle_sensor
+  friendly_name: Vehicle Sensor
+  comment: Clever Vehicle Sensor
+
+captive_portal:
+
+sensor:
+  - platform: ultrasonic
+    name: Car Sensor East Side
+    internal: true
+    echo_pin: GPIO16
+    trigger_pin: GPIO17
+    id: sensor_ultrasonic_1
+    timeout: 4.0m
+    update_interval: 0.5s
+    filters:
+      - or:
+        - throttle_average: 30s
+        - delta: 0.5
+      - sliding_window_moving_average:
+          window_size: 5
+          send_every: 5
+      - delta: 0.0254    
+
+  - platform: ultrasonic
+    name: Car Sensor West Side
+    internal: true
+    echo_pin: GPIO25
+    trigger_pin: GPIO26
+    id: sensor_ultrasonic_2
+    filters:
+      - or:
+        - throttle_average: 30s
+        - delta: 0.5
+      - sliding_window_moving_average:
+          window_size: 5
+          send_every: 5
+      - delta: 0.0254