diff --git a/config/binary_sensors/motion.yaml b/config/binary_sensors/motion.yaml
index 65b1712..b07c968 100755
--- a/config/binary_sensors/motion.yaml
+++ b/config/binary_sensors/motion.yaml
@@ -10,4 +10,10 @@
 #   command: 'pidof vlc | wc -l'
 #   payload_on: 1
 #   payload_off: 0
-#   scan_interval: 10
\ No newline at end of file
+#   scan_interval: 10
+
+- platform: aarlo
+  monitored_conditions:
+  - motion
+  - sound
+  - ding
\ No newline at end of file
diff --git a/config/configuration.yaml b/config/configuration.yaml
index c31124a..5cc38c5 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -66,14 +66,28 @@ google:
   client_id: !secret google_client_id
   client_secret: !secret google_client_secret
 
-arlo:
-  username: !secret arlo_user
-  password: !secret arlo_pass
+# arlo:
+#   username: !secret arlo_user
+#   password: !secret arlo_pass
 
 alarm_control_panel:
-  - platform: arlo
+  # - platform: arlo
+  #   home_mode_name: home
+  #   away_mode_name: armed
+  - platform: aarlo
     home_mode_name: home
-    away_mode_name: armed
+    away_mode_name: Armed
+
+# Using the HACS Arlo Integration 
+aarlo:
+  username: !secret arlo_user
+  password: !secret arlo_pass
+  db_motion_time: 30
+  db_ding_time: 10
+  recent_time: 10
+  last_format: '%m-%d %H:%M'
+  refresh_devices_every: 2
+  
 
 discovery:
   ignore:
@@ -124,7 +138,9 @@ camera:
   - platform: mjpeg
     name: Garage Door Cam 
     mjpeg_url: !secret garage_cam
-  - platform: arlo
+  # - platform: arlo
+  #   ffmpeg_arguments: '-pred 1 -q:v 2'
+  - platform: aarlo
     ffmpeg_arguments: '-pred 1 -q:v 2'
     
 ffmpeg:
@@ -165,6 +181,25 @@ group: !include groups.yaml
 # automation: !include automations.yaml
 # script: !include scripts.yaml
 
+proximity:
+  home_jeff:
+    devices:
+      - device_tracker.life360_jeffrey_stone
+    zone: home
+    tolerance: 5
+    unit_of_measurement: mi
+  home_kat:
+    devices:
+      - device_tracker.life360_kat_stone
+    zone: home
+    tolerance: 5
+    unit_of_measurement: mi
+
+# Using the HACS Daily Snapshot Clean Up Plugin 
+clean_up_snapshots_service:
+  host: !secret snapshot_url
+  token: !secret snapshot_token
+  number_of_snapshots_to_keep: 3
 
 ### Includes ###
 alert: !include_dir_merge_named alerts/
diff --git a/config/packages/daily.yaml b/config/packages/daily.yaml
index 6b1d2ed..5752d85 100755
--- a/config/packages/daily.yaml
+++ b/config/packages/daily.yaml
@@ -5,14 +5,27 @@
 #   @description    :   Maint Automation that occurs every day
 ###############################################################################
 automation:
-  # Reset Daily Weather Alerts at 3am
-  - id: reset_weather_alerts
-    alias: Reset Weather Alerts
-    initial_state: true
-    trigger:
+  # # Reset Daily Weather Alerts at 3am -> Replaced with better solution in weather_alerts_nws.yaml
+  # - id: reset_weather_alerts
+  #   alias: Reset Weather Alerts
+  #   initial_state: true
+  #   trigger:
+  #   - platform: time
+  #     at: '03:00:01'
+  #   action:
+  #   - service: input_boolean.turn_off
+  #     entity_id: input_boolean.freeze_warning
+
+  # Using the HACS Daily Snapshot Clean Up Plugin 
+  - id: daily_snapshot_clean_up
+    alias: Daily snapshot clean up
+    initial_state: 'on'
+    trigger: 
     - platform: time
-      at: '03:00:01'
+      at: '03:00:00'
+    condition:
     action:
-    - service: input_boolean.turn_off
-      entity_id: input_boolean.freeze_warning
+      - service: clean_up_snapshots_service.clean_up
+
+
     
\ No newline at end of file
diff --git a/config/sensors/house.yaml b/config/sensors/house.yaml
index c47d9f5..5c973b6 100755
--- a/config/sensors/house.yaml
+++ b/config/sensors/house.yaml
@@ -73,13 +73,13 @@
   - sensor.living_room_temperature
   - sensor.master_bedroom_temperature
   - sensor.skylar_room_temperature
-- platform: arlo
-  monitored_conditions:
-  - captured_today
-  - last_capture
-  - total_cameras
-  - battery_level
-  - signal_strength
+# - platform: arlo
+#   monitored_conditions:
+#   - captured_today
+#   - last_capture
+#   - total_cameras
+#   - battery_level
+#   - signal_strength
 - platform: history_stats
   name: Outside Lights
   entity_id: group.outside_lights
@@ -123,6 +123,13 @@
   end: '{{ now() }}'
   duration:
     days: 30
+- platform: aarlo
+  monitored_conditions:
+  - last_capture
+  - total_cameras
+  - battery_level
+  - captured_today
+  - signal_strength
 - platform: template
   sensors:
     sensor_count: