diff --git a/BridgeEmulator/flaskUI/espDevices.py b/BridgeEmulator/flaskUI/espDevices.py
new file mode 100644
index 000000000..59513bac4
--- /dev/null
+++ b/BridgeEmulator/flaskUI/espDevices.py
@@ -0,0 +1,66 @@
+import configManager
+import logManager
+import HueObjects
+import json
+from flask_restful import Resource
+from flask import request
+from functions.rules import rulesProcessor
+from sensors.discover import addHueMotionSensor, addHueSwitch
+from datetime import datetime
+from threading import Thread
+from time import sleep
+
+logging = logManager.logger.get_logger(__name__)
+
+bridgeConfig = configManager.bridgeConfig.yaml_config
+
+def noMotion(sensor):
+    bridgeConfig["sensors"][sensor].protocol_cfg["threaded"] = True
+    logging.info("Monitor the sensor for no motion")
+
+    while (datetime.now() - bridgeConfig["sensors"][sensor].dxState["presence"]).total_seconds() < 60:
+        sleep(1)
+    bridgeConfig["sensors"][sensor].state["presence"] = False
+    current_time =  datetime.now()
+    bridgeConfig["sensors"][sensor].dxState["presence"] = current_time
+    rulesProcessor(bridgeConfig["sensors"][sensor], current_time)
+    bridgeConfig["sensors"][sensor].protocol_cfg["threaded"] = False
+
+class Switch(Resource):
+    def get(self):
+        args = request.args
+        if "mac" in args:
+            current_time =  datetime.now()
+            mac = args["mac"]
+            if "devicetype" in args: # device registration if is new
+                deviceIsNew = True
+                for device, obj in bridgeConfig["sensors"].items():
+                    if "mac" in obj.protocol_cfg and obj.protocol_cfg["mac"] == mac:
+                        deviceIsNew = False
+                        break
+                if deviceIsNew:
+                    if args["devicetype"] in ["ZLLSwitch", "ZGPSwitch"]:
+                        sensor = addHueSwitch("", args["devicetype"])
+                        sensor.protocol_cfg["mac"] = mac
+                    elif args["devicetype"] == "ZLLPresence":
+                        sensor = addHueMotionSensor("Hue Motion Sensor", "native", {"mac": mac, "threaded": False})
+            else:
+                for device, obj in bridgeConfig["sensors"].items():
+                    if "mac" in obj.protocol_cfg and obj.protocol_cfg["mac"] == mac:
+                        if obj.type == "ZLLLightLevel":
+                            dark = True if args["dark"] == "true" else False
+                            if obj.state["dark"] != dark:
+                                obj.dxState["dark"] = current_time
+                                obj.state["dark"] = dark
+                        elif obj.type == "ZLLPresence":
+                            obj.state["presence"] = True
+                            obj.dxState["presence"] = current_time
+                            if obj.protocol_cfg["threaded"] == False:
+                                Thread(target=noMotion, args=[device]).start()
+                        elif obj.type in ["ZLLSwitch", "ZGPSwitch"]:
+                            obj.state["buttonevent"] = int(args["button"])
+                            obj.dxState["buttonevent"] = current_time
+                        obj.dxState["lastupdated"] = current_time
+                        obj.state["lastupdated"] = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S")
+                        rulesProcessor(obj, current_time)
+        return {"result": "ok"}