diff --git a/custom_components/dirigera_platform/__init__.py b/custom_components/dirigera_platform/__init__.py
index 5269592..60a0415 100644
--- a/custom_components/dirigera_platform/__init__.py
+++ b/custom_components/dirigera_platform/__init__.py
@@ -74,7 +74,8 @@ async def async_setup_entry(hass: core.HomeAssistant, entry: config_entries.Conf
     hass.async_create_task(hass.config_entries.async_forward_entry_setup(entry, "light"))
     hass.async_create_task(hass.config_entries.async_forward_entry_setup(entry, "switch"))
     hass.async_create_task(hass.config_entries.async_forward_entry_setup(entry, "binary_sensor"))
-
+    hass.async_create_task(hass.config_entries.async_forward_entry_setup(entry, "sensor"))
+    
     logger.debug("Complete async_setup_entry...")
 
     return True
diff --git a/custom_components/dirigera_platform/dirigera_lib_patch.py b/custom_components/dirigera_platform/dirigera_lib_patch.py
index 15dd12c..cf16b5e 100644
--- a/custom_components/dirigera_platform/dirigera_lib_patch.py
+++ b/custom_components/dirigera_platform/dirigera_lib_patch.py
@@ -2,6 +2,7 @@
 from dirigera.devices.device import Attributes
 from dirigera.devices.motion_sensor import MotionSensor
 from dirigera.devices.open_close_sensor import OpenCloseSensor, dict_to_open_close_sensor
+from dirigera.devices.environment_sensor import EnvironmentSensor, dict_to_environment_sensor
 from dirigera.hub.abstract_smart_home_hub import AbstractSmartHomeHub
 from typing import Any, Dict, List
 
@@ -38,3 +39,9 @@ def get_open_close_by_id(self, id_: str) -> OpenCloseSensor:
         if open_close_sensor["deviceType"] != "openCloseSensor":
             raise ValueError("Device is not an OpenCloseSensor")
         return dict_to_open_close_sensor(open_close_sensor, self)
+    
+    def get_environment_sensor_by_id(self, id_: str) -> OpenCloseSensor:
+        environment_sensor = self._get_device_data_by_id(id_)
+        if environment_sensor["deviceType"] != "environmentSensor":
+            raise ValueError("Device is not an EnvironmentSensor")
+        return dict_to_environment_sensor(environment_sensor, self)
\ No newline at end of file
diff --git a/custom_components/dirigera_platform/mocks/ikea_vindstyrka_mock.py b/custom_components/dirigera_platform/mocks/ikea_vindstyrka_mock.py
new file mode 100644
index 0000000..2851033
--- /dev/null
+++ b/custom_components/dirigera_platform/mocks/ikea_vindstyrka_mock.py
@@ -0,0 +1,73 @@
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.core import HomeAssistantError
+
+import random 
+import logging
+import datetime 
+
+from ..sensor import ikea_vindstyrka_device
+from ..const import DOMAIN
+
+logger = logging.getLogger("custom_components.dirigera_platform")
+
+class ikea_vindstyrka_device_mock(ikea_vindstyrka_device):
+    counter = 0
+    
+    def __init__(self, hub, json_data) -> None:
+        logger.debug("ikea_vindstyrka_device_mock ctor")
+        ikea_vindstyrka_device_mock.counter= ikea_vindstyrka_device_mock.counter + 1
+        self._unique_id = "E1907151129080101_" + str(ikea_vindstyrka_device_mock.counter)
+        self._name = "Mock Env Sensor " + str(ikea_vindstyrka_device_mock.counter)
+        self._updated_at = None 
+
+    def update(self):
+        if self._updated_at is None or \
+            (datetime.datetime.now() - self._updated_at).total_seconds() > 30:
+            try:
+                logger.debug("Updated environment sensor...")
+                self._updated_at = datetime.datetime.now()
+            except Exception as ex:
+                logger.error("error encountered running update on : {}".format(self.name))
+                logger.error(ex)
+                raise HomeAssistantError(ex,DOMAIN,"hub_exception")
+        else:
+            logger.debug("Not updating environment sensor...")
+
+
+    def get_current_temperature(self):
+        return random.randint(-10,50)
+    
+    def get_current_r_h(self):
+        return random.randint(10,90)
+    
+    def get_current_p_m25(self):
+        return random.randint(50,500)
+    
+    def get_max_measured_p_m25(self):
+        return random.randint(202,500)
+    
+    def get_min_measured_p_m25(self):
+        return random.randint(50,200)
+    
+    def get_voc_index(self):
+        return random.randint(50,500)
+   
+    @property
+    def available(self):
+        return True 
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        return DeviceInfo(
+            identifiers={("dirigera_platform",self._unique_id)},
+            name = self._name,
+            manufacturer = "IKEA of Sweden",
+            model = "Mock Env Sensor" ,
+            sw_version="mock sw"
+        )
+
+    def name(self) -> str:
+        return self._name
+    
+    def unique_id(self):
+        return self._unique_id
\ No newline at end of file
diff --git a/custom_components/dirigera_platform/sensor.py b/custom_components/dirigera_platform/sensor.py
new file mode 100644
index 0000000..aeb4fdb
--- /dev/null
+++ b/custom_components/dirigera_platform/sensor.py
@@ -0,0 +1,240 @@
+import datetime
+from enum import Enum 
+from homeassistant import config_entries, core
+from homeassistant.const import CONF_IP_ADDRESS, CONF_TOKEN
+from homeassistant.core import HomeAssistantError
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.components.sensor import SensorDeviceClass
+from homeassistant.components.sensor import SensorEntity
+
+from .dirigera_lib_patch import HubX
+
+from .const import DOMAIN
+
+import logging
+logger = logging.getLogger("custom_components.dirigera_platform")
+
+async def async_setup_entry(
+    hass: core.HomeAssistant,
+    config_entry: config_entries.ConfigEntry,
+    async_add_entities,
+):
+    logger.debug("EnvSensor Starting async_setup_entry")
+    """Setup sensors from a config entry created in the integrations UI."""
+    config = hass.data[DOMAIN][config_entry.entry_id]
+    logger.debug(config)
+
+    hub = HubX(config[CONF_TOKEN], config[CONF_IP_ADDRESS])
+    
+    env_devices = []
+
+    # If mock then start with mocks
+    if config[CONF_IP_ADDRESS] == "mock": 
+        logger.warning("Setting up mock enviroment sensors")
+        from .mocks.ikea_vindstyrka_mock import ikea_vindstyrka_device_mock
+        mock_env_device = ikea_vindstyrka_device_mock(hub,"mock_env_sensor1")
+        env_devices = [mock_env_device] 
+    else:            
+        hub_devices = await hass.async_add_executor_job(hub.get_environment_sensors)
+        env_devices = [ikea_vindstyrka_device(hub, env_device) for env_device in hub_devices]
+
+    env_sensors = []
+    for env_device in env_devices:
+        # For each device setup up multiple entities
+        env_sensors.append(ikea_vindstyrka_temperature(env_device))
+        env_sensors.append(ikea_vindstyrka_humidity(env_device))
+        env_sensors.append(ikea_vindstyrka_pm25(env_device,WhichPM25.CURRENT))
+        env_sensors.append(ikea_vindstyrka_pm25(env_device,WhichPM25.MAX))
+        env_sensors.append(ikea_vindstyrka_pm25(env_device,WhichPM25.MIN))
+        env_sensors.append(ikea_vindstyrka_voc_index(env_device))
+
+    logger.debug("Found {} env devices to setup...".format(len(env_devices)))
+    logger.debug("Found {} env entities to setup...".format(len(env_sensors)))
+
+    async_add_entities(env_sensors)
+
+    logger.debug("EnvSensor Complete async_setup_entry")
+
+class ikea_vindstyrka_device:
+    def __init__(self, hub, json_data) -> None:
+        self._json_data = json_data 
+        self._updated_at = None 
+        self._hub = hub 
+    
+    def update(self):
+        if self._updated_at is None or \
+            (datetime.datetime.now() - self._updated_at).total_seconds() > 30:
+            try:
+                self._json_data = self._hub.get_environment_sensor_by_id(self._json_data.id)
+                self._updated_at = datetime.datetime.now()
+            except Exception as ex:
+                logger.error("error encountered running update on : {}".format(self.name))
+                logger.error(ex)
+                raise HomeAssistantError(ex,DOMAIN,"hub_exception")
+
+    def get_current_temperature(self):
+        return self._json_data.attributes.current_temperature
+    
+    def get_current_r_h(self):
+        return self._json_data.attributes.current_r_h
+    
+    def get_current_p_m25(self):
+        return self._json_data.attributes.current_p_m25
+    
+    def get_max_measured_p_m25(self):
+        return self._json_data.attributes.max_measured_p_m25
+    
+    def get_min_measured_p_m25(self):
+        return self._json_data.attributes.min_measured_p_m25
+    
+    def get_voc_index(self):
+        return self._json_data.attributes.voc_index 
+
+    @property
+    def available(self):
+        return self._json_data.is_reachable
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        return DeviceInfo(
+            identifiers={("dirigera_platform",self._json_data.id)},
+            name = self._json_data.attributes.custom_name,
+            manufacturer = self._json_data.attributes.manufacturer,
+            model=self._json_data.attributes.model ,
+            sw_version=self._json_data.attributes.firmware_version
+        )
+    
+    @property
+    def name(self) -> str:
+        return self._json_data.attributes.custom_name
+    
+    @property
+    def unique_id(self):
+        return self._json_data.id
+    
+class ikea_env_base_entity(SensorEntity):
+    def __init__(self, ikea_env_device: ikea_vindstyrka_device, id_suffix : str, name_suffix: str):
+        logger.debug("ikea_env_base_entity ctor...")
+        self._ikea_env_device = ikea_env_device
+        self._unique_id = self._ikea_env_device.unique_id() + id_suffix
+        self._name = self._ikea_env_device.name() + " " + name_suffix
+    
+    @property
+    def available(self):
+        return self._ikea_env_device.available
+      
+    @property
+    def device_info(self) -> DeviceInfo:
+        return self._ikea_env_device.device_info
+    
+    @property
+    def name(self):
+        return self._name
+    
+    @property
+    def unique_id(self) -> str:
+        return self._unique_id
+    
+    @property
+    def native_value(self):
+        return int
+
+    def update(self):
+        self._ikea_env_device.update()
+    
+class ikea_vindstyrka_temperature(ikea_env_base_entity):
+    def __init__(self, ikea_env_device : ikea_vindstyrka_device) -> None:
+        super().__init__(ikea_env_device, "TEMP", "Temperature")
+        logger.debug("ikea_vindstyrka_temperature ctor...")
+    
+    @property
+    def device_class(self):
+        return SensorDeviceClass.TEMPERATURE;  
+
+    @property
+    def native_value(self) -> int:
+        return self._ikea_env_device.get_current_temperature()
+
+    @property
+    def native_unit_of_measurement(self) -> str:
+        return "°C"
+    
+    @property
+    def state_class(self) -> str:
+        return "measurement"
+    
+class ikea_vindstyrka_humidity(ikea_env_base_entity):
+    def __init__(self, ikea_env_device : ikea_vindstyrka_device) -> None:
+        logger.debug("ikea_vindstyrka_humidity ctor...")
+        super().__init__(ikea_env_device, "HUM", "Humidity")
+
+    @property
+    def device_class(self):
+        return SensorDeviceClass.HUMIDITY;  
+
+    @property
+    def native_value(self) -> int:
+        return self._ikea_env_device.get_current_r_h()
+    
+    @property
+    def native_unit_of_measurement(self) -> str:
+        return "%"
+    
+class WhichPM25(Enum):
+    CURRENT = 0
+    MIN = 1
+    MAX = 2
+
+class ikea_vindstyrka_pm25(ikea_env_base_entity):
+    def __init__(self, ikea_env_device : ikea_vindstyrka_device, pm25_type : WhichPM25) -> None:
+        logger.debug("ikea_vindstyrka_pm25 ctor...")
+        self._pm25_type = pm25_type
+        id_suffix = " "
+        name_suffix = " "
+        if self._pm25_type == WhichPM25.CURRENT:
+            id_suffix = "CURPM25"
+            name_suffix = "Current PM2.5"
+        if self._pm25_type == WhichPM25.MAX:
+            id_suffix = "MAXPM25"
+            name_suffix =  "Max Measured PM2.5"
+        if self._pm25_type == WhichPM25.MIN:
+            id_suffix = "MINPM25"
+            name_suffix = "Min Measured PM2.5"
+
+        super().__init__(ikea_env_device, id_suffix, name_suffix)
+
+    @property
+    def device_class(self):
+        return SensorDeviceClass.PM25  
+
+    @property
+    def native_value(self) -> int:
+        if self._pm25_type == WhichPM25.CURRENT:
+            return self._ikea_env_device.get_current_p_m25()
+        if self._pm25_type == WhichPM25.MAX:
+            return self._ikea_env_device.get_max_measured_p_m25()
+        if self._pm25_type == WhichPM25.MIN:
+            return self._ikea_env_device.get_min_measured_p_m25()
+        logger.debug("ikea_vindstyrka_pm25.native_value() shouldnt be here")
+        return None 
+    
+    @property
+    def native_unit_of_measurement(self) -> str:
+        return "µg/m³"
+    
+class ikea_vindstyrka_voc_index(ikea_env_base_entity):
+    def __init__(self, ikea_env_device : ikea_vindstyrka_device) -> None:
+        logger.debug("ikea_vindstyrka_voc_index ctor...")
+        super().__init__(ikea_env_device, "VOC", "VOC Index")
+
+    @property
+    def device_class(self):
+        return SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS;  
+
+    @property
+    def native_value(self) -> int:
+        return self._ikea_env_device.get_voc_index()
+    
+    @property
+    def native_unit_of_measurement(self) -> str:
+        return "µg/m³"
\ No newline at end of file