diff --git a/automation/device_status.yaml b/automation/device_status.yaml
index 67ededf4..cdc5c54e 100755
--- a/automation/device_status.yaml
+++ b/automation/device_status.yaml
@@ -22,6 +22,8 @@
            - sensor.nest_downstairs
            - sensor.ciscoap
            - sensor.actiontechap
+           - sensor.garadget_small
+           - sensor.garadget_large
   action:
      service: ifttt.trigger
      data_template: {"event":"device_status", "value1":"{{ trigger.entity_id.split('.')[1] }}", "value2":"{{ trigger.to_state.state }}"}
diff --git a/automation/good_night.yaml b/automation/good_night.yaml
index cee12fe2..665f7966 100755
--- a/automation/good_night.yaml
+++ b/automation/good_night.yaml
@@ -1,65 +1,18 @@
 ######################################################################
-##  Weekday Morning Routines for the Wife and Kiddos.
+##  Good night Routine
 ######################################################################
 
 - alias: 'Good Morning Routine'
   trigger:
     - platform: event
-      event_type: good_morning
-    - platform: time
-      after: '06:00:00'
+      event_type: good_night
 
   condition:
     - 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.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
diff --git a/customize/garadget.yaml b/customize/garadget.yaml
index 9af61d61..72975076 100755
--- a/customize/garadget.yaml
+++ b/customize/garadget.yaml
@@ -1,3 +1,11 @@
+device_tracker.garadget_large:
+  hidden: true
+sensor.garadget_large:
+  icon: mdi:door
+device_tracker.garadget_small:
+  hidden: true
+sensor.garadget_small:
+  icon: mdi:door
 sensor.garadget_small_time_in_state:
   friendly_name: 'Time in State'
   icon: mdi:timer-sand
diff --git a/sensor/devices.yaml b/sensor/devices.yaml
index 809de03b..ee87b205 100755
--- a/sensor/devices.yaml
+++ b/sensor/devices.yaml
@@ -130,4 +130,21 @@
             {% else %}
                 Offline
             {%- endif %}
-  
\ No newline at end of file
+            
+      garadget_large:
+        friendly_name: 'Garadget Large'
+        value_template: >-
+            {%- if is_state("device_tracker.garadget_large", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}  
+            
+      garadget_small:
+        friendly_name: 'Garadget Small'
+        value_template: >-
+            {%- if is_state("device_tracker.garadget_small", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %} 
\ No newline at end of file