diff --git a/automation/away.yaml b/automation/away.yaml
new file mode 100755
index 00000000..f7406e17
--- /dev/null
+++ b/automation/away.yaml
@@ -0,0 +1,42 @@
+######################################################################
+##  Shut it all down.  No one is here
+######################################################################
+
+- alias: 'Away Mode'
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.upstairs_away_mode
+      to: 'on'
+    - platform: state
+      entity_id: binary_sensor.downstairs_away_mode
+      to: 'on'  
+    - platform: state
+      entity_id: group.family
+      state: not_home 
+
+  condition:
+    condition: and
+    conditions:
+      - condition: state
+        entity_id: group.family
+        state: not_home 
+      - condition: state
+        entity_id: input_boolean.guest_mode
+        state: 'off'
+
+  action:
+    - service: light.turn_off
+      entity_id: group.interior_lights
+    - service: switch.turn_off
+      entity_id: group.amps
+    - delay: 00:01:00
+    - service: switch.turn_off
+      entity_id: switch.foyer_outlet
+    - delay: 00:01:00
+    - service: switch.turn_off
+      entity_id: switch.kitchen_accents
+    - delay: 00:01:00
+    - service: switch.turn_off
+      entity_id: switch.garage_outlet
+      
+      
\ No newline at end of file
diff --git a/automation/good_night.yaml b/automation/good_night.yaml
index 6ab82ca8..cee12fe2 100755
--- a/automation/good_night.yaml
+++ b/automation/good_night.yaml
@@ -1,42 +1,68 @@
 ######################################################################
-##  Shut it all down.  No one is here or we went to sleep.
+##  Weekday Morning Routines for the Wife and Kiddos.
 ######################################################################
 
-- alias: 'GoodNight - Away Mode'
+- alias: 'Good Morning Routine'
   trigger:
     - platform: event
-      event_type: good_night
-    - platform: state
-      entity_id: binary_sensor.upstairs_away_mode
-      to: 'on'
-    - platform: state
-      entity_id: binary_sensor.downstairs_away_mode
-      to: 'on'  
-    - platform: state
-      entity_id: group.family
-      state: not_home 
+      event_type: good_morning
+    - platform: time
+      after: '06:00:00'
 
   condition:
-    condition: and
-    conditions:
-      - condition: state
-        entity_id: group.family
-        state: not_home 
-      - condition: state
-        entity_id: input_boolean.guest_mode
-        state: 'off'
-
+    - condition: state
+      entity_id: group.family
+      state: home 
+    - condition: state
+      entity_id: input_boolean.no_school
+      state: 'off'
+    - condition: time    
+      weekday:
+        - mon
+        - tue
+        - wed
+        - thu
+        - fri
+        
   action:
+    - service: light.turn_on
+      entity_id: 
+        - light.s1
+        - light.s4
+      data:
+        brightness: 150
+    - service: switch.turn_on
+      entity_id: switch.kitchen_accents
+    - delay: 00:01:00
+    - service: switch.turn_on
+      entity_id: switch.kitchen_accents
+    - delay: 00:50:00   
+# 6:50am now.
+    - service: light.turn_on
+      entity_id: 
+        - light.d1
+        - light.d2
+        - group.kitchen_lights
+      data:
+        brightness: 150
     - service: light.turn_off
-      entity_id: group.interior_lights
-    - service: switch.turn_off
-      entity_id: group.amps
-    - delay: 00:01:00
-    - service: switch.turn_off
-      entity_id: switch.foyer_outlet
-    - delay: 00:01:00
+      entity_id: 
+        - group.dining_room_lights
     - service: switch.turn_off
       entity_id: switch.kitchen_accents
+    - delay: 01:00:00 
+# 7:50am now.
+    - service: light.turn_on
+      entity_id: 
+        - group.kitchen_lights
+      data:
+        brightness: 200
 
-      
+    - delay: 00:40:00 
+# 8:30am now.
+    - service: light.turn_off
+      entity_id: 
+        - group.interior_lights
+        
+        
       
\ No newline at end of file
diff --git a/automation/late_night_helper.yaml b/automation/late_night_helper.yaml
index e88af85a..1be1af26 100755
--- a/automation/late_night_helper.yaml
+++ b/automation/late_night_helper.yaml
@@ -12,7 +12,10 @@
     - platform: state
       entity_id: group.family
       state: home 
-
+    - platform: state
+      entity_id: group.garage_doors
+      state: 'open'
+    
   condition:
     condition: and
     conditions:
diff --git a/automation/detect_wasted_electricity.yaml b/automation/watchdog.yaml
similarity index 56%
rename from automation/detect_wasted_electricity.yaml
rename to automation/watchdog.yaml
index 0a7084f3..4ffce985 100755
--- a/automation/detect_wasted_electricity.yaml
+++ b/automation/watchdog.yaml
@@ -2,13 +2,17 @@
 ###  Detect when things are on and forgotten about.
 ##############################################################################
 
-- alias: Printer on for more than 35 minutes
+- alias: Automated Switch WatchDog!
   trigger:
     - platform: state
       entity_id: switch.printer_outlet
       state: 'on'
       for: '00:35:00'
-
+    - platform: state
+      entity_id: switch.garage_outlet
+      state: 'on'
+      for: '03:00:00'
+      
 #Turn it off twice for good measure!
   action:
     - service: switch.turn_off
@@ -18,4 +22,16 @@
     - service: switch.turn_off
       data_template:
         entity_id: "{{ trigger.entity_id }}"
- 
\ No newline at end of file
+ 
+- alias: Automated Light WatchDog!
+  trigger:
+    - platform: state
+      entity_id: light.hallway
+      state: 'on'
+      for: '00:20:00'
+      
+#Turn it off!
+  action:
+    - service: light.turn_off
+      data_template:
+        entity_id: "{{ trigger.entity_id }}"
diff --git a/configuration.yaml b/configuration.yaml
index 0f26b180..8da8d4c3 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -54,6 +54,7 @@ logbook:
       - sensor.garadget_large_time_in_state
       - sensor.garadget_large_wifi_signal_strength
       - sensor.garadget_small_wifi_signal_strength
+      - group.garage_doors
 #logger:
 #  default: info
 recorder: