diff --git a/flows.json b/flows.json
index fc9b3e1..ab9e979 100644
--- a/flows.json
+++ b/flows.json
@@ -1248,22 +1248,20 @@
             "ddbbde89f52be826",
             "9726bd70b6b83774",
             "5fbac3420d43ef9d",
-            "d95966e7140ca760",
-            "31f76539e145f45a",
             "d336afe957a65e33",
             "e2f0e53daa198581",
             "398d300c5d0b6db5",
             "d92ae2f7fd3171b5",
             "96496719d1c09515",
-            "91bb74eec18f93f1",
-            "5a1ea9eea27df8ef",
             "15fde8d3275b8455",
             "fe7b309fe37cf8e2",
             "458ddfa9d748f88f",
             "37bdac2c9a4e2837"
         ],
         "x": 54,
-        "y": 39
+        "y": 39,
+        "w": 1652,
+        "h": 382
     },
     {
         "id": "8aee4d340a136bac",
@@ -1288,6 +1286,32 @@
         "w": 612,
         "h": 202
     },
+    {
+        "id": "550e5b2d99316b12",
+        "type": "group",
+        "z": "47f17992fab9b4f5",
+        "name": "Basement On",
+        "style": {
+            "label": true
+        },
+        "nodes": [
+            "1f5808147fa975cf",
+            "1966d10d8f4467c7",
+            "a9bc78f321149316",
+            "b3bb08ff51e46985",
+            "eed94e04df746efe",
+            "0c7ef72bd0ef47d4",
+            "11aabd786c07244f",
+            "795c53ad6642733a",
+            "62e1cf32c070c9ae",
+            "ea5306d6f92d9550",
+            "4829663e9913e2aa"
+        ],
+        "x": 34,
+        "y": 639,
+        "w": 1232,
+        "h": 202
+    },
     {
         "id": "19b0e082db0643ac",
         "type": "junction",
@@ -14026,12 +14050,13 @@
         "id": "1f5808147fa975cf",
         "type": "link in",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Basement On - iOS",
         "links": [
             "572b2040be874f4e"
         ],
-        "x": 135,
-        "y": 780,
+        "x": 75,
+        "y": 740,
         "wires": [
             [
                 "11aabd786c07244f"
@@ -14042,6 +14067,7 @@
         "id": "1966d10d8f4467c7",
         "type": "server-state-changed",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Alexa Button",
         "server": "9e87348d.9c1c48",
         "version": 4,
@@ -14087,8 +14113,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 190,
-        "y": 720,
+        "x": 130,
+        "y": 680,
         "wires": [
             [
                 "0c7ef72bd0ef47d4"
@@ -14099,6 +14125,7 @@
         "id": "a9bc78f321149316",
         "type": "ha-button",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Manual Button",
         "version": 0,
         "debugenabled": false,
@@ -14118,8 +14145,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 190,
-        "y": 840,
+        "x": 130,
+        "y": 800,
         "wires": [
             [
                 "11aabd786c07244f"
@@ -14130,6 +14157,7 @@
         "id": "b3bb08ff51e46985",
         "type": "api-call-service",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Alexa Actionable Notification",
         "server": "9e87348d.9c1c48",
         "version": 5,
@@ -14145,8 +14173,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 680,
-        "y": 720,
+        "x": 620,
+        "y": 680,
         "wires": [
             [
                 "62e1cf32c070c9ae"
@@ -14157,6 +14185,7 @@
         "id": "eed94e04df746efe",
         "type": "api-current-state",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Last Alexa",
         "server": "9e87348d.9c1c48",
         "version": 3,
@@ -14183,8 +14212,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 450,
-        "y": 720,
+        "x": 390,
+        "y": 680,
         "wires": [
             [
                 "b3bb08ff51e46985"
@@ -14195,6 +14224,7 @@
         "id": "0c7ef72bd0ef47d4",
         "type": "delay",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "",
         "pauseType": "delay",
         "timeout": "1",
@@ -14208,8 +14238,8 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 315,
-        "y": 720,
+        "x": 255,
+        "y": 680,
         "wires": [
             [
                 "eed94e04df746efe"
@@ -14221,6 +14251,7 @@
         "id": "11aabd786c07244f",
         "type": "function",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "user conversion",
         "func": "var userTrigger = msg.payload.context.user_id\n\nif (userTrigger === \"c3909d27048140729f002aaef0391775\") {\n    msg.user = \"ios_tony\"\n} else if (userTrigger === \"f387a983651a4321a7411ff8cf36f949\") {\n    msg.user = \"ios_tina\"\n} else if (userTrigger === \"879b4c04e32841b3ad1d2763a11b4e70\") {\n    msg.user = \"ios_kallen\"\n}\n\nreturn msg;",
         "outputs": 1,
@@ -14228,8 +14259,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 315,
-        "y": 780,
+        "x": 255,
+        "y": 740,
         "wires": [
             [
                 "795c53ad6642733a"
@@ -14241,6 +14272,7 @@
         "id": "795c53ad6642733a",
         "type": "api-call-service",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "iOS Actionable Notification",
         "server": "9e87348d.9c1c48",
         "version": 5,
@@ -14256,8 +14288,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 680,
-        "y": 780,
+        "x": 620,
+        "y": 740,
         "wires": [
             [
                 "62e1cf32c070c9ae"
@@ -14268,6 +14300,7 @@
         "id": "62e1cf32c070c9ae",
         "type": "api-call-service",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Lights On",
         "server": "9e87348d.9c1c48",
         "version": 5,
@@ -14285,8 +14318,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 920,
-        "y": 780,
+        "x": 860,
+        "y": 740,
         "wires": [
             [
                 "ea5306d6f92d9550"
@@ -14297,6 +14330,7 @@
         "id": "ea5306d6f92d9550",
         "type": "api-call-service",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "Tony PC On",
         "server": "9e87348d.9c1c48",
         "version": 5,
@@ -14312,8 +14346,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1090,
-        "y": 780,
+        "x": 1030,
+        "y": 740,
         "wires": [
             [
                 "4829663e9913e2aa"
@@ -14324,6 +14358,7 @@
         "id": "4829663e9913e2aa",
         "type": "api-call-service",
         "z": "47f17992fab9b4f5",
+        "g": "550e5b2d99316b12",
         "name": "TV On",
         "server": "9e87348d.9c1c48",
         "version": 5,
@@ -14341,8 +14376,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1250,
-        "y": 780,
+        "x": 1190,
+        "y": 740,
         "wires": [
             []
         ]
@@ -22405,9 +22440,7 @@
         "x": 1430,
         "y": 200,
         "wires": [
-            [
-                "31f76539e145f45a"
-            ]
+            []
         ]
     },
     {
@@ -22495,65 +22528,6 @@
             []
         ]
     },
-    {
-        "id": "d95966e7140ca760",
-        "type": "api-call-service",
-        "z": "9a8e84bd2945505e",
-        "g": "0c81dfaed25d225c",
-        "name": "Hue Lights",
-        "server": "9e87348d.9c1c48",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "light",
-        "service": "turn_on",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "light.basement_short_lamp",
-            "light.basement_stairwell",
-            "light.basement_tall_lamp",
-            "light.living_room_lights",
-            "light.tina_lamp"
-        ],
-        "data": "{\t    \"flash\":\"long\"\t}",
-        "dataType": "jsonata",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 1690,
-        "y": 200,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "31f76539e145f45a",
-        "type": "delay",
-        "z": "9a8e84bd2945505e",
-        "g": "0c81dfaed25d225c",
-        "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": 1555,
-        "y": 200,
-        "wires": [
-            [
-                "d95966e7140ca760"
-            ]
-        ],
-        "l": false
-    },
     {
         "id": "d336afe957a65e33",
         "type": "delay",
@@ -22607,9 +22581,7 @@
         "x": 1430,
         "y": 380,
         "wires": [
-            [
-                "5a1ea9eea27df8ef"
-            ]
+            []
         ]
     },
     {
@@ -22697,62 +22669,6 @@
             []
         ]
     },
-    {
-        "id": "91bb74eec18f93f1",
-        "type": "api-call-service",
-        "z": "9a8e84bd2945505e",
-        "g": "0c81dfaed25d225c",
-        "name": "Hue Lights",
-        "server": "9e87348d.9c1c48",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "light",
-        "service": "turn_on",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "light.living_room_lights",
-            "light.tina_lamp"
-        ],
-        "data": "{\t    \"flash\":\"long\"\t}",
-        "dataType": "jsonata",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 1690,
-        "y": 380,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5a1ea9eea27df8ef",
-        "type": "delay",
-        "z": "9a8e84bd2945505e",
-        "g": "0c81dfaed25d225c",
-        "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": 1555,
-        "y": 380,
-        "wires": [
-            [
-                "91bb74eec18f93f1"
-            ]
-        ],
-        "l": false
-    },
     {
         "id": "15fde8d3275b8455",
         "type": "api-current-state",