diff --git a/app/components/controls/light-control.js b/app/components/controls/light-control.js
index 2903011..e23e173 100644
--- a/app/components/controls/light-control.js
+++ b/app/components/controls/light-control.js
@@ -13,9 +13,16 @@ export default Em.Component.extend({
   colorPickerDisplayed: false,
 
   actions: {
-    clickLight: function(){
-      console.log('clickLight');
-    },
+    clickLight: function(light){
+      var activeLights = this.get('activeLights'),
+        lightId = activeLights.indexOf(light);
+
+      if(lightId !== -1){
+        delete activeLights[lightId];
+      } else {
+        activeLights.pushObject(light);
+      }
+  },
     toggleColorpicker: function() {
       this.toggleProperty('colorPickerDisplayed');
     }
diff --git a/app/styles/app.scss b/app/styles/app.scss
index efbcff3..6f63c3c 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -183,6 +183,11 @@ md-list-item .md-no-style {
   text-decoration: underline;
 }
 
+#lightControl {
+  max-width: 500px;
+  margin: auto;
+}
+
 .color {
   border: 1px solid rgba(0, 0, 0, 0.5);
 }