diff --git a/homeassistant/components/isy994.py b/homeassistant/components/isy994.py
index 7a556d565e3..84299cef6a6 100644
--- a/homeassistant/components/isy994.py
+++ b/homeassistant/components/isy994.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 # homeassistant constants
 DOMAIN = "isy994"
 DEPENDENCIES = []
-#DISCOVER_LIGHTS = "isy994.lights"
+DISCOVER_LIGHTS = "isy994.lights"
 #DISCOVER_SWITCHES = "isy994.switches"
 DISCOVER_SENSORS = "isy994.sensors"
 ISY = None
@@ -60,7 +60,8 @@ def setup(hass, config):
         return False
 
     # Load components for the devices in the ISY controller that we support
-    for comp_name, discovery in ((('sensor', DISCOVER_SENSORS),)):
+    for comp_name, discovery in ((('sensor', DISCOVER_SENSORS),
+                                 ('light', DISCOVER_LIGHTS))):
         component = get_component(comp_name)
         bootstrap.setup_component(hass, component.DOMAIN, config)
         hass.bus.fire(EVENT_PLATFORM_DISCOVERED, 
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index 16020f1ecb1..ca887b97a19 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -57,7 +57,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 import homeassistant.util as util
 from homeassistant.const import (
     STATE_ON, SERVICE_TURN_ON, SERVICE_TURN_OFF, ATTR_ENTITY_ID)
-from homeassistant.components import group, discovery, wink
+from homeassistant.components import group, discovery, wink, isy994
 
 
 DOMAIN = "light"
@@ -92,6 +92,7 @@ LIGHT_PROFILES_FILE = "light_profiles.csv"
 # Maps discovered services to their platforms
 DISCOVERY_PLATFORMS = {
     wink.DISCOVER_LIGHTS: 'wink',
+    isy994.DISCOVER_LIGHTS: 'isy994',
     discovery.services.PHILIPS_HUE: 'hue',
 }
 
diff --git a/homeassistant/components/light/isy994.py b/homeassistant/components/light/isy994.py
new file mode 100644
index 00000000000..3f498955487
--- /dev/null
+++ b/homeassistant/components/light/isy994.py
@@ -0,0 +1,93 @@
+""" Support for ISY994 sensors. """
+# system imports
+import logging
+
+# homeassistant imports
+from ..isy994 import ISY
+from homeassistant.helpers.entity import ToggleEntity
+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.components.light import ATTR_BRIGHTNESS
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Sets up the isy994 platform. """
+    print('************ RUNNING')
+    logger = logging.getLogger(__name__)
+    devs = []
+    # verify connection
+    if ISY is None or not ISY.connected:
+        logger.error('A connection has not been made to the ISY controller.')
+        return False
+
+    # import dimmable nodes
+    for node in ISY.nodes:
+        if node.dimmable:
+            devs.append(ISYLightDevice(node))
+
+    add_devices(devs)
+
+
+class ISYLightDevice(ToggleEntity):
+    """ represents as isy light within home assistant. """
+
+    domain = 'light'
+
+    def __init__(self, node):
+        # setup properties
+        self.node = node
+        #self.entity_id = self.domain + '.' + self.name.replace(' ', '_')
+
+        # track changes
+        self._changeHandler = self.node.status. \
+                subscribe('changed', self.onUpdate)
+
+    def __del__(self):
+        self._changeHandler.unsubscribe()
+
+    @property
+    def should_poll(self):
+        return False
+
+    @property
+    def dtype(self):
+        return 'analog'
+
+    @property
+    def value(self):
+        """ return the integer setting of the light (brightness) """
+        return self.node.status._val
+
+    @property
+    def is_on(self):
+        return self.value > 0
+
+    @property
+    def state_attributes(self):
+        return {ATTR_BRIGHTNESS: self.value}
+
+    @property
+    def unique_id(self):
+        """ Returns the id of this isy sensor """
+        return self.node._id
+
+    @property
+    def name(self):
+        """ Returns the name of the sensor if any. """
+        return self.node.name
+
+    def update(self):
+        """ Update state of the sensor. """
+        # ISY objects are automatically updated by the ISY's event stream
+        pass
+
+    def onUpdate(self, e):
+        self.update_ha_state()
+
+    def turn_on(self, **kwargs):
+        """ turns the device on """
+        brightness = kwargs.get(ATTR_BRIGHTNESS)
+        self.node.on(brightness)
+
+    def turn_off(self, **kwargs):
+        """ turns the device off """
+        self.node.off()