diff --git a/Todo.md b/Todo.md
index 5254309b..a379f4ec 100755
--- a/Todo.md
+++ b/Todo.md
@@ -1,35 +1,34 @@
 #Todo List
 
-# Break out configuration files.  HASS user.
-
-# AUTOMATE LAMP UPSTAIRS USING ifttt AND Nest thermostat.
-# Put Dash Buttons out there.
-# Put door sensor on garage door
+* AUTOMATE LAMP UPSTAIRS USING ifttt AND Nest thermostat.
+* Put Dash Buttons out there.
+* Put door sensor on garage door
  
-  
- ###  Future Ideas
+ 
+###  Future Ideas
 
-# - alias: 'Get Random Time'
-  # trigger:
-    # platform: time
-    # after: '21:00:00'
-  # action:
-    # - service: input_slider.select_value
-      # data_template:
-        # entity_id: input_slider.hour
-        # value: '{{ (range(22, 23) | random) }}'
-    # - service: input_slider.select_value
-      # data_template:
-        # entity_id: input_slider.random_minute
-        # value: '{{ (range(30, 45) | random) }}'
-# Then simply use that in your light turn off automation:
+- alias: 'Get Random Time'
+     trigger:
+     platform: time
+     after: '21:00:00'
+   action:
+     - service: input_slider.select_value
+       data_template:
+         entity_id: input_slider.hour
+         value: '{{ (range(22, 23) | random) }}'
+     - service: input_slider.select_value
+       data_template:
+         entity_id: input_slider.random_minute
+         value: '{{ (range(30, 45) | random) }}'
 
-# - alias: 'Turn lights off'
-  # trigger:
-    # platform: template
-    # value_template: '{{ now.hour == (states.input_slider.random_hour.state | int) and now.minute == (states.input_slider.random_minute.state | int) }}'
-  # action:
-    # - service: light.turn_off
-      # data: 
-        # entity_id: light.hue_color_lamp_1
+Then simply use that in your light turn off automation:
+
+ - alias: 'Turn lights off'
+   trigger:
+     platform: template
+     value_template: '{{ now.hour == (states.input_slider.random_hour.state | int) and now.minute == (states.input_slider.random_minute.state | int) }}'
+   action:
+     - service: light.turn_off
+       data: 
+         entity_id: light.hue_color_lamp_1
  
\ No newline at end of file
diff --git a/group/lights.yaml b/group/lights.yaml
new file mode 100755
index 00000000..d36e689c
--- /dev/null
+++ b/group/lights.yaml
@@ -0,0 +1,33 @@
+Bedroom:
+  entities:
+    - light.bedroom_stacey_light
+
+Living Room:
+  entities:
+    - light.living_room_back_left
+    - light.living_room_back_right
+    - light.living_room_front_left	
+    - light.living_room_front_right	
+    - light.living_room_slider
+
+Living Room Accents:
+  entities:
+    - light.living_room_couch_1
+    - light.living_room_couch_2
+    - light.couch_tv_light    
+
+Dinette:
+  entities:
+    - light.dinette_light_1
+    - light.dinette_light_2
+
+Study:    
+  entities:
+    - light.front_office_lamp
+
+Office:
+  entities:	
+    - light.office_lamp
+    
+Upstairs:    
+    - light.upstairs_lamp
\ No newline at end of file