diff --git a/automations/frigate/frigate_notification_testing.yaml b/automations/frigate/frigate_notification_testing.yaml
deleted file mode 100644
index 6db70c4..0000000
--- a/automations/frigate/frigate_notification_testing.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-alias: Frigate Notification Testing
-id: automation_frigate_notification_testing
-mode: single
-max_exceeded: silent
-
-trigger:
-  platform: mqtt
-  topic: frigate/events
-
-condition:
-  - condition: or
-    conditions:
-    - "{{ 'driveway' in trigger.payload_json['after']['entered_zones'] }}"
-    - "{{ 'from_street' in trigger.payload_json['after']['entered_zones'] }}"
-  - "{{ trigger.payload_json['after']['label'] == 'person' }}"
-  - "{{ is_state('input_boolean.outdoor_snapshots','on') }}"
-
-action:
-
-  - choose:
-      - conditions:
-        - "{{ 'driveway' in trigger.payload_json['after']['entered_zones'] }}"
-        - "{{ 'from_street' in trigger.payload_json['after']['entered_zones'] }}"
-        - "{{ trigger.payload_json['after']['top_score'] > 0.80 }}"
-        - "{{ not 'garage' in trigger.payload_json['before']['current_zones'] }}"
-        sequence:
-        - service: notify.mobile_app_pixel_7
-          data_template:
-            message: 'A {{trigger.payload_json["after"]["label"]}} entered the driveway.'
-            data:
-              image: 'https://automation.clintweaver.com/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/thumbnail.jpg?format=android'
-              tag: '{{trigger.payload_json["after"]["id"]}}'
-              when: '{{trigger.payload_json["after"]["start_time"]|int}}'
-
-  - delay: '00:00:05'
diff --git a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml
index 1558f60..170275b 100644
--- a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml
+++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml
@@ -27,13 +27,13 @@ action:
           target:
             entity_id: media_player.master_bedroom_clock
           data:
-            media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
+            media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm/thunderstorm.mp3
             media_content_type: audio/mpeg
     default:
       - service: media_player.play_media
         target:
           entity_id: media_player.master_bedroom_clock
         data:
-          media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
+          media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm/thunderstorm.mp3
           media_content_type: audio/mpeg
 
diff --git a/automations/rooms/nursery/nursery_bedtime_button.yaml b/automations/rooms/nursery/nursery_bedtime_button.yaml
index a1a493b..cdf0e3f 100644
--- a/automations/rooms/nursery/nursery_bedtime_button.yaml
+++ b/automations/rooms/nursery/nursery_bedtime_button.yaml
@@ -42,4 +42,23 @@ action:
           attribute: current_playlist_title
           state: "Kid's Goodnight Songs"
 
-  - service: script.goodnight_kids_youtube_music
\ No newline at end of file
+  #- service: script.goodnight_kids_youtube_music
+  - action: media_player.shuffle_set
+    data:
+      shuffle: false
+    target:
+      device_id: be28c87a729c28b9b27b540589895e20
+
+  - action: media_player.repeat_set
+    data:
+      repeat: all
+    target:
+      device_id: be28c87a729c28b9b27b540589895e20
+
+  - action: music_assistant.play_media
+    data:
+      media_id: library://playlist/3
+      media_type: playlist
+      enqueue: replace
+    target:
+      device_id: be28c87a729c28b9b27b540589895e20
\ No newline at end of file
diff --git a/automations/rooms/nursery/nursery_white_noise_on.yaml b/automations/rooms/nursery/nursery_white_noise_on.yaml
index a6d9e9f..2f46e64 100644
--- a/automations/rooms/nursery/nursery_white_noise_on.yaml
+++ b/automations/rooms/nursery/nursery_white_noise_on.yaml
@@ -38,7 +38,7 @@ action:
   #   target:
   #     entity_id: media_player.nursery_hub
   #   data:
-  #     media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
+  #     media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm/thunderstorm.mp3
   #     media_content_type: audio/mpeg
 
 
diff --git a/automations/things/notify_frigate_events.yaml b/automations/things/notify_frigate_events.yaml
deleted file mode 100644
index aae8c6e..0000000
--- a/automations/things/notify_frigate_events.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-alias: Notify of Frigate Events
-id: automation_notify_of_frigate_events
-initial_state: 'off'
-trigger:
-  platform: mqtt
-  topic: frigate/events
-action:
-  - service: notify.mobile_app_pixel_7
-    data:
-      message: 'A {{trigger.payload_json["after"]["label"]}} was detected.'
-      data:
-        image: 'https://automation.clintweaver.com/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/thumbnail.jpg?format=android'
-        tag: '{{trigger.payload_json["after"]["id"]}}'
-        when: '{{trigger.payload_json["after"]["start_time"]|int}}'
\ No newline at end of file
diff --git a/components/intent_scripts/setvolume.yaml b/components/intent_scripts/setvolume.yaml
new file mode 100644
index 0000000..9bd2f73
--- /dev/null
+++ b/components/intent_scripts/setvolume.yaml
@@ -0,0 +1,10 @@
+# Example configuration.yaml
+intent_script:
+  SetVolume:
+    action:
+      service: "media_player.volume_set"
+      data:
+        entity_id: "{{ media_player }}"
+        volume_level: "{{ volume / 100.0 }}"
+    speech:
+      text: "Volume changed to {{ volume }}"
\ No newline at end of file
diff --git a/components/packages/ambientsounds.yaml b/components/packages/ambientsounds.yaml
index c48777d..f99b3ca 100644
--- a/components/packages/ambientsounds.yaml
+++ b/components/packages/ambientsounds.yaml
@@ -134,7 +134,7 @@ script:
             {% elif is_state("input_select.ambient_sound", "River") %} media-source://media_source/local/Sounds/relaxing/river.mp3
             {% elif is_state("input_select.ambient_sound", "Female Rock-a-bye Baby") %} media-source://media_source/local/Sounds/relaxing/rock_a_bye_baby_hol.mp3
             {% elif is_state("input_select.ambient_sound", "Male Rock-a-bye Baby") %} media-source://media_source/local/Sounds/relaxing/rock_a_bye_baby_jmp.mp3
-            {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
+            {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://media_source/local/Sounds/relaxing/thunderstorm/thunderstorm.mp3
             {% elif is_state("input_select.ambient_sound", "Female Twinkle Twinkle") %} media-source://media_source/local/Sounds/relaxing/twinkle_twinkle_hol.mp3
             {% elif is_state("input_select.ambient_sound", "Male Twinkle Twinkle") %} media-source://media_source/local/Sounds/relaxing/twinkle_twinkle_jmp.mp3
             {% elif is_state("input_select.ambient_sound", "White Noise") %} media-source://media_source/local/Sounds/relaxing/white_noise.mp3
@@ -144,7 +144,7 @@ script:
                 'media-source://media_source/local/Sounds/relaxing/oscillating_fan.mp3',
                 'media-source://media_source/local/Sounds/relaxing/rain.mp3',
                 'media-source://media_source/local/Sounds/relaxing/river.mp3',
-                'media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3'] %}
+                'media-source://media_source/local/Sounds/relaxing/thunderstorm/thunderstorm.mp3'] %}
               {{ noises|random }}
             {% elif is_state("input_select.ambient_sound", "Random Kids Noise") %}
               {% set noises = ['media-source://media_source/local/Sounds/relaxing/baby_shusher_hol.mp3',
diff --git a/custom_sentences/en/media.yaml b/custom_sentences/en/media.yaml
new file mode 100644
index 0000000..32397fc
--- /dev/null
+++ b/custom_sentences/en/media.yaml
@@ -0,0 +1,21 @@
+# Example config/custom_sentences/en/media.yaml
+language: "en"
+intents:
+  SetVolume:
+    data:
+      - sentences:
+          - "(set|change) {media_player} volume to {volume} [percent]"
+          - "(set|change) [the] volume for {media_player} to {volume} [percent]"
+lists:
+  media_player:
+    values:
+      - in: "front room"
+        out: "media_player.front_room_hub"
+      - in: "master bedroom"
+        out: "media_player.master_bedroom_clock"
+      - in: "downstairs"
+        out: "media_player.computer_area_hub"
+  volume:
+    range:
+      from: 0
+      to: 100
\ No newline at end of file
diff --git a/esphome/furnace-room-multisensor.yaml b/esphome/furnace-room-multisensor.yaml
index ebaa6b8..555cfef 100644
--- a/esphome/furnace-room-multisensor.yaml
+++ b/esphome/furnace-room-multisensor.yaml
@@ -32,7 +32,7 @@ font:
     id: font1
     size: 17
 
-dallas:
+dallas_temp:
   - pin:
       number: GPIO5 #D4
     update_interval: 10s
diff --git a/lovelace/resources.yaml b/lovelace/resources.yaml
index ed01057..5bcbbda 100644
--- a/lovelace/resources.yaml
+++ b/lovelace/resources.yaml
@@ -75,4 +75,7 @@
 - url: /hacsfiles/weather-card/weather-card.js
   type: module
 
+- url: /hacsfiles/mass-search-card/mass-search-card.js
+  type: module
+
 - url: /local
\ No newline at end of file
diff --git a/scripts/cameras/cam03_computer_area.yaml b/scripts/cameras/cam03_computer_area.yaml
index 1f51ddd..3f0cc27 100644
--- a/scripts/cameras/cam03_computer_area.yaml
+++ b/scripts/cameras/cam03_computer_area.yaml
@@ -4,5 +4,6 @@ sequence:
   data:
     entity_id: media_player.computer_area_hub
     url: rtsp_cam03
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam03_sub_computer_area.yaml b/scripts/cameras/cam03_sub_computer_area.yaml
index 4dc96df..d9d7947 100644
--- a/scripts/cameras/cam03_sub_computer_area.yaml
+++ b/scripts/cameras/cam03_sub_computer_area.yaml
@@ -4,5 +4,6 @@ sequence:
   data:
     entity_id: media_player.computer_area_hub
     url: rtsp_cam03_sub
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam08_computer_area.yaml b/scripts/cameras/cam08_computer_area.yaml
index c057c98..38da7a5 100644
--- a/scripts/cameras/cam08_computer_area.yaml
+++ b/scripts/cameras/cam08_computer_area.yaml
@@ -3,6 +3,6 @@ sequence:
 - service: webrtc.dash_cast
   data:
     entity_id: media_player.computer_area_hub
-    url: rtsp_cam08
+    url: rtsp_cam08_sub
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam08_front_room.yaml b/scripts/cameras/cam08_front_room.yaml
index 6729a6b..68d78c1 100644
--- a/scripts/cameras/cam08_front_room.yaml
+++ b/scripts/cameras/cam08_front_room.yaml
@@ -4,5 +4,6 @@ sequence:
   data:
     entity_id: media_player.front_room_hub
     url: rtsp_cam08_sub
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam13_computer_area.yaml b/scripts/cameras/cam13_computer_area.yaml
index 2e659a6..57cae7b 100644
--- a/scripts/cameras/cam13_computer_area.yaml
+++ b/scripts/cameras/cam13_computer_area.yaml
@@ -3,6 +3,7 @@ sequence:
 - service: webrtc.dash_cast
   data:
     entity_id: media_player.computer_area_hub
-    url: rtsp://192.168.1.7:8554/rtsp_cam13_sub
+    url: rtsp_cam13_sub
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam13_front_room.yaml b/scripts/cameras/cam13_front_room.yaml
index 19af03f..81e69da 100644
--- a/scripts/cameras/cam13_front_room.yaml
+++ b/scripts/cameras/cam13_front_room.yaml
@@ -3,6 +3,7 @@ sequence:
 - service: webrtc.dash_cast
   data:
     entity_id: media_player.front_room_hub
-    url: rtsp://192.168.1.7:8554/rtsp_cam13_sub
+    url: rtsp_cam13_sub
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam19_computer_area.yaml b/scripts/cameras/cam19_computer_area.yaml
index 18b5bfd..5e0e66b 100644
--- a/scripts/cameras/cam19_computer_area.yaml
+++ b/scripts/cameras/cam19_computer_area.yaml
@@ -3,6 +3,7 @@ sequence:
 - service: webrtc.dash_cast
   data:
     entity_id: media_player.computer_area_hub
-    url: rtsp://192.168.1.7:8554/rtsp_cam19_sub
+    url: rtsp_cam19_sub
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/scripts/cameras/cam19_front_room.yaml b/scripts/cameras/cam19_front_room.yaml
index 13406cb..0eb2901 100644
--- a/scripts/cameras/cam19_front_room.yaml
+++ b/scripts/cameras/cam19_front_room.yaml
@@ -3,6 +3,7 @@ sequence:
 - service: webrtc.dash_cast
   data:
     entity_id: media_player.front_room_hub
-    url: rtsp://192.168.1.7:8554/rtsp_cam19_sub
+    url: rtsp_cam19_sub
+    force: true
     extra:
       mode: webrtc
\ No newline at end of file
diff --git a/tmp/camera-snapshot.jpg b/tmp/camera-snapshot.jpg
new file mode 100644
index 0000000..b9f765b
Binary files /dev/null and b/tmp/camera-snapshot.jpg differ