diff --git a/automations.yaml b/automations.yaml
index 5c8408a..4f3f95e 100755
--- a/automations.yaml
+++ b/automations.yaml
@@ -105,12 +105,17 @@
   alias: Good Morning
   initial_state: true
   trigger:
-  - platform: time
-    at: 06:30:00
+      platform: template
+      value_template: "{{ states('sensor.time') == (state_attr('input_datetime.good_morning', 'timestamp') | int | timestamp_custom('%H:%M', False)) }}"
   condition:
-    condition: state
-    entity_id: binary_sensor.workday_sensor
-    state: 'on'
+    condition: or
+    conditions:
+    - condition: state
+      entity_id: binary_sensor.workday_sensor
+      state: 'on'
+    - condition: state
+      entity_id: calendar.skylar_school
+      state: 'on'
   action:
   - service: scene.turn_on
     entity_id: scene.normal_livingroom_lighting
@@ -274,6 +279,9 @@
         Its the little things. ", "Its getting dark so let me spell out my name...
         Wait. Did I break into a random #Hamilton song? Pardon me. umm. I just turned
         on the outside lights at Anchorage House. " ] | random }}'
+  - service: alarm_control_panel.alarm_arm_away
+    entity_id: alarm_control_panel.ah_base_station
+
 - id: outside_lights_off_sunrise
   alias: Outside Lights off at Sunrise
   initial_state: true
@@ -290,6 +298,9 @@
         lights. ", "I see the sun! Time to turn off the outside lights at Anchorage
         House. ", "Dawn has broken at Anchorage House. Turning off the outside lights.
         " ] | random }}'
+  - service: alarm_control_panel.alarm_disarm
+    entity_id: alarm_control_panel.ah_base_station
+
 - id: inside_on_sunset
   alias: Inside on at Sunset
   initial_state: true
@@ -330,7 +341,7 @@
   initial_state: true
   trigger:
   - platform: time
-    at: '20:30:00'
+    at: '19:30:00'
   action:
   - service: input_boolean.turn_off
     entity_id: input_boolean.audible_notifications
@@ -352,7 +363,7 @@
   initial_state: true
   trigger:
   - platform: time
-    at: 07:00:00
+    at: 06:40:00
   action:
   - entity_id: input_boolean.audible_notifications
     service: input_boolean.turn_on
@@ -444,7 +455,23 @@
             07:15
           {% endif %}
 
-
+- id: set_good_morning_time
+  alias: set good morning time
+  trigger:
+    - platform: time
+      at: '05:55:00'
+  action:
+    - service: input_datetime.set_datetime
+      entity_id: input_datetime.good_morning
+      data_template:
+        time: > 
+          {% if states.calendar.skylar_school.attributes.offset_reached == True %}
+            06:00
+          {% elif states.binary_sensor.workday_sensor.state == 'on' %}
+            06:30
+          {% else %}
+            07:00
+          {% endif %}
 
 - id: upstairs_fan_on
   alias: Upstairs Fan On
@@ -532,6 +559,43 @@
       message: Remember to take meds
     service: notify.kat_ios
 
+
+# - id: turn_off_ha_speaker
+#   alias: Turn Off HA Speaker
+#   trigger:
+#   - platform: state
+#     entity_id: media_player.hass_speaker
+#     from: 'playing'
+#     to: 'idle'
+#   action:
+#   - service: media_player.turn_off
+#     entity_id: media_player.hass_speaker
+#   initial_state: true
+
+- id: turn_off_kitchen_speaker
+  alias: Turn Off Kitchen Display
+  trigger:
+  - platform: state
+    entity_id: media_player.googlehomehub3492
+    from: 'playing'
+    to: 'idle'
+  action:
+  - service: media_player.turn_off
+    entity_id: media_player.googlehomehub3492
+  initial_state: true
+
+- id: turn_off_ha_speaker
+  alias: Turn Off HA Speaker
+  trigger:
+  - platform: state
+    entity_id: media_player.guest_tv
+    from: 'playing'
+    to: 'idle'
+  action:
+  - service: switch.turn_off
+    entity_id: switch.ha_speaker
+  initial_state: true
+
 ##########################
 # My Attempt at preventing twitter from being spammed with new HA tweets on reboot
 
@@ -556,4 +620,4 @@
   - service: script.twitter_new_ha
   - service: input_boolean.turn_off
     entity_id: input_boolean.new_ha_announcement
-###########################
\ No newline at end of file
+###########################
diff --git a/configuration.yaml b/configuration.yaml
index 7d5e9e6..e0329ab 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -39,7 +39,7 @@ http:
     - 127.0.0.1
     - ::1
   ip_ban_enabled: True
-  login_attempts_threshold: 5
+  login_attempts_threshold: 3
 
 config:
 
@@ -76,6 +76,12 @@ google:
   client_id: !secret google_client_id
   client_secret: !secret google_client_secret
 
+arlo:
+  username: !secret arlo_user
+  password: !secret arlo_pass
+
+alarm_control_panel:
+  - platform: arlo
 
 
 discovery:
@@ -114,7 +120,8 @@ logbook:
 
 logger:
   default: warning
-  # logs:
+  #logs:
+ 
   #   homeassistant.components.sensor.alpha_vantage: debug
 
 
@@ -147,11 +154,13 @@ camera:
   - platform: mjpeg
     name: Garage Door Cam 
     mjpeg_url: !secret garage_cam
+  - platform: arlo
+    ffmpeg_arguments: '-pred 1 -q:v 2'
 
 media_player:
   - platform: vlc
     name: hass_speaker
-    arguments: '--alsa-audio-device=hw:0,1'
+    arguments: '--alsa-audio-device=hw:0,0'
     
 ffmpeg:
   ffmpeg_bin: /usr/bin/ffmpeg    
@@ -227,6 +236,9 @@ tplink:
 #  devices:
 #    - host: 192.168.7.97
 
+ifttt:
+  key: !secret IFTTT_API_KEY
+
 ### Custom Commands
 shell_command:
   alarm_off: pkill mpg123
diff --git a/customize.yaml b/customize.yaml
index d6a1670..8517ac2 100755
--- a/customize.yaml
+++ b/customize.yaml
@@ -321,3 +321,9 @@ sensor.security_protocol:
   icon: mdi:security
 sensor.notification_mode:
   icon: mdi:bell
+
+device_tracker.life360_jeffrey_stone:
+  friendly_name: Jeffrey
+
+evice_tracker.life360_kat_stone:
+  friendly_name: Katherine
diff --git a/input_boolean.yaml b/input_boolean.yaml
index bd4ab73..4bd1f32 100755
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -76,6 +76,9 @@ sun_reports:
 new_ha_announcement:
   name: New HA Announcement
   icon: mdi:twitter
+showing_now:
+  name: Showing Now
+  icon: mdi:popcorn
 
 
 #####################
diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index dc981ed..7cb0b14 100755
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -111,4 +111,34 @@ automation:
         call_skylar_events: 1
         call_clothes_suggestion: 1
   
+  - id: set_skylar_morning_report_time
+    alias: set skylar morning report time
+    trigger:
+    - platform: time
+      at: '05:50:00'
+    action:
+    - service: input_datetime.set_datetime
+      entity_id: input_datetime.skylar_morning_report
+      data_template:
+        time: >
+          {% if states.calendar.skylar_school.attributes.offset_reached == True %}
+            06:30
+          {% else %}
+            07:58
+          {% endif %}
 
+  - id: set_morning_report_time
+    alias: set morning report time 
+    trigger:
+    - platform: time
+      at: '05:50:30'
+    action:
+    - service: input_datetime.set_datetime
+      entity_id: input_datetime.morning_report
+      data_template:
+        time: >
+          {% if states.calendar.skylar_school.attributes.offset_reached == True %}
+            07:00
+          {% else %}
+            07:45
+          {% endif %}
diff --git a/packages/disney.yaml b/packages/disney.yaml
index 3bac5a6..3e15a61 100755
--- a/packages/disney.yaml
+++ b/packages/disney.yaml
@@ -57,7 +57,7 @@ automation:
       to: 'off'
     action:
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
     - service: script.turn_on
       entity_id: script.kill_this_ride
   - id: illuminations_on
@@ -113,7 +113,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
   - id: happy_ever_after_on
     alias: Happy Ever After On
     initial_state: true
@@ -135,7 +135,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
   - id: haunted_mansion_on
     alias: Haunted Mansion On
     initial_state: true
@@ -156,7 +156,7 @@ automation:
     action:
     - service: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
   - id: spaceship_earth_on
     alias: Spaceship Earth On
     initial_state: true
@@ -178,7 +178,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
   - id: boo_to_you_show_on
     alias: Boo To You Show On
     initial_state: true
@@ -200,7 +200,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
   - id: boo_to_you_on
     alias: Boo To You On
     initial_state: true
@@ -222,7 +222,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
   - id: holiday_wisher_on
     alias: Holiday Wishes On
     initial_state: true
@@ -244,7 +244,52 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
+  
+  - id: kill_show
+    alias: Kill Show
+    trigger:
+    - platform: state
+      entity_id:
+      - script.haunted_mansion_show_sequence
+      - script.haunted_mansion_start
+      - script.illuminations_show
+      - script.boo_to_you_show
+      - script.happy_ever_after_show
+      - script.tiki_room_audio
+      - script.mk_loop
+      - script.spaceship_earth_ride
+      from: 'on'
+      to: 'off'
+    action:
+    - service: media_player.media_stop
+      entity_id: media_player.ha_speaker
+    - service: scene.turn_on
+      entity_id: scene.normal_livingroom_lighting
+    initial_state: true
+
+  # - id: house_lights_up
+  #   alias: House Lights Up
+  #   trigger:
+  #   - platform: state
+  #     entity_id:
+  #     - script.haunted_mansion_show_sequence
+  #     - script.haunted_mansion_start
+  #     - script.illuminations_show
+  #     - script.boo_to_you_show
+  #     - script.happy_ever_after_show
+  #     - script.tiki_room_audio
+  #     - script.mk_loop
+  #     - script.spaceship_earth_ride
+  #     from: 'on'
+  #     to: 'off'
+  #   action:
+  #   - service: media_player.media_stop
+  #     entity_id: media_player.ha_speaker
+  #   - service: scene.turn_on
+  #     entity_id: scene.normal_livingroom_lighting
+  #   initial_state: true
+
 
 script:
   kill_hurry_back:
@@ -300,15 +345,20 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
+    - service: input_boolean.turn_on
+      entity_id: input_boolean.show_time
     #- service: shell_command.haunted_mansion_preshow_full
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.volume_set
       data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .7
+        entity_id: media_player.ha_speaker
+        volume_level: .4
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/haunted_mansion_preshow_full.mp3
+        #media_content_id: /media/audio/haunted_mansion_preshow_full.mp3
+        media_content_id: http://192.168.7.40/audio/haunted_mansion_preshow_short.mp3
         media_content_type: "music"
     - data:
         entity_id: script.haunted_preshow
@@ -358,7 +408,7 @@ script:
   kill_this_ride:
     sequence:
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
     - service: shell_command.alarm_off
     - service: script.turn_off
       data:
@@ -408,14 +458,16 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.dance_it
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.volume_set
       data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .7
+        entity_id: media_player.ha_speaker
+        volume_level: .5
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/move_it_shake_dance_audio.mp3
+        media_content_id: http://192.168.7.40/audio/move_it_shake_dance_audio.mp3
         media_content_type: "music"
   spaceship_earth_ride:
     sequence:
@@ -426,14 +478,16 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.spaceship_earth_ride
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.volume_set
       data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .7
+        entity_id: media_player.ha_speaker
+        volume_level: .5
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: media/audio/spaceship_earth_ride.mp3
+        media_content_id: http://192.168.7.40/audio/spaceship_earth_ride.mp3
         media_content_type: "music"
   welcome_to_magic_kingdom:
     sequence:
@@ -480,14 +534,16 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.welcome_show_crowd
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.volume_set
       data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .7
+        entity_id: media_player.ha_speaker
+        volume_level: .5
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/welcome_show_crowd.mp3
+        media_content_id: http://192.168.7.40/audio/welcome_show_crowd.mp3
         media_content_type: "music"
   holiday_wishes_start:
     sequence:
@@ -508,10 +564,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.holiday_wishes
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/wishes_5_min.mp3
+        media_content_id: http://192.168.7.40/audio/wishes_5_min.mp3
         media_content_type: "music"
   boo_to_you_show:
     sequence:
@@ -522,10 +580,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.boo_to_you
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/boo_to_you_audio.mp3
+        media_content_id: http://192.168.7.40/audio/boo_to_you_audio.mp3
         media_content_type: "music"
   happy_ever_after_show:
     sequence:
@@ -536,25 +596,29 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.happily_ever_after
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/Happily_Ever_After_Audio.mp3
-        media_content_type: "music"
-  boo_to_you:
-    sequence:
-    - condition: state
-      entity_id: input_boolean.audible_notifications
-      state: 'on'
-    - condition: state
-      entity_id: sensor.family_status
-      state: Home
-    #- service: shell_command.boo_to_you
-    - service: media_player.play_media
-      entity_id: media_player.hass_speaker
-      data:
-        media_content_id: /media/audio/boo_to_you_audio.mp3
+        media_content_id: http://192.168.7.40/audio/Happily_Ever_After_Audio.mp3
         media_content_type: "music"
+  # boo_to_you:
+  #   sequence:
+  #   - condition: state
+  #     entity_id: input_boolean.audible_notifications
+  #     state: 'on'
+  #   - condition: state
+  #     entity_id: sensor.family_status
+  #     state: Home
+  #   #- service: shell_command.boo_to_you
+  #   - service: media_player.turn_on
+  #     entity_id: media_player.ha_speaker
+  #   - service: media_player.play_media
+  #     entity_id: media_player.ha_speaker
+  #     data:
+  #       media_content_id: http://192.168.7.40/audio/boo_to_you_audio.mp3
+  #       media_content_type: "music"
   tiki_room_audio:
     sequence:
     - condition: state
@@ -564,33 +628,39 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.tiki_room_audio
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.volume_set
       data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .9
+        entity_id: media_player.ha_speaker
+        volume_level: .5
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/tiki_room_audio.mp3
-        media_content_type: "music"
-  happy_ever_after:
-    sequence:
-    - condition: state
-      entity_id: input_boolean.audible_notifications
-      state: 'on'
-    - condition: state
-      entity_id: sensor.family_status
-      state: Home
-    #- service: shell_command.happily_ever_after
-    - service: media_player.volume_set
-      data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .7
-    - service: media_player.play_media
-      entity_id: media_player.hass_speaker
-      data:
-        media_content_id: /media/audio/Happily_Ever_After_Audio.mp3
+        media_content_id: http://192.168.7.40/audio/tiki_room_audio.mp3
         media_content_type: "music"
+  # happy_ever_after:
+  #   sequence:
+  #   - condition: state
+  #     entity_id: input_boolean.audible_notifications
+  #     state: 'on'
+  #   - condition: state
+  #     entity_id: sensor.family_status
+  #     state: Home
+  #   #- service: shell_command.happily_ever_after
+  #   - service: media_player.turn_on
+  #     entity_id: media_player.ha_speaker
+  #   - service: media_player.volume_set
+  #     data_template:
+  #       entity_id: media_player.ha_speaker
+  #       volume_level: .5
+  #   - service: media_player.play_media
+  #     entity_id: media_player.ha_speaker
+  #     data:
+  #       media_content_id: http://192.168.7.40/audio/Happily_Ever_After_Audio.mp3
+  #       media_content_type: "music"
   illuminations_lights_out:
     sequence:
     - delay: 00:00:57
@@ -635,14 +705,16 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.illuminations_audio
+    - service: media_player.turn_on
+      entity_id: media_player.ha_speaker
     - service: media_player.volume_set
       data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .7
+        entity_id: media_player.ha_speaker
+        volume_level: .5
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.ha_speaker
       data:
-        media_content_id: /media/audio/illuminations.mp3
+        media_content_id: http://192.168.7.40/audio/illuminations.mp3
         media_content_type: "music"
     - service: script.turn_on
       entity_id: script.illuminations_preshow
diff --git a/packages/notify.yaml b/packages/notify.yaml
index 798ffee..bceef9d 100755
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -65,6 +65,7 @@ notify:
     consumer_secret: !secret twitter_consumer_secret
     access_token: !secret twitter_access_token
     access_token_secret: !secret twitter_access_secret
+
   
 script:
 
@@ -171,17 +172,21 @@ script:
       - condition: state
         entity_id: input_boolean.vacation_mode
         state: 'off'
+      - service: switch.turn_on 
+        entity_id: switch.ha_speaker
       - service: tts.google_translate_say
         data_template:
-          entity_id: media_player.hass_speaker
+          entity_id: media_player.guest_tv
           message: >
             {{ message }}
 
   jarvis_alert:
     sequence:
+    - service: switch.turn_on 
+      entity_id: switch.ha_speaker
     - service: tts.amazon_polly_say
       data_template:
-        entity_id: media_player.hass_speaker
+        entity_id: media_player.guest_tv
         message: >-
           <speak>
             {{ message }}
@@ -206,12 +211,14 @@ script:
       - condition: state
         entity_id: input_boolean.vacation_mode
         state: 'off'
-      - condition: state
-        entity_id: media_player.hass_speaker
+      # - service: switch.turn_on 
+      #   entity_id: switch.ha_speaker
+      # - condition: state
+        entity_id: media_player.guest_tv
         state: 'idle'
       - service: tts.google_translate_say
         data_template:
-          entity_id: media_player.hass_speaker
+          entity_id: media_player.guest_tv
           message: >
             {{message }}
 
@@ -230,21 +237,27 @@ script:
     - condition: state
       entity_id: input_boolean.vacation_mode
       state: 'off'
-    - service: media_player.turn_on
-      entity_id: media_player.hass_speaker
-    - wait_template: >-
-        {{ not is_state('media_player.hass_speaker', 'playing') }}
-    - service: media_player.volume_set
-      data_template:
-        entity_id: media_player.hass_speaker
-        volume_level: .65
+    # - service: switch.turn_on 
+    #   entity_id: switch.ha_speaker 
+    # - service: media_player.turn_on
+    #   entity_id: media_player.guest_tv
+    # - service: media_player.volume_set
+    #   data_template:
+    #     entity_id: media_player.guest_tv
+    #     volume_level: >
+    #       {% if states.input_boolean.audible_notifications.state == 'on' %}
+    #       .65
+    #       {% else %}
+    #       .4
+    #       {% endif %}
+    # media_player.googlehome0715, media_player.googlehomehub3492, media_player.upstairs_speaker
     - service: tts.amazon_polly_say
       data_template:
         entity_id: >
           {% if states.input_boolean.audible_notifications.state == 'on' %}
-          media_player.hass_speaker, media_player.googlehome0715, media_player.googlehomehub3492
+          media_player.house
           {% else %}
-          media_player.googlehome0715, media_player.googlehomehub3492, media_player.upstairs_speaker
+          media_player.house
           {% endif %}
         message: >-
           <speak>
@@ -326,8 +339,10 @@ script:
           {% macro morning_greeting() %}
               {{ [ "Time to Rise and Shine. ",
                 "Let's do this thing.",
-                "Anchorage House."
-                "The early bird gets the worm. And look over there. A worm. Wait, is that a snake? umm,,,I don't like snakes. Someone might want to take care,, ok,,, moving on.",
+                "I hope you got some rest.",
+                "It's time to get the day started.",
+                "Glad to see everyone made it.",
+                "The early bird gets the worm. And look over there. A worm.",
                 "The early bird gets the worm.",
                 "from the bridge.",
                 "Pardom the interuption.",
@@ -482,8 +497,8 @@ script:
           {% macro prebed_routine() %}
             Skylar,  
             {{ [ "It is time to get in the bath. ",
-                "You only have thirty minutes until bedtime. That means you should be heading for the bathtub."
-                "I cannot comminicate with the bathtub otherwise I would have started the water for you already, so you will have to do it manually. It's bath time. ",
+                "You only have thirty minutes until bedtime. That means you should be heading for the bathtub.",
+                "I cannot comminicate with the bathtub, otherwise, I would have started the water for you already. So you will have to start the bath yourself. ",
                 "My sensors are detecting a strange smell. I am running diagnostics, but in the mean time why don't you start a bath.",
               ] | random }} 
             If you go now there may be time for stories. Don't forget to brush your teeth. 
@@ -497,7 +512,7 @@ script:
 
 
           {% macro school_today() %}
-            {% if is_state("calendar.skylar_school", "on") %}
+            {% if states.calendar.skylar_school.attributes.offset_reached == True %}
               Because you have school today!
               {% if states.calendar.skylar_school.attributes.description == "early-release" %}
                 And guess what? It is early release!
diff --git a/packages/presence.yaml b/packages/presence.yaml
index b90b264..b848edc 100755
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -204,6 +204,8 @@ automation:
     - service: script.appliances_on
     - service: script.standby
     - service: script.washer_finished_notification_audible
+    - service: alarm_control_panel.alarm_disarm
+      entity_id: alarm_control_panel.ah_base_station
     initial_state: true
   
   - id: family_has_left
@@ -226,6 +228,8 @@ automation:
     - service: script.lockdown
     - service: script.lockdown_issue
     - service: script.all_fans_off
+    - service: alarm_control_panel.alarm_arm_away
+      entity_id: alarm_control_panel.ah_base_station
   
   - id: jeff_is_home
     alias: Jeff is Home
@@ -298,10 +302,14 @@ automation:
     trigger:
       - platform: state
         entity_id:
-          - person.jeffrey
-          - person.katherine
+          - device_tracker.jeffreystonesiphone
+          - device_tracker.katherinestonesiphone
         from: 'not_home'
         to: 'home'
+    condition:
+    - condition: state
+      entity_id: sensor.family_status
+      state: Home
     action:
       - service: script.ah_report
         data_template:
diff --git a/packages/security.yaml b/packages/security.yaml
index cac2240..ad15980 100755
--- a/packages/security.yaml
+++ b/packages/security.yaml
@@ -102,6 +102,7 @@ automation:
       state: "on"
     action:
     - service: script.driveway_on
+    
 
   - id: close_garage_lights_out
     alias: Close Garage at lights out
@@ -347,10 +348,10 @@ script:
   #     entity_id: input_boolean.audible_notifications
   #     state: 'on'
   #   - condition: state
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.theater
   #     state: 'idle'
   #   - service: tts.google_say
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.theater
   #     data_template:
   #       message: "Sentry mode activated"
 
@@ -360,10 +361,10 @@ script:
   #     entity_id: input_boolean.audible_notifications
   #     state: 'on'
   #   - condition: state
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.theater
   #     state: 'idle'
   #   - service: tts.google_say
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.theater
   #     data_template:
   #       message: "Sentry mode deactivated"
   
diff --git a/packages/sysmon.yaml b/packages/sysmon.yaml
index 2e665a6..4a899a1 100755
--- a/packages/sysmon.yaml
+++ b/packages/sysmon.yaml
@@ -29,9 +29,9 @@ sensor:
     - 'time_date'
     - 'time_utc'
     - 'beat'
-  - platform: cert_expiry
-    host: !secret ahsl_base_url
-    name: SSL Cert Expiration
+  # - platform: cert_expiry
+  #   host: !secret ahsl_base_url
+  #   name: SSL Cert Expiration
   - platform: command_line
     name: "HA Uptime"
     command: echo "$(($(date +%s) - $(date -d "$(head -n1 /home/homeassistant/.homeassistant/home-assistant.log | cut -d' ' -f-2)" +%s)))"
diff --git a/packages/weather_alerts_nws.yaml b/packages/weather_alerts_nws.yaml
index 3ed4189..cbcfbc0 100755
--- a/packages/weather_alerts_nws.yaml
+++ b/packages/weather_alerts_nws.yaml
@@ -200,7 +200,7 @@ automation:
       to: 'on'
     action:
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.theater
       data:
         media_content_id: /media/audio/Tornado_Siren.mp3
         media_content_type: "music"
@@ -215,7 +215,7 @@ automation:
 
     action:
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.theater
   
 
 script:
diff --git a/scenes.yaml b/scenes.yaml
index 5e33343..2623925 100755
--- a/scenes.yaml
+++ b/scenes.yaml
@@ -136,7 +136,7 @@
       state: off
     group.rgb_lr:
       state: on
-      brightness: 40
+      brightness_pct: 100 
     # light.front_door_lamp:
     #   state: on
     #   brightness: 40
@@ -165,31 +165,31 @@
 
 - name: jeff light on
   entities:
-    light.master_bedroom_lamp:
+    light.jeff_lamp:
       state: on
       brightness: 100
 
 - name: jeff light off
   entities:
-    light.master_bedroom_lamp:
+    light.jeff_lamp:
       state: off
       
 
 - name: jeff wake up
   entities:
-    light.master_bedroom_lamp:
+    light.jeff_lamp:
       state: on
       brightness: 20
 
 - name: jeff bedtime
   entities:
-    light.master_bedroom_lamp:
+    light.jeff_lamp:
       state: on
       brightness: 40
 
 - name: jeff night light
   entities:
-    light.master_bedroom_lamp:
+    light.jeff_lamp:
       state: on
       brightness: 10
 
@@ -241,3 +241,24 @@
 #     light.front_lamp:
 #       state: on
 #       brightness: 10
+
+
+#########################################
+# Haunted Manshion show scenes
+#
+# These scenes are used in the Haunted Mansion show that
+# takes place when requested
+
+- name : lr_cool_white
+  entities:
+    group.rgb_lr:
+      state: on
+      brightness_pct: 100
+      rgb_color: [255,255,255]
+
+- name : lr_blue
+  entities:
+    group.rgb_lr:
+      state: on
+      brightness_pct: 100
+      color_name: "blue"
diff --git a/scripts/general.yaml b/scripts/general.yaml
index 484af4d..3964274 100644
--- a/scripts/general.yaml
+++ b/scripts/general.yaml
@@ -121,7 +121,7 @@ driveway_off:
     state: 'off'
   - service: switch.turn_off
     entity_id: switch.driveway_light
-  - service: switch.turn_off
+  - service: light.turn_off
     entity_id: light.side_door_light_3
 chromecast_media_stop:
   sequence:
diff --git a/scripts/scripts.yaml b/scripts/scripts.yaml
deleted file mode 100644
index 68d6c44..0000000
--- a/scripts/scripts.yaml
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-close_garage:
-  sequence:
-  - condition: state
-    entity_id: cover.cargo_bay
-    state: open
-  - service: cover.close_cover
-    entity_id: cover.cargo_bay
-open_garage:
-  sequence:
-  - condition: state
-    entity_id: cover.cargo_bay
-    state: closed
-  - service: cover.open_cover
-    entity_id: cover.cargo_bay
-
-
-tornado_alarm:
-  sequence:
-  - service: shell_command.tornado_alarm
-sunset_garage_open:
-  sequence:
-  - condition: state
-    entity_id: binary_sensor.ecolink_garage_door_tilt_sensor_sensor
-    state: 'on'
-  - service: script.driveway_all_on
-jeff_destination_zoo:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: jeff/driving/destination
-      payload: Zoo
-      retain: true
-jeff_destination_summit:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: jeff/driving/destination
-      payload: Summit
-      retain: true
-jeff_destination_none:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: jeff/driving/destination
-      payload: none
-      retain: true
-jeff_destination_na:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: jeff/driving/destination
-      payload: na
-      retain: true
-jeff_destination_home:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: jeff/driving/destination
-      payload: Home
-      retain: true
-jeff_destination_harbins:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: jeff/driving/destination
-      payload: Harbins
-      retain: true
-kat_destination_na:
-  sequence:
-  - service: mqtt.publish
-    data:
-      topic: kat/driving/destination
-      payload: na
-      retain: true
-inside_all_on:
-  sequence:
-  - service: light.turn_on
-    data:
-      entity_id: light.tower_lamp_4
-  - service: light.turn_on
-    data:
-      entity_id: light.front_door_lamp
-  - service: switch.turn_on
-    data:
-      entity_id: switch.fireplace_lights
-  - service: light.turn_on
-    data:
-      entity_id: light.living_room_lamp
-  - service: light.turn_on
-    data:
-      entity_id: light.kitchen_light_strip
-  - service: light.turn_on
-    data:
-      entity_id: light.kitchen_cabinets
-  - service: scene.turn_on
-    data:
-      entity_id: scene.livingroom_normal
-inside_all_off:
-  sequence:
-  - data:
-      entity_id: light.tower_lamp_4
-    service: light.turn_off
-  - data:
-      entity_id: light.living_room_lamp
-    service: light.turn_off
-  - data:
-      entity_id: light.front_door_lamp
-    service: light.turn_off
-  - data:
-      entity_id: light.kitchen_cabinets
-    service: light.turn_off
-  - data:
-      entity_id: light.kitchen_cabinet_lights
-    service: light.turn_off
-  - entity_id: switch.fireplace_lights
-    service: switch.turn_off
-  - entity_id: switch.upstairs
-    service: switch.turn_off
-  - entity_id: light.jeff_lamp
-    service: light.turn_off
-all_fans_off:
-  sequence:
-  - data:
-      entity_id: switch.upstairs_fan
-    service: switch.turn_off
-  - data:
-      entity_id: switch.living_room_fan
-    service: switch.turn_off
-family_is_home:
-  sequence:
-  - condition: state
-    entity_id: sensor.family_status
-    state: Away
-  - service: mqtt.publish
-    data:
-      topic: house/family/status
-      payload_template: Home
-      retain: true
-family_is_away:
-  sequence:
-  - condition: state
-    entity_id: sensor.family_status
-    state: Home
-  - service: mqtt.publish
-    data:
-      topic: house/family/status
-      payload_template: Away
-      retain: true
-driveway_on:
-  sequence:
-  - condition: state
-    entity_id: sun.sun
-    state: below_horizon
-  - data:
-      entity_id: switch.driveway_light
-    service: switch.turn_on
-  - data:
-      entity_id: light.side_door_light_3
-    service: light.turn_on
-driveway_off:
-  sequence:
-  - delay:
-      seconds: 120
-  - condition: state
-    entity_id: binary_sensor.side_door
-    state: 'off'
-  - condition: state
-    entity_id: binary_sensor.garage_door
-    state: 'off'
-  - service: switch.turn_off
-    entity_id: switch.driveway_light
-  - service: switch.turn_off
-    entity_id: light.side_door_light_3
-chromecast_media_stop:
-  sequence:
-  - service: media_player.media_stop
-    data:
-      entity_id: media_player.theater
-appliances_on:
-  sequence:
-  - service: switch.turn_on
-    data:
-      entity_id: switch.box_fans
-appliances_off:
-  sequence:
-  - data:
-      entity_id: switch.box_fans
-    service: switch.turn_off
-  - data:
-      entity_id: switch.incense
-    service: switch.turn_off
-  - data:
-      entity_id: switch.artemis
-    service: switch.turn_off
-
-
-
-
-
-
-
diff --git a/sensors/house.yaml b/sensors/house.yaml
index 3056eb6..28675e8 100755
--- a/sensors/house.yaml
+++ b/sensors/house.yaml
@@ -3,7 +3,7 @@
   state_topic: "house/washer/status"
 - platform: history_stats
   name: Jeff Driving Time
-  entity_id: sesnor.jeff_driving
+  entity_id: sensor.jeff_driving
   state: 'on'
   type: time
   end: '{{ now() }}'
@@ -11,7 +11,7 @@
     days: 7
 - platform: history_stats
   name: Kat Driving Time
-  entity_id: sesnor.kat_driving
+  entity_id: sensor.kat_driving
   state: 'on'
   type: time
   end: '{{ now() }}'
@@ -19,7 +19,7 @@
     days: 7
 - platform: history_stats
   name: Speech time
-  entity_id: media_player.hass_speaker
+  entity_id: media_player.guest_tv
   state: 'playing'
   type: time
   end: '{{ now() }}'
@@ -65,6 +65,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: template
   sensors:
     sensor_count: