diff --git a/src/data/flows/backyard_light_dynamics.json b/src/data/flows/backyard_light_dynamics.json
index d88c8d4..a837b01 100644
--- a/src/data/flows/backyard_light_dynamics.json
+++ b/src/data/flows/backyard_light_dynamics.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "7d6b81e430d394e4",
+        "id": "4b48188ca7b303d7",
         "type": "tab",
         "label": "backyard_light_dynamics",
         "disabled": false,
@@ -8,9 +8,19 @@
         "env": []
     },
     {
-        "id": "7b7d0b92749effd8",
+        "id": "6b6bd65614097561",
+        "type": "comment",
+        "z": "4b48188ca7b303d7",
+        "name": "change light based on actions",
+        "info": "",
+        "x": 140,
+        "y": 20,
+        "wires": []
+    },
+    {
+        "id": "5ff7f5db7a60100d",
         "type": "server-state-changed",
-        "z": "7d6b81e430d394e4",
+        "z": "4b48188ca7b303d7",
         "name": "backdoor state",
         "server": "4ba92433.2478cc",
         "version": 5,
@@ -56,52 +66,61 @@
         "y": 60,
         "wires": [
             [
-                "53dc95a129d76281"
+                "62d81c701468e19d"
             ],
             []
         ]
     },
     {
-        "id": "e64aa211bd3e11d0",
-        "type": "comment",
-        "z": "7d6b81e430d394e4",
-        "name": "change light based on actions",
-        "info": "",
-        "x": 140,
-        "y": 20,
-        "wires": []
-    },
-    {
-        "id": "cb79ad658e0d60be",
-        "type": "api-call-service",
-        "z": "7d6b81e430d394e4",
-        "name": "restore light on state",
+        "id": "62d81c701468e19d",
+        "type": "api-current-state",
+        "z": "4b48188ca7b303d7",
+        "name": "is dark outside",
         "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "light",
-        "service": "turn_on",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "{{payload.entity_id}}"
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "dark",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "sensor.outdoor_light_dark",
+        "state_type": "str",
+        "blockInputOverrides": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
         ],
-        "data": "{\"brightness\":\"{{payload.attributes.brightness}}\"}",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 1320,
-        "y": 160,
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 280,
+        "y": 60,
         "wires": [
+            [
+                "afd9f276117c7fb3",
+                "dc674152553b250e"
+            ],
             []
         ]
     },
     {
-        "id": "f9be457fe9d3f97a",
+        "id": "dc674152553b250e",
         "type": "ha-get-entities",
-        "z": "7d6b81e430d394e4",
+        "z": "4b48188ca7b303d7",
         "name": "get lights",
         "server": "4ba92433.2478cc",
         "version": 1,
@@ -109,7 +128,7 @@
             {
                 "property": "entity_id",
                 "logic": "is",
-                "value": "light.shellydimmer_barn_hanging_lam",
+                "value": "light.shellydimmer_backyard_string_l",
                 "valueType": "str"
             }
         ],
@@ -119,243 +138,139 @@
         "outputLocation": "payload",
         "outputResultsCount": 1,
         "x": 460,
-        "y": 60,
+        "y": 120,
         "wires": [
             [
-                "9ede2622f41b1881",
-                "3dea0130508776d0"
+                "ce324704d2fae759"
             ]
         ]
     },
     {
-        "id": "6ddc8572236f59e8",
-        "type": "change",
-        "z": "7d6b81e430d394e4",
-        "name": "send stop to traffic",
+        "id": "afd9f276117c7fb3",
+        "type": "ha-get-entities",
+        "z": "4b48188ca7b303d7",
+        "name": "get lights",
+        "server": "4ba92433.2478cc",
+        "version": 1,
         "rules": [
             {
-                "t": "set",
-                "p": "payload",
-                "pt": "msg",
-                "to": "red",
-                "tot": "str"
+                "property": "entity_id",
+                "logic": "is",
+                "value": "light.shellydimmer_barn_hanging_lam",
+                "valueType": "str"
             }
         ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1050,
-        "y": 260,
+        "outputType": "split",
+        "outputEmptyResults": false,
+        "outputLocationType": "msg",
+        "outputLocation": "payload",
+        "outputResultsCount": 1,
+        "x": 460,
+        "y": 60,
         "wires": [
             [
-                "1619e55123d467c3"
+                "ce324704d2fae759"
             ]
         ]
     },
     {
-        "id": "1619e55123d467c3",
-        "type": "traffic",
-        "z": "7d6b81e430d394e4",
-        "name": "traffic",
-        "property_allow": "payload",
-        "filter_allow": "green",
-        "ignore_case_allow": false,
-        "negate_allow": false,
-        "send_allow": false,
-        "property_stop": "payload",
-        "filter_stop": "red",
-        "ignore_case_stop": false,
-        "negate_stop": false,
-        "send_stop": false,
-        "default_start": false,
-        "differ": true,
-        "x": 870,
-        "y": 160,
+        "id": "ce324704d2fae759",
+        "type": "function",
+        "z": "4b48188ca7b303d7",
+        "name": "store light brightness",
+        "func": "var object = \"history.\" + msg.payload.entity_id + \".attributes\"\nvar brightness = object + \".brightness\"\nvar state = object + \".state\"\nflow.set(brightness, msg.payload.attributes.brightness)\nflow.set(state, msg.payload.state)\nreturn msg",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 660,
+        "y": 60,
         "wires": [
             [
-                "99b429d347904509",
-                "abe676215b8d0bd6"
+                "7ba9724ab83fa1a3"
             ]
         ]
     },
     {
-        "id": "9ede2622f41b1881",
-        "type": "api-call-service",
-        "z": "7d6b81e430d394e4",
-        "name": "turn up brightness",
-        "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "light",
-        "service": "turn_on",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "{{payload.entity_id}}"
-        ],
-        "data": "{\"brightness_pct\":\"65\"}",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "all",
-        "x": 670,
+        "id": "8f4a7b8ae2cc4f22",
+        "type": "stoptimer",
+        "z": "4b48188ca7b303d7",
+        "duration": "1",
+        "units": "Minute",
+        "payloadtype": "num",
+        "payloadval": "0",
+        "name": "",
+        "x": 1060,
         "y": 60,
         "wires": [
             [
-                "b68bd646fc7510e1"
-            ]
+                "97c520659be6b4b3"
+            ],
+            []
         ]
     },
     {
-        "id": "c6d2159d52134d05",
+        "id": "7ba9724ab83fa1a3",
         "type": "api-call-service",
-        "z": "7d6b81e430d394e4",
-        "name": "restore light on state",
+        "z": "4b48188ca7b303d7",
+        "name": "turn up brightness",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "light",
-        "service": "turn_off",
+        "service": "turn_on",
         "areaId": [],
         "deviceId": [],
         "entityId": [
             "{{payload.entity_id}}"
         ],
-        "data": "{}",
+        "data": "{\"brightness_pct\":\"65\"}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
-        "queue": "none",
-        "x": 1320,
-        "y": 220,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "99b429d347904509",
-        "type": "switch",
-        "z": "7d6b81e430d394e4",
-        "name": "light is on or off",
-        "property": "payload.state",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "eq",
-                "v": "on",
-                "vt": "str"
-            },
-            {
-                "t": "eq",
-                "v": "off",
-                "vt": "str"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 2,
-        "x": 1060,
-        "y": 160,
+        "queue": "all",
+        "x": 870,
+        "y": 60,
         "wires": [
             [
-                "cb79ad658e0d60be"
-            ],
-            [
-                "c6d2159d52134d05"
+                "8f4a7b8ae2cc4f22"
             ]
         ]
     },
     {
-        "id": "53dc95a129d76281",
-        "type": "api-current-state",
-        "z": "7d6b81e430d394e4",
-        "name": "is dark outside",
-        "server": "4ba92433.2478cc",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "dark",
-        "halt_if_type": "str",
-        "halt_if_compare": "is",
-        "entity_id": "sensor.outdoor_light_dark",
-        "state_type": "str",
-        "blockInputOverrides": false,
-        "outputProperties": [
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
-            {
-                "property": "data",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entity"
-            }
-        ],
-        "for": "0",
-        "forType": "num",
-        "forUnits": "minutes",
-        "override_topic": false,
-        "state_location": "payload",
-        "override_payload": "msg",
-        "entity_location": "data",
-        "override_data": "msg",
-        "x": 300,
+        "id": "ae4305924010abf0",
+        "type": "split",
+        "z": "4b48188ca7b303d7",
+        "name": "",
+        "splt": "\\n",
+        "spltType": "str",
+        "arraySplt": 1,
+        "arraySpltType": "len",
+        "stream": false,
+        "addname": "",
+        "x": 1390,
         "y": 60,
         "wires": [
             [
-                "f9be457fe9d3f97a",
-                "8fe8ecab199cefc1"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "8fe8ecab199cefc1",
-        "type": "ha-get-entities",
-        "z": "7d6b81e430d394e4",
-        "name": "get lights",
-        "server": "4ba92433.2478cc",
-        "version": 1,
-        "rules": [
-            {
-                "property": "entity_id",
-                "logic": "is",
-                "value": "light.shellydimmer_backyard_string_l",
-                "valueType": "str"
-            }
-        ],
-        "outputType": "split",
-        "outputEmptyResults": false,
-        "outputLocationType": "msg",
-        "outputLocation": "payload",
-        "outputResultsCount": 1,
-        "x": 460,
-        "y": 120,
-        "wires": [
-            [
-                "9ede2622f41b1881",
-                "3dea0130508776d0"
+                "4f241513e7cea2ac"
             ]
         ]
     },
     {
-        "id": "7e6adf38f6c380e0",
+        "id": "97c520659be6b4b3",
         "type": "change",
-        "z": "7d6b81e430d394e4",
-        "name": "send allow to traffic",
+        "z": "4b48188ca7b303d7",
+        "name": "",
         "rules": [
             {
                 "t": "set",
                 "p": "payload",
                 "pt": "msg",
-                "to": "green",
-                "tot": "str"
+                "to": "history.light",
+                "tot": "flow"
             }
         ],
         "action": "",
@@ -363,136 +278,101 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 1310,
+        "x": 1240,
         "y": 60,
         "wires": [
             [
-                "70551e6e8535b007"
+                "ae4305924010abf0"
             ]
         ]
     },
     {
-        "id": "b68bd646fc7510e1",
-        "type": "change",
-        "z": "7d6b81e430d394e4",
-        "name": "set light_dynamics active",
-        "rules": [
-            {
-                "t": "set",
-                "p": "light_dynamics",
-                "pt": "flow",
-                "to": "active",
-                "tot": "str"
-            }
+        "id": "546fefed6fa99188",
+        "type": "api-call-service",
+        "z": "4b48188ca7b303d7",
+        "name": "restore light on state",
+        "server": "4ba92433.2478cc",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "light",
+        "service": "turn_on",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "light.{{parts.key}}"
         ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 910,
+        "data": "{\"brightness\":\"{{payload.attributes.brightness}}\"}",
+        "dataType": "json",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 1700,
         "y": 60,
         "wires": [
-            [
-                "848c340f6e0ae8f5"
-            ]
+            []
+        ]
+    },
+    {
+        "id": "7a9894c1b0d507b3",
+        "type": "api-call-service",
+        "z": "4b48188ca7b303d7",
+        "name": "restore light off state",
+        "server": "4ba92433.2478cc",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "light",
+        "service": "turn_off",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "light.{{parts.key}}"
+        ],
+        "data": "",
+        "dataType": "json",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 1700,
+        "y": 120,
+        "wires": [
+            []
         ]
     },
     {
-        "id": "3dea0130508776d0",
+        "id": "4f241513e7cea2ac",
         "type": "switch",
-        "z": "7d6b81e430d394e4",
+        "z": "4b48188ca7b303d7",
         "name": "",
-        "property": "light_dynamics",
-        "propertyType": "flow",
+        "property": "payload.attributes.state",
+        "propertyType": "msg",
         "rules": [
             {
                 "t": "eq",
-                "v": "inactive",
+                "v": "on",
+                "vt": "str"
+            },
+            {
+                "t": "eq",
+                "v": "off",
                 "vt": "str"
             }
         ],
         "checkall": "true",
         "repair": false,
-        "outputs": 1,
-        "x": 710,
-        "y": 160,
-        "wires": [
-            [
-                "1619e55123d467c3"
-            ]
-        ]
-    },
-    {
-        "id": "70551e6e8535b007",
-        "type": "change",
-        "z": "7d6b81e430d394e4",
-        "name": "set light_dynamics inactive",
-        "rules": [
-            {
-                "t": "set",
-                "p": "light_dynamics",
-                "pt": "flow",
-                "to": "inactive",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1540,
+        "outputs": 2,
+        "x": 1510,
         "y": 60,
         "wires": [
             [
-                "1619e55123d467c3"
-            ]
-        ]
-    },
-    {
-        "id": "abe676215b8d0bd6",
-        "type": "delay",
-        "z": "7d6b81e430d394e4",
-        "name": "",
-        "pauseType": "delay",
-        "timeout": "1",
-        "timeoutUnits": "seconds",
-        "rate": "1",
-        "nbRateUnits": "1",
-        "rateUnits": "second",
-        "randomFirst": "1",
-        "randomLast": "5",
-        "randomUnits": "seconds",
-        "drop": false,
-        "allowrate": false,
-        "outputs": 1,
-        "x": 880,
-        "y": 260,
-        "wires": [
+                "546fefed6fa99188"
+            ],
             [
-                "6ddc8572236f59e8"
+                "7a9894c1b0d507b3"
             ]
         ]
     },
-    {
-        "id": "848c340f6e0ae8f5",
-        "type": "stoptimer",
-        "z": "7d6b81e430d394e4",
-        "duration": "1",
-        "units": "Minute",
-        "payloadtype": "num",
-        "payloadval": "0",
-        "name": "",
-        "x": 1120,
-        "y": 60,
-        "wires": [
-            [
-                "7e6adf38f6c380e0"
-            ],
-            []
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/basement_light_dynamics.json b/src/data/flows/basement_light_dynamics.json
index 4f22ef0..139be2f 100644
--- a/src/data/flows/basement_light_dynamics.json
+++ b/src/data/flows/basement_light_dynamics.json
@@ -1,39 +1,29 @@
 [
     {
-        "id": "7d6b81e430d394e4",
+        "id": "2863cbc8bee70856",
         "type": "tab",
-        "label": "backyard_light_dynamics",
+        "label": "basement_light_dynamics",
         "disabled": false,
         "info": "",
         "env": []
     },
     {
-        "id": "e64aa211bd3e11d0",
-        "type": "comment",
-        "z": "7d6b81e430d394e4",
-        "name": "change light based on actions",
-        "info": "",
-        "x": 140,
-        "y": 20,
-        "wires": []
-    },
-    {
-        "id": "60ae26bd4450db01",
+        "id": "ec0a3cf53f08df55",
         "type": "server-state-changed",
-        "z": "7d6b81e430d394e4",
-        "name": "backdoor state",
+        "z": "2863cbc8bee70856",
+        "name": "basement door is open",
         "server": "4ba92433.2478cc",
         "version": 5,
         "outputs": 2,
         "exposeAsEntityConfig": "",
-        "entityId": "binary_sensor.backdoor",
+        "entityId": "binary_sensor.basement_door",
         "entityIdType": "exact",
         "outputInitially": true,
         "stateType": "str",
         "ifState": "on",
         "ifStateType": "str",
         "ifStateOperator": "is",
-        "outputOnlyOnStateChange": true,
+        "outputOnlyOnStateChange": false,
         "for": "0",
         "forType": "num",
         "forUnits": "minutes",
@@ -42,47 +32,40 @@
         "ignorePrevStateUnavailable": true,
         "ignoreCurrentStateUnknown": true,
         "ignoreCurrentStateUnavailable": true,
-        "outputProperties": [
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
-            {
-                "property": "data",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "eventData"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "triggerId"
-            }
-        ],
-        "x": 100,
+        "outputProperties": [],
+        "x": 120,
         "y": 60,
         "wires": [
             [
-                "b5664fac5cd21703"
+                "19e3c39a7481e04b"
             ],
-            []
+            [
+                "123a8dfe28431656"
+            ]
         ]
     },
     {
-        "id": "b5664fac5cd21703",
+        "id": "63f2e5de506021ab",
+        "type": "comment",
+        "z": "2863cbc8bee70856",
+        "name": "change light based on actions",
+        "info": "",
+        "x": 140,
+        "y": 20,
+        "wires": []
+    },
+    {
+        "id": "19e3c39a7481e04b",
         "type": "api-current-state",
-        "z": "7d6b81e430d394e4",
-        "name": "is dark outside",
+        "z": "2863cbc8bee70856",
+        "name": "basement stairs light is off",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "dark",
+        "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "sensor.outdoor_light_dark",
+        "entity_id": "light.shellydimmer_basement_stairs",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -107,190 +90,20 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 280,
+        "x": 550,
         "y": 60,
         "wires": [
             [
-                "882e0da55f267980",
-                "c2bd9d198f1277b7"
+                "db49a00d5adc0cb7"
             ],
             []
         ]
     },
     {
-        "id": "c2bd9d198f1277b7",
-        "type": "ha-get-entities",
-        "z": "7d6b81e430d394e4",
-        "name": "get lights",
-        "server": "4ba92433.2478cc",
-        "version": 1,
-        "rules": [
-            {
-                "property": "entity_id",
-                "logic": "is",
-                "value": "light.shellydimmer_backyard_string_l",
-                "valueType": "str"
-            }
-        ],
-        "outputType": "split",
-        "outputEmptyResults": false,
-        "outputLocationType": "msg",
-        "outputLocation": "payload",
-        "outputResultsCount": 1,
-        "x": 460,
-        "y": 120,
-        "wires": [
-            [
-                "454b9848aa8f3696"
-            ]
-        ]
-    },
-    {
-        "id": "882e0da55f267980",
-        "type": "ha-get-entities",
-        "z": "7d6b81e430d394e4",
-        "name": "get lights",
-        "server": "4ba92433.2478cc",
-        "version": 1,
-        "rules": [
-            {
-                "property": "entity_id",
-                "logic": "is",
-                "value": "light.shellydimmer_barn_hanging_lam",
-                "valueType": "str"
-            }
-        ],
-        "outputType": "split",
-        "outputEmptyResults": false,
-        "outputLocationType": "msg",
-        "outputLocation": "payload",
-        "outputResultsCount": 1,
-        "x": 460,
-        "y": 60,
-        "wires": [
-            [
-                "454b9848aa8f3696"
-            ]
-        ]
-    },
-    {
-        "id": "454b9848aa8f3696",
-        "type": "function",
-        "z": "7d6b81e430d394e4",
-        "name": "store light brightness",
-        "func": "var object = \"history.\" + msg.payload.entity_id + \".attributes\"\nvar brightness = object + \".brightness\"\nvar state = object + \".state\"\nflow.set(brightness, msg.payload.attributes.brightness)\nflow.set(state, msg.payload.state)\nreturn msg",
-        "outputs": 1,
-        "timeout": 0,
-        "noerr": 0,
-        "initialize": "",
-        "finalize": "",
-        "libs": [],
-        "x": 660,
-        "y": 60,
-        "wires": [
-            [
-                "1aba261dc1ccb954"
-            ]
-        ]
-    },
-    {
-        "id": "58e32e542c88ba36",
-        "type": "stoptimer",
-        "z": "7d6b81e430d394e4",
-        "duration": "1",
-        "units": "Minute",
-        "payloadtype": "num",
-        "payloadval": "0",
-        "name": "",
-        "x": 1060,
-        "y": 60,
-        "wires": [
-            [
-                "e9ce4a60b586b4cf"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "1aba261dc1ccb954",
-        "type": "api-call-service",
-        "z": "7d6b81e430d394e4",
-        "name": "turn up brightness",
-        "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "light",
-        "service": "turn_on",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "{{payload.entity_id}}"
-        ],
-        "data": "{\"brightness_pct\":\"65\"}",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "all",
-        "x": 870,
-        "y": 60,
-        "wires": [
-            [
-                "58e32e542c88ba36"
-            ]
-        ]
-    },
-    {
-        "id": "7e46c865043e73a3",
-        "type": "split",
-        "z": "7d6b81e430d394e4",
-        "name": "",
-        "splt": "\\n",
-        "spltType": "str",
-        "arraySplt": 1,
-        "arraySpltType": "len",
-        "stream": false,
-        "addname": "",
-        "x": 1390,
-        "y": 60,
-        "wires": [
-            [
-                "242507462ab59e0a"
-            ]
-        ]
-    },
-    {
-        "id": "e9ce4a60b586b4cf",
-        "type": "change",
-        "z": "7d6b81e430d394e4",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "payload",
-                "pt": "msg",
-                "to": "history.light",
-                "tot": "flow"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1240,
-        "y": 60,
-        "wires": [
-            [
-                "7e46c865043e73a3"
-            ]
-        ]
-    },
-    {
-        "id": "e218cc8b97a80918",
+        "id": "db49a00d5adc0cb7",
         "type": "api-call-service",
-        "z": "7d6b81e430d394e4",
-        "name": "restore light on state",
+        "z": "2863cbc8bee70856",
+        "name": "turn on basement stairs light",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
@@ -299,25 +112,25 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "light.{{parts.key}}"
+            "{{data.entity_id}}"
         ],
-        "data": "{\"brightness\":\"{{payload.attributes.brightness}}\"}",
-        "dataType": "json",
+        "data": "",
+        "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1700,
+        "x": 1060,
         "y": 60,
         "wires": [
             []
         ]
     },
     {
-        "id": "cb67858d32a16295",
+        "id": "0b64f5a2e27c31f0",
         "type": "api-call-service",
-        "z": "7d6b81e430d394e4",
-        "name": "restore light off state",
+        "z": "2863cbc8bee70856",
+        "name": "turn off basement stairs light",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
@@ -326,53 +139,130 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "light.{{parts.key}}"
+            "{{data.entity_id}}"
         ],
         "data": "",
-        "dataType": "json",
+        "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1700,
+        "x": 1060,
         "y": 120,
         "wires": [
             []
         ]
     },
     {
-        "id": "242507462ab59e0a",
-        "type": "switch",
-        "z": "7d6b81e430d394e4",
+        "id": "123a8dfe28431656",
+        "type": "stoptimer",
+        "z": "2863cbc8bee70856",
+        "duration": "10",
+        "units": "Second",
+        "payloadtype": "num",
+        "payloadval": "0",
         "name": "",
-        "property": "payload.attributes.state",
-        "propertyType": "msg",
-        "rules": [
+        "x": 330,
+        "y": 120,
+        "wires": [
+            [
+                "b13ee71e7f09ace4"
+            ],
+            []
+        ]
+    },
+    {
+        "id": "b13ee71e7f09ace4",
+        "type": "api-current-state",
+        "z": "2863cbc8bee70856",
+        "name": "basement door is closed",
+        "server": "4ba92433.2478cc",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "off",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "binary_sensor.basement_door",
+        "state_type": "str",
+        "blockInputOverrides": false,
+        "outputProperties": [
             {
-                "t": "eq",
-                "v": "on",
-                "vt": "str"
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
             },
             {
-                "t": "eq",
-                "v": "off",
-                "vt": "str"
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
             }
         ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 2,
-        "x": 1510,
-        "y": 60,
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 550,
+        "y": 120,
         "wires": [
             [
-                "e218cc8b97a80918"
+                "a5689ff4c9a82d8e"
             ],
             [
-                "cb67858d32a16295"
+                "123a8dfe28431656"
             ]
         ]
     },
+    {
+        "id": "a5689ff4c9a82d8e",
+        "type": "api-current-state",
+        "z": "2863cbc8bee70856",
+        "name": "basement stairs light is on",
+        "server": "4ba92433.2478cc",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "on",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "light.shellydimmer_basement_stairs",
+        "state_type": "str",
+        "blockInputOverrides": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
+        ],
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 810,
+        "y": 120,
+        "wires": [
+            [
+                "0b64f5a2e27c31f0"
+            ],
+            []
+        ]
+    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",