diff --git a/automation/good_morning.yaml b/automation/good_morning.yaml
index 4c4d2d0c..fe23bfa2 100755
--- a/automation/good_morning.yaml
+++ b/automation/good_morning.yaml
@@ -22,6 +22,7 @@
       state: 'on'
     - condition: time
       after: '06:00:00'
+      before: '10:00:00'
     - condition: time
       weekday:
         - mon
diff --git a/configuration.yaml b/configuration.yaml
index 078607b3..3da5a1ee 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -58,8 +58,6 @@ emulated_hue:
 ifttt:
   key: !secret ifttt_key
 
-# history:
-
 logbook:
   exclude:
     entities:
@@ -77,8 +75,23 @@ logbook:
       - group.garage_doors
       - sensor.time
       - sensor.date
-#logger:
-#  default: info
+
+history:
+  include:
+    domains:
+      - sensor
+      - switch
+      - media_player
+      - light
+  exclude:
+    entities:
+     - sensor.last_boot
+     - sensor.date
+logger:
+ default: error
+ logs:
+   homeassistant.components.light: info
+   homeassistant.components.input_boolean: info
 recorder:
   purge_days: 7
 
diff --git a/customize/switches.yaml b/customize/switches.yaml
index 7d7907de..b4d57bde 100755
--- a/customize/switches.yaml
+++ b/customize/switches.yaml
@@ -6,6 +6,7 @@ switch.den_outlet:
   emulated_hue: True
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.foyer_outlet:
@@ -13,6 +14,7 @@ switch.foyer_outlet:
   emulated_hue: True
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.front_door_outlet:
@@ -20,13 +22,14 @@ switch.front_door_outlet:
   emulated_hue: True
   hidden: False
   icon: mdi:power-plug
-
+  assumed_state: true
 
 switch.garage_outlet:
   friendly_name: 'Garage Outlet'
   emulated_hue: True
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.ge_outdoor_outle_switch_7_0:
@@ -48,6 +51,7 @@ switch.kitchen_accent_2:
   emulated_hue: False
   hidden: False
   icon: mdi:lightbulb-outline
+  assumed_state: true
 
 
 switch.kitchen_accents:
@@ -55,6 +59,7 @@ switch.kitchen_accents:
   emulated_hue: True
   hidden: False
   icon: mdi:lightbulb-outline
+  assumed_state: true
 
 
 switch.living_room_amp:
@@ -62,6 +67,7 @@ switch.living_room_amp:
   emulated_hue: True
   hidden: False
   icon: mdi:music-circle
+  assumed_state: true
 
 
 switch.living_room_outlet:
@@ -69,6 +75,7 @@ switch.living_room_outlet:
   emulated_hue: True
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.outlet_304_1:
@@ -76,6 +83,7 @@ switch.outlet_304_1:
   emulated_hue: False
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.outlet_304_2:
@@ -83,6 +91,7 @@ switch.outlet_304_2:
   emulated_hue: False
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.outlet_304_4:
@@ -90,6 +99,7 @@ switch.outlet_304_4:
   emulated_hue: True
   hidden: False
   icon: mdi:power-plug
+  assumed_state: true
 
 
 switch.printer_outlet:
@@ -97,3 +107,4 @@ switch.printer_outlet:
   emulated_hue: True
   hidden: False
   icon: mdi:printer
+  assumed_state: true
diff --git a/shell_scripts/Jinja Code.py b/shell_scripts/Jinja Code.py
index 1e23e59b..db36cd31 100755
--- a/shell_scripts/Jinja Code.py	
+++ b/shell_scripts/Jinja Code.py	
@@ -1,7 +1,7 @@
 You can use this code to quickly create files from the template editor in HA.  I use it mainly for `emulated_hue` and to quickly add in new Customize options to all things HA!
 
 
-For the sandbox. 
+For the sandbox.
 {% set trigger = {'entity_id':'sensor.downstairs_thermostat_hvac_state','to_state':'cooling'} %}
 
 #########################################################
@@ -10,7 +10,7 @@ Create fast Customize for groups, sensors, covers etc...  Just change that first
 {% for state in states.sensor -%}
   {% if loop.first %}
 {% elif loop.last %}
-{% else %} 
+{% else %}
 {% endif %}
 {{- state.entity_id }}:
   friendly_name: '{{ state.attributes.friendly_name|replace("_"," ",)|title() if state.attributes.friendly_name is defined else state.name|replace("_"," ",)|title() }}'
@@ -18,6 +18,7 @@ Create fast Customize for groups, sensors, covers etc...  Just change that first
   hidden: {{state.attributes.hidden if state.attributes.hidden is defined else "False"}}
   {{'icon: '+ state.attributes.icon if state.attributes.icon is defined}}
   {{'homebridge_cover_type: '+ state.attributes.homebridge_cover_type if state.attributes.homebridge_cover_type is defined}}
+  {{'assumed_state: '+ state.attributes.assumed_state if state.attributes.assumed_state is defined}}
 {% endfor -%}
 
 #########################################################
diff --git a/sounds/dog-barking-2-bullmastiff.mp3 b/sounds/dog-barking-2-bullmastiff.mp3
new file mode 100755
index 00000000..1f730822
Binary files /dev/null and b/sounds/dog-barking-2-bullmastiff.mp3 differ
diff --git a/sounds/german-shephard.mp3 b/sounds/german-shephard.mp3
new file mode 100755
index 00000000..2c04ac17
Binary files /dev/null and b/sounds/german-shephard.mp3 differ