diff --git a/apps/kitchen.yaml b/apps/kitchen.yaml
index 3eb3a24..3f1de93 100644
--- a/apps/kitchen.yaml
+++ b/apps/kitchen.yaml
@@ -1,6 +1,6 @@
 kitchen:
   module: controller
-  class: ControllerRoom
+  class: ControllerRoomLights
   entities:
     - light.kitchen
 
diff --git a/apps/living_room.yaml b/apps/living_room.yaml
new file mode 100644
index 0000000..a883eb1
--- /dev/null
+++ b/apps/living_room.yaml
@@ -0,0 +1,131 @@
+living_room:
+  module: controller
+  class: ControllerRoomLights
+  entities:
+    - light.living_room
+    - light.couch_corner
+
+living_room_motion:
+  module: controller
+  class: ControllerMotion
+  dependencies: living_room
+  room: living_room
+  entities:
+    - binary_sensor.motion_living_room
+  off_duration: 00:30:00
+
+living_room_button:
+  module: controller
+  class: ControllerButton
+  dependencies: living_room
+  room: living_room
+  buttons:
+    - living_room
+
+living_room_daylight:
+  module: controller
+  class: ControllerDaylight
+  entities:
+    - light.living_room
+  latitude: 30.150380
+  longitude: -97.4487
+  periods:
+    - time: '04:00:00am'
+      brightness: 75
+      color_temp: 200
+
+    - elevation: 0
+      direction: rising
+      brightness: 150
+      color_temp: 200
+
+    - time: noon
+      brightness: 255
+      color_temp: 250
+
+    - elevation: 20
+      direction: setting
+      brightness: 200
+      color_temp: 275
+
+    - elevation: 0
+      direction: setting
+      brightness: 200
+      color_temp: 325
+
+    - elevation: -20
+      direction: setting
+      brightness: 200
+      color_temp: 350
+
+    - time: '10:30:00pm'
+      brightness: 75
+      color_temp: 400
+
+couch_corner_daylight:
+  module: controller
+  class: ControllerDaylight
+  entities:
+    - light.couch_corner
+  latitude: 30.150380
+  longitude: -97.4487
+  periods:
+    - time: sunrise
+      brightness: 20
+      color_temp: 200
+    - time: noon
+      brightness: 80
+      color_temp: 300
+    - time: sunset
+      brightness: 20
+      color_temp: 400
+
+  # scene:
+  #   - time: sunrise
+  #     scene:
+  #       light.living_room:
+  #         state: on
+  #         color_temp: 200
+  #         brightness_pct: 30
+  #       light.corner_light:
+  #         state: on
+  #         color_temp: 200
+  #         brightness_pct: 7
+  #   - time: '09:00:00'
+  #     scene:
+  #       light.living_room:
+  #         state: on
+  #         color_temp: 250
+  #         brightness_pct: 50
+  #       light.corner_light:
+  #         state: on
+  #         color_temp: 250
+  #         brightness_pct: 25
+  #   - time: '12:00:00'
+  #     scene:
+  #       light.living_room:
+  #         state: on
+  #         color_temp: 300
+  #         brightness_pct: 100
+  #       light.corner_light:
+  #         state: on
+  #         color_temp: 450
+  #         brightness_pct: 50
+  #   - time: 'sunset'
+  #     off_duration: '01:00:00'
+  #     scene:
+  #       light.living_room:
+  #         state: on
+  #         color_temp: 350
+  #         brightness_pct: 70
+  #       light.corner_light:
+  #         state: on
+  #         color_temp: 650
+  #         brightness_pct: 10
+  # sleep: input_boolean.sleeping
+  # sleep_scene:
+  #   off_duration: '00:02:00'
+  #   light.living_room:
+  #     state: 'on'
+  #     color_name: 'red'
+  #     brightness_pct: 50
\ No newline at end of file
diff --git a/apps/rooms.yaml b/apps/rooms.yaml
index 7543c45..49f365a 100755
--- a/apps/rooms.yaml
+++ b/apps/rooms.yaml
@@ -112,63 +112,63 @@ bedroom:
           brightness_pct: 10
   sleep: input_boolean.sleeping
 
-living_room:
-  module: basic_motion
-  class: MotionLight
-  entity: light.living_room
-  sensor: binary_sensor.motion_living_room
-  off_duration: '00:30:00'
-  button: living_room
-  door: binary_sensor.front_door
-  scene:
-    - time: sunrise
-      scene:
-        light.living_room:
-          state: on
-          color_temp: 200
-          brightness_pct: 30
-        light.corner_light:
-          state: on
-          color_temp: 200
-          brightness_pct: 7
-    - time: '09:00:00'
-      scene:
-        light.living_room:
-          state: on
-          color_temp: 250
-          brightness_pct: 50
-        light.corner_light:
-          state: on
-          color_temp: 250
-          brightness_pct: 25
-    - time: '12:00:00'
-      scene:
-        light.living_room:
-          state: on
-          color_temp: 300
-          brightness_pct: 100
-        light.corner_light:
-          state: on
-          color_temp: 450
-          brightness_pct: 50
-    - time: 'sunset'
-      off_duration: '01:00:00'
-      scene:
-        light.living_room:
-          state: on
-          color_temp: 350
-          brightness_pct: 70
-        light.corner_light:
-          state: on
-          color_temp: 650
-          brightness_pct: 10
-  sleep: input_boolean.sleeping
-  sleep_scene:
-    off_duration: '00:02:00'
-    light.living_room:
-      state: 'on'
-      color_name: 'red'
-      brightness_pct: 50
+# living_room:
+#   module: basic_motion
+#   class: MotionLight
+#   entity: light.living_room
+#   sensor: binary_sensor.motion_living_room
+#   off_duration: '00:30:00'
+#   button: living_room
+#   door: binary_sensor.front_door
+#   scene:
+#     - time: sunrise
+#       scene:
+#         light.living_room:
+#           state: on
+#           color_temp: 200
+#           brightness_pct: 30
+#         light.corner_light:
+#           state: on
+#           color_temp: 200
+#           brightness_pct: 7
+#     - time: '09:00:00'
+#       scene:
+#         light.living_room:
+#           state: on
+#           color_temp: 250
+#           brightness_pct: 50
+#         light.corner_light:
+#           state: on
+#           color_temp: 250
+#           brightness_pct: 25
+#     - time: '12:00:00'
+#       scene:
+#         light.living_room:
+#           state: on
+#           color_temp: 300
+#           brightness_pct: 100
+#         light.corner_light:
+#           state: on
+#           color_temp: 450
+#           brightness_pct: 50
+#     - time: 'sunset'
+#       off_duration: '01:00:00'
+#       scene:
+#         light.living_room:
+#           state: on
+#           color_temp: 350
+#           brightness_pct: 70
+#         light.corner_light:
+#           state: on
+#           color_temp: 650
+#           brightness_pct: 10
+#   sleep: input_boolean.sleeping
+#   sleep_scene:
+#     off_duration: '00:02:00'
+#     light.living_room:
+#       state: 'on'
+#       color_name: 'red'
+#       brightness_pct: 50
 
 # kitchen:
 #   module: basic_motion