diff --git a/automations.yaml b/automations.yaml
index 1c63359..c4d154f 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -1,3 +1,65 @@
+- id: washer_running
+  alias: Washer Running 
+  trigger:
+  - platform: numeric_state
+    entity_id: sensor.aeotec_dsc06106_smart_energy_switch_power
+    above: 100
+  action:
+  - service: script.washer_running
+
+- id: washer_complete
+  alias: Washer Complete 
+  trigger:
+  - platform: numeric_state
+    entity_id: sensor.aeotec_dsc06106_smart_energy_switch_power
+    below: 5
+  condition:
+  - condition: state
+    entity_id: sensor.washer_status
+    state: 'running'
+  action:
+  - service: script.washer_complete
+
+- id: washer_emptied
+  alias: Washer Emptied   
+  trigger:
+  - platform: state
+    entity_id:  binary_sensor.ecolink_door_window_sensor_sensor
+    from: 'off'
+    to: 'on'
+  action:
+  - service: script.washer_idle
+
+# - id: washer_notification
+#   alias: Washer Notification 
+#   trigger:
+#   - platform: state
+#     entity_id: sensor.washer_status
+#     from: "running"
+#     to: "idle"
+#   condition:
+#   - condition: state
+#     entity_id: sensor.family_status
+#     state: home
+#   - platform: state
+#     entity_id: input_boolean.washer_notification
+#     to: 'on'
+#   action:
+#   - service: homeassistant.turn_on
+#     entity_id: script.washer_finished_notification
+  
+- id: turn_of_disney
+  alias: Turn Off Disney 
+  trigger:
+    - platform: state 
+      entity_id: media_player.hass_speaker
+      from: 'playing'
+      to: idle 
+  action:
+    - service: input_boolean.turn_off 
+      entity_id: input_boolean.tiki_room_audio
+
+
 - id: backup_hass
   alias: Backup Hass
   trigger:
@@ -49,14 +111,17 @@
 - id: hvac_cool_on
   alias: hvac cool on
   trigger:
-  - above: 76
+  - above: 78
     entity_id: climate.first_floor
     platform: numeric_state
-    value_template: '{{ state.attributes.termperature }}'
+    value_template: '{{ states.climate.first_floor.attributes.current_temperature }}'
   condition:
   - above: 83
     condition: numeric_state
     entity_id: sensor.dark_sky_apparent_temperature
+  - condition: state 
+    entity_id: input_boolean.vacation_mode
+    state: 'off'
   action:
   - service: script.climate_set_cool
   - data:
@@ -76,6 +141,7 @@
     below: '78'
     condition: numeric_state
     entity_id: climate.first_floor
+    value_template: '{{ states.climate.first_floor.attributes.current_temperature }}'
   action:
   - service: script.climate_turn_off
   - data:
@@ -86,14 +152,17 @@
 - id: hvac_heat_on
   alias: hvac heat on
   trigger:
-  - below: 62
+  - below: 61
     entity_id: climate.first_floor
     platform: numeric_state
-    value_template: '{{ state.attributes.termperature }}'
+    value_template: '{{ states.climate.first_floor.attributes.current_temperature }}'
   condition:
   - below: 50
     condition: numeric_state
     entity_id: sensor.dark_sky_apparent_temperature
+  - state: 'off'
+    condition: state
+    entity_id: input_boolean.vacation_mode
   action:
   - service: script.climate_set_heat
   - data:
@@ -155,6 +224,10 @@
   trigger:
   - platform: time
     at: '22:00:00'
+  condition:
+  - condition: state
+    entity_id: light.jeff_light
+    state: 'on'
   action:
   - service: scene.turn_on
     entity_id: scene.jeff_bedtime
@@ -164,6 +237,10 @@
   trigger:
   - platform: time
     at: '22:30:00'
+  condition:
+  - condition: state
+    entity_id: light.jeff_light
+    state: 'on'
   action:
   - service: scene.turn_on
     entity_id: scene.jeff_night_light
@@ -229,7 +306,7 @@
   action:
   - service: switch.turn_on
     data:
-      entity_id: switch.front_porch
+      entity_id: switch.leviton_dz15s_1bz_decora_smart_switch_switch
   - service: script.sunset_garage_open
   - service: script.twitter_notify
     data:
@@ -244,7 +321,7 @@
   action:
   - service: switch.turn_off
     data:
-      entity_id: switch.front_porch
+      entity_id: switch.leviton_dz15s_1bz_decora_smart_switch_switch
   - service: script.twitter_notify
     data:
       message: "The sun is up at Anchorage House, so Im turning off the outside
@@ -276,35 +353,35 @@
 - id: door_chime
   alias: Door Chine
   trigger:
-  - entity_id: binary_sensor.laundry_room_door
+  - entity_id: binary_sensor.ecolink_door_window_sensor_sensor_3
     from: 'off'
     platform: state
     to: 'on'
-  - entity_id: binary_sensor.laundry_room_door
+  - entity_id: binary_sensor.ecolink_door_window_sensor_sensor_3
     from: 'on'
     platform: state
     to: 'off'
-  - entity_id: binary_sensor.front_door
+  - entity_id: binary_sensor.ecolink_door_window_sensor_sensor_2
     from: 'off'
     platform: state
     to: 'on'
-  - entity_id: binary_sensor.front_door
+  - entity_id: binary_sensor.ecolink_door_window_sensor_sensor_2
     from: 'on'
     platform: state
     to: 'off'
-  - entity_id: binary_sensor.back_door
+  - entity_id: binary_sensor.ecolink_door_window_sensor_sensor_4
     from: 'off'
     platform: state
     to: 'on'
-  - entity_id: binary_sensor.back_door
+  - entity_id: binary_sensor.ecolink_door_window_sensor_sensor_4
     from: 'on'
     platform: state
     to: 'off'
-  - entity_id: binary_sensor.attic_door
+  - entity_id:  binary_sensor.dome_door_window_sensor_sensor_2
     from: 'off'
     platform: state
     to: 'on'
-  - entity_id: binary_sensor.attic_door
+  - entity_id:  binary_sensor.dome_door_window_sensor_sensor_2
     from: 'on'
     platform: state
     to: 'off'
@@ -579,9 +656,11 @@
     state: 'off'
   action:
   - service: script.appliances_off
+  - service: script.inside_all_off
   - service: script.security_check_garage
   - service: script.security_check_zones
   - service: script.lockdown
+  - service: script.lockdown_issue
 - id: jeff_is_home
   alias: Jeff is Home
   trigger:
diff --git a/binary_sensors/doors.yaml b/binary_sensors/doors.yaml
deleted file mode 100644
index d49f9d9..0000000
--- a/binary_sensors/doors.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-- platform: mqtt
-  name: "Back Door"
-  state_topic: "smartthings/Back Door/contact"
-  payload_on: "open"
-  payload_off: "closed"
-  device_class: door
-- platform: mqtt
-  name: "Front Door"
-  state_topic: "smartthings/Front Door/contact"
-  payload_on: "open"
-  payload_off: "closed"
-  device_class: door
-- platform: mqtt
-  name: "Laundry Room Door"
-  state_topic: "smartthings/Laundry Room Door/contact"
-  payload_on: "open"
-  payload_off: "closed"
-  device_class: door
-- platform: mqtt
-  name: "Attic Door" # Dome Door Sensor
-  state_topic: "smartthings/Attic Door/contact"
-  payload_on: "open"
-  payload_off: "closed"
-  device_class: door
-- platform: mqtt
-  name: "Side Door" # Dome Door Sensor
-  state_topic: "smartthings/Side Door/contact"
-  payload_on: "open"
-  payload_off: "closed"
-  device_class: door
diff --git a/binary_sensors/motion.yaml b/binary_sensors/motion.yaml
deleted file mode 100644
index 6f0dbad..0000000
--- a/binary_sensors/motion.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- platform: mqtt
-  name: "Garage Dome Sensor" # Dome Motion Sensor
-  state_topic: "smartthings/Garage Motion/motion"
-  payload_on: "active"
-  payload_off: "inactive"
-  device_class: motion
diff --git a/configuration.yaml b/configuration.yaml
index 091d7a4..bbbb45c 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -79,7 +79,7 @@ cloud:
         name: Garage Humidity
         description: Garage Humidity
 
-alexa:
+#alexa:
 
 # homekit:
 #   filter:
@@ -113,6 +113,11 @@ device_tracker:
     max_gps_accuracy: 200
     prefix: life360
     show_as_state: driving, moving, places
+  #- platform: eero_tracker
+  #  consider_home: 300
+  #  interval_seconds: 60
+  #  track_new_devices: yes
+  #  only_macs: "50:dc:e7:5b:10:69, b0:ee:7b:94:31:21, e8:b2:ac:4c:8c:01, 7c:1c:4e:2e:62:30, 90:18:7c:84:46:ed, 48:ba:4e:65:d3:ff, d0:e7:82:ef:a6:1f, 28:18:78:74:79:10, e8:ab:fa:02:03:53, 48:d6:d5:42:e8:86, 60:f8:1d:be:20:46, 68:54:fd:d5:ae:3d, 00:d0:2d:2f:3b:ca, 6c:70:9f:00:ef:3f, 5c:cf:7f:af:04:50, 68:54:fd:29:20:87, 64:52:99:93:f1:b3, 7c:2e:bd:4f:3e:ff"
 
 #calendar:
 #  - platform: caldav
@@ -141,6 +146,7 @@ sun:
 
 #https://home-assistant.io/components/recorder/
 recorder:
+  #db_url: sqlite:///data/home-assistant_v2.db
   purge_keep_days: 2
   exclude:
     domains:
@@ -155,36 +161,32 @@ recorder:
 #  purge_keep_days: 3
 
 logbook:
-  exclude:
-    entities:
-      - sensor.last_boot
-      - sensor.date
-      - sensor.ha_log
-      - sensor.ha_uptime
-      - sensor.cpu
-      - sensor.date_time
-      - sensor.ha_v2db
-      - sensor.internet_time
-      - sensor.last_boot_2
-      - sensor.load_15m
-      - sensor.memory_use_percent
-      - sensor.network_in_eth0
-      - sensor.network_out_eth0
-      - sensor.processor_use
-      - sensor.time
-      - sensor.time_date
-      - sensor.time_utc
+  include:
+    domains:
+      - sensor
+      - switch
+      - media_player
+      - light
+      - automation
+      - script
+      - input_boolean
 
 
 #https://home-assistant.io/components/logger/
 logger:
-  default: info
-#
-#  logs:
+  default: warning
+  logs:
+    homeassistant.components.sensor.alpha_vantage: debug
 #    homeassistant.components.sensor.template: critical
 #    homeassistant.components.cover: critical
 
 history:
+  include:
+    domains:
+      - sensor
+      - switch
+      - media_player
+      - light
 
 cast:
 
@@ -210,9 +212,9 @@ ffmpeg:
   ffmpeg_bin: /usr/bin/ffmpeg    
 
 splunk:
-  host: 192.168.7.40
-  token: !secret splunkit
-  port: 8088
+ host: 192.168.7.40
+ token: !secret splunkit
+ port: 8088
 
 cloudflare:
   email: !secret cloudflare_user
@@ -248,10 +250,10 @@ python_script:
 
 # Disabled due to bug that causes too many open files - Need to track it down
 # cover:
-#   - platform: myq
-#     username: !secret myq_user
-#     password: !secret myq_pass
-#     type: chamberlain
+#   platform: myq
+#   username: !secret myq_user
+#   password: !secret myq_pass
+#   type: chamberlain
 
 climate:
   platform: honeywell
@@ -298,6 +300,6 @@ shell_command:
   tiki_room_audio: mpg123 /media/audio/tiki_room_audio.mp3
   illuminations_audio: mpg123 /media/audio/illuminations.mp3
   mk_audio: mpg123 /media/audio/magic_kingdom.mp3
-  usps: python3 /home/homeassistant/bin/usps.py 
+  usps: python /home/homeassistant/bin/usps.py 
   backup: python /home/homeassistant/bin/dropbox.py
 
diff --git a/groups.yaml b/groups.yaml
index 449b46e..69115c3 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -29,3 +29,14 @@ House Conditions:
   - sensor.accurite_back_porch_humidity
   - sensor.accurite_garage_temperature
   - sensor.accurite_garage_humidity
+
+External Doors:
+  - binary_sensor.dome_door_window_sensor_sensor
+  - binary_sensor.ecolink_door_window_sensor_sensor_2
+  - binary_sensor.ecolink_door_window_sensor_sensor_3
+  - binary_sensor.ecolink_door_window_sensor_sensor_4
+  - binary_sensor.ecolink_garage_door_tilt_sensor_sensor
+
+Internal Doors:
+  - binary_sensor.dome_door_window_sensor_sensor_2
+
diff --git a/input_boolean.yaml b/input_boolean.yaml
index 206c90d..c75fc23 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -115,4 +115,6 @@ tweet_iss:
 tweet_snark:
   name: Tweet Snark
   icon: mdi:twitter
-
+washer_notification:
+  name: Washer Notification
+  icon: mdi:speaker-wireless
diff --git a/lights/kitchen.yaml b/lights/kitchen.yaml
deleted file mode 100644
index 0198e30..0000000
--- a/lights/kitchen.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-- platform: mqtt
-  name: "Kitchen Cabinets"
-  state_topic: "smartthings/Kitchen Cabinets/switch"
-  command_topic: "smartthings/Kitchen Cabinets/switch"
-  brightness_state_topic: "smartthings/Kitchen Cabinets/level"
-  brightness_command_topic: "smartthings/Kitchen Cabinets/level"
-  brightness_scale: 101
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
-- platform: mqtt
-  name: "Kitchen Light Strip"
-  state_topic: "smartthings/Kitchen Light Strip/switch"
-  command_topic: "smartthings/Kitchen Light Strip/switch"
-  brightness_state_topic: "smartthings/Kitchen Light Strip/level"
-  brightness_command_topic: "smartthings/Kitchen Light Strip/level"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
diff --git a/packages/disney.yaml b/packages/disney.yaml
index 1305386..c37b8c3 100644
--- a/packages/disney.yaml
+++ b/packages/disney.yaml
@@ -56,8 +56,8 @@ automation:
       entity_id: input_boolean.tiki_room_audio
       to: 'off'
     action:
-    - service: script.turn_off
-      entity_id: script.tiki_room_audio
+    - service: media_player.media_stop
+      entity_id: media_player.hass_speaker
     - service: script.turn_on
       entity_id: script.kill_this_ride
   - id: illuminations_on
@@ -335,6 +335,8 @@ script:
     - service: shell_command.mk_audio
   kill_this_ride:
     sequence:
+    - service: media_player.media_stop
+      entity_id: media_player.hass_speaker
     - service: shell_command.alarm_off
     - service: script.turn_off
       data:
@@ -492,7 +494,12 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    - service: shell_command.tiki_room_audio
+    #- service: shell_command.tiki_room_audio
+    - service: media_player.play_media
+      entity_id: media_player.hass_speaker
+      data:
+        media_content_id: /media/audio/tiki_room_audio.mp3
+        media_content_type: "music"
   happy_ever_after:
     sequence:
     - condition: state
diff --git a/packages/notify.yaml b/packages/notify.yaml
index d70de06..55d0aff 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -118,6 +118,9 @@ script:
       - condition: state
         entity_id: input_boolean.vacation_mode
         state: 'off'
+      - condition: state
+        entity_id: media_player.hass_speaker
+        state: 'idle'
       - service: tts.google_say
         data_template:
           entity_id: media_player.hass_speaker
diff --git a/packages/weather_alerts_nws.yaml b/packages/weather_alerts_nws.yaml
index 15cc460..ec70060 100644
--- a/packages/weather_alerts_nws.yaml
+++ b/packages/weather_alerts_nws.yaml
@@ -86,7 +86,7 @@ automation:
       - condition: template
         value_template: '{{ trigger.to_state.state|float > trigger.from_state.state|float }}'
     action:
-      - service: notify.all_ios
+      - service: notify.jeff_ios
         data_template:
           message: >
             {% if states.sensor.nws_alerts.attributes.title.split(' - ')[5] is defined %}
@@ -116,7 +116,7 @@ automation:
         - condition: template
           value_template: '{{ trigger.to_state.state|float > trigger.from_state.state|float }}'
         - condition: template
-          value_template: "{{ (('Severe' in states.sensor.nws_alerts.attributes.title) or ('Thunderstorm' in states.sensor.nws_alerts.attributes.title) or ('Flood' in states.sensor.nws_alerts.attributes.title)) and 'Warning' in states.sensor.nws_alerts.attributes.title }}"
+          value_template: "{{ (('Severe' in states.sensor.nws_alerts.attributes.title) or ('Thunderstorm' in states.sensor.nws_alerts.attributes.title)) and 'Warning' in states.sensor.nws_alerts.attributes.title }}"
     action:
       - service: script.voice_notify
         data_template:
@@ -197,4 +197,4 @@ script:
         data_template:
           notification_id: "nwswxalert"
           message: "{{ message }}"
-          title: '{{ title }}'
\ No newline at end of file
+          title: '{{ title }}'
diff --git a/scenes.yaml b/scenes.yaml
index b45006d..461982c 100644
--- a/scenes.yaml
+++ b/scenes.yaml
@@ -1,12 +1,33 @@
+- name : test
+  entities:
+    light.tower_lamp_2:
+      state: on
+      brightness: 250
+      color_name: "blue"
+
+- name : test2
+  entities:
+    light.tower_lamp_2:
+      state: on
+      brightness: 250
+      color_name: "soft white"
+
+- name : test3
+  entities:
+    light.tower_lamp_2:
+      state: on
+      brightness: 250
+      hs_color: "195,0"
+
 - name: normal livingroom lighting
   entities:
     light.tower_lamp_2:
       state: on
       brightness: 250
-    light.front_lamp:
+    light.front_lamp_2:
       state: on
       brightness: 250
-    light.table_lamp:
+    light.table_lamp_2:
       state: on
       brightness: 250
 
@@ -15,11 +36,11 @@
     light.tower_lamp_2:
       state: on
       brightness: 40
-    light.front_lamp:
+    light.front_lamp_2:
       state: off
-    light.table_lamp:
+    light.table_lamp_2:
       state: off
-    switch.fireplace_lights:
+    switch.ge_12722_on_off_relay_switch_switch:
       state: off
 
 - name: illuminations livingroom lighting two
@@ -27,12 +48,12 @@
     light.tower_lamp_2:
       state: on
       brightness: 40
-    light.front_lamp:
+    light.front_lamp_2:
       state: on
       brightness: 40
-    light.table_lamp:
+    light.table_lamp_2:
       state: off
-    switch.fireplace_lights:
+    switch.ge_12722_on_off_relay_switch_switch:
       state: off
 
 - name: illuminations livingroom lighting three
@@ -40,13 +61,13 @@
     light.tower_lamp_2:
       state: on
       brightness: 40
-    light.front_lamp:
+    light.front_lamp_2:
       state: on
       brightness: 40
-    light.table_lamp:
+    light.table_lamp_2:
       state: on
       brightness: 40
-    switch.fireplace_lights:
+    switch.ge_12722_on_off_relay_switch_switch:
       state: off
 
 - name: night time livingroom lighting
@@ -54,36 +75,36 @@
     light.tower_lamp_2:
       state: on
       brightness: 10
-    light.front_lamp:
+    light.front_lamp_2:
       state: off
-    light.table_lamp:
+    light.table_lamp_2:
       state: off
-    switch.fireplace_lights:
+    switch.ge_12722_on_off_relay_switch_switch:
       state: off
 
 - name: diminished kitchen lighting
   entities:
-    light.kitchen_cabinets:
+    light.front_room_level:
       state: on
       brightness: 10
-    light.kitchen_light_strip:
+    light.leviton_dzpd3_2bw_decora_300w_plug_in_smart_dimmer_level:
       state: off
 
 - name: normal kitchen lighting
   entities:
-    light.kitchen_cabinets:
+    light.front_room_level:
       state: on
       brightness: 250
-    light.kitchen_light_strip:
+    light.leviton_dzpd3_2bw_decora_300w_plug_in_smart_dimmer_level:
       state: on
 
 - name: haunted preshow
   entities:
-    light.kitchen_cabinets:
+    light.front_room_level:
       state: off
-    light.kitchen_light_strip:
+    light.leviton_dzpd3_2bw_decora_300w_plug_in_smart_dimmer_level:
       state: off
-    switch.upstairs_light:
+    switch.ge_14291_in_wall_smart_switch_switch_2:
       state: off
     light.tower_lamp_2:
       state: on
@@ -94,16 +115,16 @@
     light.table_lamp:
       state: on
       brightness: 40
-    switch.fireplace_lights:
+    switch.ge_12722_on_off_relay_switch_switch:
       state: off
 
 - name: haunted lights out
   entities:
-    light.kitchen_cabinets:
+    light.front_room_level:
       state: off
-    light.kitchen_light_strip:
+    light.leviton_dzpd3_2bw_decora_300w_plug_in_smart_dimmer_level:
       state: off
-    switch.upstairs_light:
+    switch.ge_14291_in_wall_smart_switch_switch_2:
       state: off
     light.tower_lamp_2:
       state: off
@@ -111,7 +132,7 @@
       state: off
     light.table_lamp:
       state: off
-    switch.fireplace_lights:
+    switch.ge_12722_on_off_relay_switch_switch:
       state: off
 
 - name: jeff light on
diff --git a/sensors/devices.yaml b/sensors/devices.yaml
index e0e4283..bd80361 100644
--- a/sensors/devices.yaml
+++ b/sensors/devices.yaml
@@ -56,17 +56,4 @@
         friendly_name: "Eero Loft"
         value_template: "{{ 'Online' if is_state('device_tracker.eero_loft', 'home') else 'Offline' }}"
 
-      smoke_kitchen:
-        friendly_name: "Kitchen Smoke"
-        value_template: "{{ 'Smoke Detected!' if is_state('device_tracker.eero_loft', 'smoke') else 'All Clear' }}"
-
-      security_status:
-        friendly_name: 'Security System'
-        value_template: '{{ "Armed" if is_state("input_boolean.secure_mode", "on") else "Disarmed" }}'
-        icon_template: '{%- if is_state("input_boolean.secure_mode", "on") %}mdi:lock{% else %}mdi:lock-open{%- endif %}'
-
-      garage_motion:
-        friendly_name: "Garage Motion"
-        value_template: "{{ 'open' if is_state('sensor.garage_dome_sensor', 'motion') else 'clear' }}"
-
       
diff --git a/sensors/finance.yaml b/sensors/finance.yaml
index 2ae2ab0..bec549a 100644
--- a/sensors/finance.yaml
+++ b/sensors/finance.yaml
@@ -1,14 +1,28 @@
 - platform: alpha_vantage
   api_key: !secret alpha_vantage
   symbols:
-    - symbol: SIRI
-      name: Sirius
-    - symbol: BAC
-      name: BoA
-    - symbol: INTC
-      name: Intel
+    #- symbol: SIRI
+    #  name: Sirius
+    #- symbol: BAC
+    #  name: BoA
+    #- symbol: INTC
+    #  name: Intel
     - symbol: DIS
       name: Disney
-    - symbol: BKS 
-      name: Barnes & Noble
-
+    #- symbol: BKS 
+    #  name: Barnes & Noble
+- platform: mqtt
+  name: "Disney"
+  state_topic: "stock/DIS/price"
+- platform: mqtt
+  name: "BoA"
+  state_topic: "stock/BAC/price"
+- platform: mqtt
+  name: "Intel"
+  state_topic: "stock/INTC/price"
+- platform: mqtt
+  name: "Sirius"
+  state_topic: "stock/SIRI/price"
+- platform: mqtt
+  name: "Barnes and Nobel"
+  state_topic: "stock/BKS/price"
\ No newline at end of file
diff --git a/sensors/github.yaml b/sensors/github.yaml
new file mode 100644
index 0000000..6a695e8
--- /dev/null
+++ b/sensors/github.yaml
@@ -0,0 +1,5 @@
+- platform: github
+  access_token: !secret github_token
+  repositories:
+    - path: 'thejeffreystone/home-assistant-configuration'
+
diff --git a/sensors/house.yaml b/sensors/house.yaml
new file mode 100644
index 0000000..f7467c7
--- /dev/null
+++ b/sensors/house.yaml
@@ -0,0 +1,4 @@
+- platform: mqtt
+  name: "Washer Status"
+  state_topic: "house/washer/status"
+
diff --git a/sensors/security.yaml b/sensors/security.yaml
deleted file mode 100644
index 957a25f..0000000
--- a/sensors/security.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- platform: mqtt
-  name: "Kitchen Smoke"
-  state_topic: "smartthings/Kitchen Smoke/smoke"
-  payload_available: "smoke"
-  payload_not_available: "clear"
-
diff --git a/sensors/weather.yaml b/sensors/weather.yaml
index a0010ef..5a8382b 100644
--- a/sensors/weather.yaml
+++ b/sensors/weather.yaml
@@ -33,7 +33,6 @@
     minutes: 5
     seconds: 0
     milliseconds: 0
-- platform: moon
 - platform: pollen
   zip_code: "30017"
   monitored_conditions:
@@ -70,82 +69,6 @@
 - platform: mqtt
   name: "Accurite Garage lupdate"
   state_topic: "house/accurite-10968/lastupdate"
-- platform: nws_alerts
-  zone_id: 'GAZ034'
-# - platform: rest
-#   resource: https://api.weather.gov/alerts/active/count
-#   name: NWS Alert Count Raw
-#   value_template: >
-#    {% if value_json is defined and value_json.zones.GAZ034 is defined %}
-#      {{ value_json.zones.GAZ034 }}
-#    {% else %}
-#      0
-#    {% endif %}
-#   headers:
-#     User-Agent: Homeassistant
-#     Accept: application/ld+json
-#   scan_interval: 60
-
-# - platform: template
-#   sensors:
-#   nws_alert_count_filtered:
-#     friendly_name: NWS Alert Count
-#     entity_id: sensor.nws_alert_count_raw
-#     value_template: >
-#      {% if is_state('sensor.nws_alert_count_raw', 'unavailable') or is_state('sensor.nws_alert_count_raw', 'unknown') %}
-#        {{ states.sensor.nws_alert_count_filtered.state }}
-#      {% else %}
-#        {{ states.sensor.nws_alert_count_raw.state }}
-#      {% endif %}
-
-# - platform: rest
-#   resource: https://api.weather.gov/alerts/active?zone=GAZ034
-#   name: NWS Alert Event Raw
-#   value_template: >
-#    {% if value_json.features[0] is defined %}
-#      {{ value_json['features'][0]['properties'].event }}
-#    {% else %}
-#      None
-#    {% endif %}
-#   json_attributes:
-#   - features
-#   headers:
-#     User-Agent: Homeassistant
-#     Accept: application/geo+json
-#   scan_interval: 60
-
-# - platform: template
-#   sensors:
-#   nws_alert_event_filtered:
-#     friendly_name: NWS Alert Event
-#     entity_id: sensor.nws_alert_event_raw
-#     value_template: >
-#      {% if is_state('sensor.nws_alert_event_raw', 'unavailable') or is_state('sensor.nws_alert_event_raw', 'unknown') %}
-#        {{ states.sensor.nws_alert_event_filtered.state }}
-#      {% else %}
-#        {{ states.sensor.nws_alert_event_raw.state }}
-#      {% endif %}
-
-# - platform: template
-#   sensors:
-#     nws_alert_event_2:
-#       friendly_name: NWS Alert Event 2
-#       entity_id: sensor.nws_alert_event_raw
-#       value_template: >
-#        {% if state_attr('sensor.nws_alert_event_raw', 'features')[1] is defined %}
-#          {{ state_attr('sensor.nws_alert_event_raw', 'features')[1]['properties'].event }}
-#        {% else %}
-#          None
-#        {% endif %}
-#     nws_alert_event_3:
-#       friendly_name: NWS Alert Event 3
-#       entity_id: sensor.nws_alert_event_raw
-#       value_template: >
-#        {% if state_attr('sensor.nws_alert_event_raw', 'features')[2] is defined %}
-#          {{ state_attr('sensor.nws_alert_event_raw', 'features')[2]['properties'].event }}
-#        {% else %}
-#          None
-#        {% endif %}
 
 - platform: template
   sensors:
diff --git a/switches/alarms.yaml b/switches/alarms.yaml
deleted file mode 100644
index 089628b..0000000
--- a/switches/alarms.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# - platform: mqtt
-#   name: "Tornado Alarm"
-#   state_topic: "smartthings/Tornado Alarm/switch"
-#   command_topic: "smartthings/Tornado Alarm/switch"
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
diff --git a/switches/living_room.yaml b/switches/living_room.yaml
index 77eea08..d50a1bc 100644
--- a/switches/living_room.yaml
+++ b/switches/living_room.yaml
@@ -1,10 +1,3 @@
-- platform: mqtt
-  name: "Fireplace Lights"
-  state_topic: "smartthings/Fireplace Lights/switch"
-  command_topic: "smartthings/Fireplace Lights/switch"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
 - platform: mqtt
   name: "Incense"
   state_topic: "smartthings/Incense/switch"
diff --git a/switches/master_bedroom.yaml b/switches/master_bedroom.yaml
deleted file mode 100644
index 8b13789..0000000
--- a/switches/master_bedroom.yaml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/switches/outside.yaml b/switches/outside.yaml
deleted file mode 100644
index 5cbd916..0000000
--- a/switches/outside.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- platform: mqtt
-  name: "Driveway Light"
-  state_topic: "smartthings/Driveway Light/switch"
-  command_topic: "smartthings/Driveway Light/switch"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
-- platform: mqtt
-  name: "Side Door"
-  state_topic: "smartthings/Side Door Light/switch"
-  command_topic: "smartthings/Side Door Light/switch"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
-- platform: mqtt
-  name: "Front Porch"
-  state_topic: "smartthings/Front Porch/switch"
-  command_topic: "smartthings/Front Porch/switch"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
diff --git a/switches/upstairs.yaml b/switches/upstairs.yaml
deleted file mode 100644
index 550940e..0000000
--- a/switches/upstairs.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- platform: mqtt
-  name: "Upstairs Light"
-  state_topic: "smartthings/Upstairs Light/switch"
-  command_topic: "smartthings/Upstairs Light/switch"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
-- platform: mqtt
-  name: "Main Theater"
-  state_topic: "smartthings/Theater AV/switch"
-  command_topic: "smartthings/Teather AV/switch"
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
diff --git a/templates/nightly_report.yaml b/templates/nightly_report.yaml
index aa24037..0ebe85a 100644
--- a/templates/nightly_report.yaml
+++ b/templates/nightly_report.yaml
@@ -8,24 +8,29 @@
     {% endif %}
   {% endmacro %}
   {% macro getBirthdays() %}
-    {% if states.sensor.birthday_skylar.state | int < 2 %}
+    {% if states.sensor.birthday_skylar.state | int == 1 %}
       Tomorrow is Skylar's Birthday.
     {% endif %}
-    {% if states.sensor.birthday_jeff.state | int < 2 %}
+    {% if states.sensor.birthday_skylar.state | int > 1 %}
+        {% if states.sensor.birthday_skylar.state | int < 5 %}
+          Skylar's birthday is in {{states.sensor.birthday_skylar.state}} days!
+        {% endif %}
+    {% endif %}
+    {% if states.sensor.birthday_jeff.state | int == 1 %}
       Tomorrow is Jeff's Birthday.
     {% endif %}
-    {% if states.sensor.birthday_kat.state | int < 2 %}
+    {% if states.sensor.birthday_kat.state | int == 1 %}
       Tomorrow is Katherine's Birthday.
     {% endif %}
-    {% if states.sensor.anniversary_our_wedding.state | int < 2 %}
+    {% if states.sensor.anniversary_our_wedding.state | int == 1 %}
       Tomorrow is Jeff and Katherine's Wedding Anniversary. 
     {% endif %}
   {% endmacro %}
   {% macro getHolidays() %}
-    {% if states.sensor.holiday_halloween.state | int < 2 %}
+    {% if states.sensor.holiday_halloween.state | int == 1 %}
       Tomorrow is Halloween. Hope you have picked out a costume.
     {% endif %}
-    {% if states.sensor.holiday_christmas.state | int < 2 %}
+    {% if states.sensor.holiday_christmas.state | int == 1 %}
       Tomorrow is Christmas. It's practically here!
     {% endif %}
   {% endmacro %}
diff --git a/templates/twitter_new_ha.yaml b/templates/twitter_new_ha.yaml
index 7cf33ca..c4f1cdd 100644
--- a/templates/twitter_new_ha.yaml
+++ b/templates/twitter_new_ha.yaml
@@ -7,11 +7,11 @@
        ] | random -}}
   {% endmacro %}
   {% macro getVersion() %}
-    @homeassistant version {{ states.sensor.current_ha_version.state }} is out.
+    #homeassistant version {{ states.sensor.current_ha_version.state }} is out.
   {% endmacro %}
   {%- macro getRandomSnark() -%}
     {{- [
-      " It’s like Patch Tuesday, but with less fail. #homeassistant",
+      " It’s like Patch Tuesday, but without the fail. #homeassistant",
       " Get in my SD Card! #homeassistant",
       " Shut up and take my ones and zeros! #homeassistant",
       " Seriously, you want some of this! #homeassistant",
@@ -27,7 +27,6 @@
 
   {# a macro to call all macros :)  #}
     {%- macro mother_of_all_macros() -%}
-      It is {{ now().strftime("%I:%M %p") }}.
       {{ getIntro() }}
       {{ getVersion() }}
       {{ getRandomSnark() }}
@@ -39,4 +38,4 @@
 
   
 
-  
\ No newline at end of file
+