diff --git a/README.md b/README.md
index 6ae46a75..360da589 100755
--- a/README.md
+++ b/README.md
@@ -8,19 +8,20 @@ Software on the Pi : [Home Assistant](https://home-assistant.io/) , [Dasher](htt
 
 **Devices I have :**
 * Lots of iOS Devices (iPads, iPods, iPhones)
-* [Nest Thermostats](http://amzn.to/2eAhB1k)
+* [Nest Thermostats](http://amzn.to/2eAhB1k) - Smart Thermostat
 * [Amazon Echo](http://amzn.to/2dSVbK4) and [DOT](http://amzn.to/2e3vHFQ)
 * [Amazon Dash Buttons](http://amzn.to/2dPKZhM)
 * [Amazon Fire TV](http://amzn.to/2iiuaNT)
 * [Phillips Hue Hub Gen 2](http://amzn.to/2eoQTJy)
-* [Circle by Disney](http://amzn.to/2eAgaA6)
-* [Rachio Sprinkler system](http://amzn.to/2eoPKBW)
+* [Circle by Disney](http://amzn.to/2eAgaA6) - Parental Monitor for internet and screentime.
+* [Rachio Sprinkler system](http://amzn.to/2eoPKBW) - Smart Sprinkler controller
+* [Withings](http://amzn.to/2kr78nW) - Smart Weight scale
 * [SkyBell HD](http://amzn.to/2dcexIB)
 * [Rokus](http://amzn.to/2dpn89c) for all streaming
 * [Samsung Smart TV](http://amzn.to/2efNNnq)
 * ChromeCast Audios
 * [AMPs](http://amzn.to/2j18dlT) - These are cheap but effective for the Dots, Chromecasts or other speakers.
-* [Etekcity Outlets](http://amzn.to/2efNoBP)
+* [Etekcity Outlets](http://amzn.to/2efNoBP) - Cheap 6 Buck RF outlet control!
 * [Door Sensors (AEON Labs)](http://amzn.to/2e3xDxY)
 * [Garadget](http://amzn.to/2jQLpVQ) - Garage Door opener/sensor - "[Siri, are my garage doors closed?](https://pbs.twimg.com/media/C3cyJZSWAAAalPm.jpg:large)"
 * Nintendo Wii
@@ -29,6 +30,7 @@ Software on the Pi : [Home Assistant](https://home-assistant.io/) , [Dasher](htt
 * [LED RGB Wifi Controller - flux_led compatible](http://amzn.to/2jUBSBE) with [LED Strip kits](http://amzn.to/2gJYfZ5) - ~100 Feet. These are great [Power supplies](http://amzn.to/2j5Vu0D)
 * [Digital Smart Water Main ShutOff/Leak Detector] (http://www.providencecpc.org/wp-content/uploads/2016/01/work_in_progress.png) - Beta test to monitor Water usage and Leaks centrally.
 * [Aeon Labs AEDSB09104ZWUS Aeotec Z-Wave Smart Energy Monitor Meter](http://amzn.to/2l5wEDo) to measure energy usage in the home.
+* [SleepNumber Bed i8](http://amzn.to/2kxdXXI) - Has SleepIQ to track occupancy and sleep habits.  Tied into HA.
 
 **Automations:**
 * Voice Notifications via the [AMPs](http://amzn.to/2j18dlT) connected to ChromeCast Audios.  Accomplished via the [~~Google~~ Amazon Polly TTS](https://home-assistant.io/components/tts/) component.
@@ -54,6 +56,7 @@ Software on the Pi : [Home Assistant](https://home-assistant.io/) , [Dasher](htt
 * (IFTTT) Blink Office lights 15 minutes before ANY meeting on my calendar (using IFTTT)
 * (IFTTT) Stop watering grass via Rachio if winds are greater than 20 MPH. 
 * (IFTTT) Blink ALL lights if Winds get to 70MPH - Hurricance warning.
+* (IFTTT) Trigger Good Night routine when I step on the [Withings](http://amzn.to/2kr78nW) scale after 10pm.
 * Sets up the front lights in the house with preset colors depending on the ~~month~~ day!.
 * On motion from Doorbell (IFTTT) Turn front lights to Bright White lights for 10 minutes and then back to original colors.
 * When someone rings the Doorbell (IFTTT), the backyard and Bathroom lights Flash - Since we might not hear the doorbell.
@@ -142,7 +145,16 @@ command_on: "/var/www/html/rfoutlet/codesend 4543795 -l 177 -p 0"
   Temperature: {{ states[domain][entity].attributes.temperature }}
 {% endfor %}
 
-      
+#More handy tricks!
+
+{% set comma = joiner(', ') %}
+{%- for group in states.light|groupby('state') -%}
+  Lights that are {{ group.grouper|upper }}:{{ ' ' }}
+  {%- for entity in group.list -%}
+    {{ comma() }}{{ entity.name }}
+  {%- endfor -%}
+{%- endfor %}
+   
 ```
 
 
diff --git a/automation/device_status.yaml b/automation/device_status.yaml
index 46dfae36..f96f3345 100755
--- a/automation/device_status.yaml
+++ b/automation/device_status.yaml
@@ -29,6 +29,7 @@
            - sensor.led_rgb_outdoor_den
            #- sensor.withings_scale
            - sensor.smart_water_meter
+           - sensor.sleep_number_bed
            
   action:
     - service: script.ifttt_notify
diff --git a/automation/good_night.yaml b/automation/good_night.yaml
index 94cf96c1..936de947 100755
--- a/automation/good_night.yaml
+++ b/automation/good_night.yaml
@@ -2,25 +2,35 @@
 ##  Good night Routine
 ######################################################################
 
-- alias: 'Good Night Routine'
+- alias: 'Good Night Trigger'
   trigger:
     - platform: event
       event_type: good_night
     - platform: state
       entity_id: 
-        - sensor.samsungtv
-        - sensor.withings_scale
-      state: 'Offline'
-      from: 'Online'
+        - binary_sensor.sleepnumber_carlo_carlo_is_in_bed
+        - binary_sensor.sleepnumber_carlo_stacey_is_in_bed
+      state: 'on'
 
   condition:
-    - condition: time
-      after: '20:00:00'
     - condition: state
       entity_id: input_boolean.guest_mode
       state: 'off'
         
   action:
+    - service: script.Voice_notify
+      data_template:
+        value1: >
+          {{ [
+          "Sleep Tight, Don't let the bedbugs bite.",
+          "Have pleasant dreams",
+          "Dream pleasant dreams.  Tomorrow is a new day.",
+          "Early sleep and early wake up gives health and makes you grow."
+          "ood night, good night! Parting is such sweet sorrow that I shall say goodnight till it is Morrow."
+          "here is a time for many words, and there is also a time for sleep."
+          "his good night isn’t meant to bring an end to this day. It’s intended to wish you awesomeness in what lies ahead."
+          "tuff your worries in your pillow, wrap your troubles in your blanket and spread your anxieties on your sheets. When you wake up tomorrow, you may have dirty linen, but more importantly, you’ll have a fresh mind and a happy heart. Good night."
+          ] | random }}
     - service: script.interior_off
 
       
\ No newline at end of file
diff --git a/customize/device_tracker.yaml b/customize/device_tracker.yaml
index bcde64df..ef2838de 100755
--- a/customize/device_tracker.yaml
+++ b/customize/device_tracker.yaml
@@ -1,142 +1,172 @@
-#Uses the Group Jinja
-
 device_tracker.actiontechap:
   friendly_name: 'Actiontechap'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.alexa_echo:
   friendly_name: 'Alexa Echo'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.amazon_dot:
   friendly_name: 'Amazon Dot'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.carlo:
   friendly_name: 'Carlo'
   emulated_hue: False
   hidden: False
   
+  
  
 device_tracker.chromecast_audio_1:
   friendly_name: 'Chromecast Audio 1'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.chromecast_audio_2:
   friendly_name: 'Chromecast Audio 2'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.circle:
   friendly_name: 'Circle'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.cisco_ap:
   friendly_name: 'Cisco Ap'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.garadget_large:
   friendly_name: 'Garadget Large'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.garadget_small:
   friendly_name: 'Garadget Small'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.hue_hub:
   friendly_name: 'Hue Hub'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.led_rgb_garage_left:
   friendly_name: 'Led Rgb Garage Left'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.led_rgb_garage_small:
   friendly_name: 'Led Rgb Garage Small'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.led_rgb_outdoor_den:
   friendly_name: 'Led Rgb Outdoor Den'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.nest_downstairs:
   friendly_name: 'Nest Downstairs'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.nest_upstairs:
   friendly_name: 'Nest Upstairs'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.rachio:
   friendly_name: 'Rachio'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.samsungtv:
   friendly_name: 'Samsung Tv'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.skybell:
   friendly_name: 'Skybell'
   emulated_hue: False
   hidden: True
   
+  
+ 
+device_tracker.sleep_number_bed:
+  friendly_name: 'Sleep Number Bed'
+  emulated_hue: False
+  hidden: True
+  
+  
  
 device_tracker.smart_water_meter:
   friendly_name: 'Smart Water Meter'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.stacey:
   friendly_name: 'Stacey'
   emulated_hue: False
   hidden: False
   
+  
  
 device_tracker.tablotv:
   friendly_name: 'Tablotv'
   emulated_hue: False
   hidden: True
   
+  
  
 device_tracker.wii:
+  friendly_name: 'Wii'
   emulated_hue: False
   hidden: True
   
+  
 
 device_tracker.withings_scale:
+  friendly_name: 'Withings Scale'
   emulated_hue: False
   hidden: True
\ No newline at end of file
diff --git a/customize/groups.yaml b/customize/groups.yaml
index fb99178d..dc555dbb 100755
--- a/customize/groups.yaml
+++ b/customize/groups.yaml
@@ -3,167 +3,83 @@ group.all_automations:
   emulated_hue: False
   hidden: True
   
+  
  
 group.all_covers:
   friendly_name: 'All Covers'
   emulated_hue: False
   hidden: True
   
+  
  
 group.all_devices:
   friendly_name: 'All Devices'
   emulated_hue: False
   hidden: True
   
+  
  
 group.all_lights:
   friendly_name: 'All Lights'
   emulated_hue: True
   hidden: True
   
+  
  
 group.all_scripts:
   friendly_name: 'All Scripts'
   emulated_hue: False
   hidden: True
   
+  
  
 group.all_switches:
   friendly_name: 'All Switches'
   emulated_hue: True
   hidden: True
   
+  
  
 group.amps:
   friendly_name: 'Amps'
   emulated_hue: True
   hidden: False
   
+  
  
-group.bear_stone_view:
-  friendly_name: 'Bear Stone Run'
+group.sleep_number_bed:
+  friendly_name: 'Sleep Number Bed'
   emulated_hue: False
-  hidden: True
-  icon: mdi:home
+  hidden: False
+  
+  
  
 group.bedroom_lights:
   friendly_name: 'Bedroom Lights'
   emulated_hue: True
   hidden: False
   
+  
  
 group.den_lights:
   friendly_name: 'Den Lights'
   emulated_hue: True
   hidden: False
   
+  
  
 group.dinette_lights:
   friendly_name: 'Dinette Lights'
   emulated_hue: True
   hidden: False
   
+  
  
 group.dining_room_lights:
   friendly_name: 'Dining Room Lights'
   emulated_hue: True
   hidden: False
   
- 
-group.doors:
-  friendly_name: 'Doors'
-  emulated_hue: False
-  hidden: True
-  icon: mdi:security-home
- 
-group.family:
-  friendly_name: 'Family'
-  emulated_hue: False
-  hidden: False
-  
- 
-group.foyer_lights:
-  friendly_name: 'Foyer Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.garage_doors:
-  friendly_name: 'Garage Doors'
-  emulated_hue: False
-  hidden: False
-  
- 
-group.garage_lights:
-  friendly_name: 'Garage Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.hallway_lights:
-  friendly_name: 'Hallway Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.home_modes:
-  friendly_name: 'Home Modes'
-  emulated_hue: False
-  hidden: False
-  
- 
-group.info:
-  friendly_name: 'Info'
-  emulated_hue: False
-  hidden: True
-  icon: mdi:settings
- 
-group.interior_lights:
-  friendly_name: 'Interior Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.kitchen_lights:
-  friendly_name: 'Kitchen Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.lights:
-  friendly_name: 'Lights'
-  emulated_hue: False
-  hidden: True
-  icon: mdi:lightbulb
- 
-group.living_room_accents:
-  friendly_name: 'Living Room Accents'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.living_room_lights:
-  friendly_name: 'Living Room Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.network:
-  friendly_name: 'Network'
-  emulated_hue: False
-  hidden: False
-  
- 
-group.office_lights:
-  friendly_name: 'Office Lights'
-  emulated_hue: True
-  hidden: False
-  
- 
-group.outdoor_front_lights:
-  friendly_name: 'Outdoor Front Lights'
-  emulated_hue: True
-  hidden: False
   
  
 group.exterior_lights:
@@ -171,30 +87,147 @@ group.exterior_lights:
   emulated_hue: True
   hidden: False
   
+  
+ 
+group.family:
+  friendly_name: 'Family'
+  emulated_hue: False
+  hidden: False
+  
+  
+ 
+group.foyer_lights:
+  friendly_name: 'Foyer Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.garage_doors:
+  friendly_name: 'Garage Doors'
+  emulated_hue: False
+  hidden: False
+  
+  
+ 
+group.garage_lights:
+  friendly_name: 'Garage Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.hallway_lights:
+  friendly_name: 'Hallway Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.home_modes:
+  friendly_name: 'Home Modes'
+  emulated_hue: False
+  hidden: False
+  
+  
+ 
+group.interior_lights:
+  friendly_name: 'Interior Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.justins_room:
+  friendly_name: 'Justins Room'
+  emulated_hue: False
+  hidden: False
+  
+  
+ 
+group.kitchen_lights:
+  friendly_name: 'Kitchen Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.living_room_accents:
+  friendly_name: 'Living Room Accents'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.living_room_lights:
+  friendly_name: 'Living Room Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.media_players:
+  friendly_name: 'Media Players'
+  emulated_hue: False
+  hidden: False
+  
+  
+ 
+group.network:
+  friendly_name: 'Network'
+  emulated_hue: False
+  hidden: False
+  
+  
+ 
+group.office_lights:
+  friendly_name: 'Office Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
+ 
+group.outdoor_front_lights:
+  friendly_name: 'Outdoor Front Lights'
+  emulated_hue: True
+  hidden: False
+  
+  
  
 group.outdoor_pool_lights:
   friendly_name: 'Outdoor Pool Lights'
   emulated_hue: True
   hidden: False
   
+  
+ 
+group.paiges_room:
+  friendly_name: 'Paiges Room'
+  emulated_hue: False
+  hidden: False
+  
+  
  
 group.sensors:
   friendly_name: 'Sensors'
   emulated_hue: False
   hidden: False
   
+  
  
 group.switches:
   friendly_name: 'Switches'
   emulated_hue: False
   hidden: False
   
+  
  
 group.upstairs_lights:
   friendly_name: 'Upstairs Lights'
   emulated_hue: True
   hidden: False
   
+  
 
 group.weather:
   friendly_name: 'Weather'
diff --git a/customize/sensors.yaml b/customize/sensors.yaml
index 3be78d39..b218ecb9 100755
--- a/customize/sensors.yaml
+++ b/customize/sensors.yaml
@@ -369,6 +369,13 @@ sensor.skybell:
   icon: mdi:camera-front
   
  
+sensor.sleep_number_bed:
+  friendly_name: 'Sleep Number Bed'
+  emulated_hue: False
+  hidden: False
+  icon: mdi:hotel
+  
+ 
 sensor.sleepnumber_carlo_carlo_sleepnumber:
   friendly_name: 'Carlo Sleepnumber'
   emulated_hue: False
diff --git a/sensor/devices.yaml b/sensor/devices.yaml
index d7c6ddfa..cb3b98e5 100755
--- a/sensor/devices.yaml
+++ b/sensor/devices.yaml
@@ -84,6 +84,10 @@
         friendly_name: 'Smart Water Meter'
         value_template: "{{ 'Online' if is_state('device_tracker.smart_water_meter', 'home') else 'Offline' }}"
 
+      sleep_number_bed:
+        friendly_name: 'Sleep Number Bed'
+        value_template: "{{ 'Online' if is_state('device_tracker.sleep_number_bed', 'home') else 'Offline' }}"
+        
       withings_scale:
         friendly_name: 'WiThings Scale'
         value_template: "{{ 'Online' if is_state('device_tracker.withings_scale', 'home') else 'Offline' }}"