diff --git a/api/Application.cfm b/api/Application.cfm
index 8a5723d..a354ace 100644
--- a/api/Application.cfm
+++ b/api/Application.cfm
@@ -103,6 +103,8 @@ if (len(request._api_path)) {
   if (findNoCase("/api/auth/verifyOTP.cfm", request._api_path)) request._api_isPublic = true;
   if (findNoCase("/api/auth/loginOTP.cfm", request._api_path)) request._api_isPublic = true;
   if (findNoCase("/api/auth/verifyLoginOTP.cfm", request._api_path)) request._api_isPublic = true;
+  if (findNoCase("/api/auth/sendLoginOTP.cfm", request._api_path)) request._api_isPublic = true;
+  if (findNoCase("/api/auth/verifyEmailOTP.cfm", request._api_path)) request._api_isPublic = true;
   if (findNoCase("/api/auth/completeProfile.cfm", request._api_path)) request._api_isPublic = true;
 
   if (findNoCase("/api/businesses/list.cfm", request._api_path)) request._api_isPublic = true;
diff --git a/api/addresses/add.cfm b/api/addresses/add.cfm
index 247daf7..09e5ff7 100644
--- a/api/addresses/add.cfm
+++ b/api/addresses/add.cfm
@@ -55,7 +55,7 @@ try {
 
     // If setting as default, clear other defaults first (for same type)
     if (setAsDefault) {
-        queryExecute("
+        queryTimed("
             UPDATE Addresses
             SET IsDefaultDelivery = 0
             WHERE UserID = :userId
@@ -68,11 +68,11 @@ try {
     }
 
     // Get next AddressID
-    qNext = queryExecute("SELECT IFNULL(MAX(ID), 0) + 1 AS NextID FROM Addresses", {}, { datasource: "payfrit" });
+    qNext = queryTimed("SELECT IFNULL(MAX(ID), 0) + 1 AS NextID FROM Addresses", {}, { datasource: "payfrit" });
     newAddressId = qNext.NextID;
 
     // Insert new address
-    queryExecute("
+    queryTimed("
         INSERT INTO Addresses (
             ID,
             UserID,
@@ -117,7 +117,7 @@ try {
     }, { datasource: "payfrit" });
 
     // Get state info for response
-    qState = queryExecute("SELECT Abbreviation as StateAbbreviation, Name as StateName FROM tt_States WHERE ID = :stateId", {
+    qState = queryTimed("SELECT Abbreviation as StateAbbreviation, Name as StateName FROM tt_States WHERE ID = :stateId", {
         stateId: { value: stateId, cfsqltype: "cf_sql_integer" }
     }, { datasource: "payfrit" });
 
diff --git a/api/addresses/delete.cfm b/api/addresses/delete.cfm
index ba37e22..4dcb977 100644
--- a/api/addresses/delete.cfm
+++ b/api/addresses/delete.cfm
@@ -40,7 +40,7 @@ if (structKeyExists(request, "UserID") && isNumeric(request.UserID) && request.U
   userToken = getHeader("X-User-Token");
   if (len(userToken)) {
     try {
-      qTok = queryExecute(
+      qTok = queryTimed(
         "SELECT UserID FROM UserTokens WHERE Token = ? LIMIT 1",
         [{ value = userToken, cfsqltype = "cf_sql_varchar" }],
         { datasource = "payfrit" }
@@ -75,7 +75,7 @@ if (addressId <= 0) {
 
 try {
   // First, get the address details so we can find all matching duplicates
-  qAddr = queryExecute("
+  qAddr = queryTimed("
     SELECT Line1, Line2, City, StateID, ZIPCode
     FROM Addresses
     WHERE ID = :addressId
@@ -91,7 +91,7 @@ try {
   }
 
   // Soft-delete ALL addresses that match the same Line1, Line2, City, StateID, ZIPCode
-  qDelete = queryExecute("
+  qDelete = queryTimed("
     UPDATE Addresses
     SET IsDeleted = 1
     WHERE UserID = :userId
diff --git a/api/addresses/list.cfm b/api/addresses/list.cfm
index b5c8f2a..1e9a363 100644
--- a/api/addresses/list.cfm
+++ b/api/addresses/list.cfm
@@ -29,7 +29,7 @@ if (structKeyExists(request, "UserID") && isNumeric(request.UserID) && request.U
   userToken = getHeader("X-User-Token");
   if (len(userToken)) {
     try {
-      qTok = queryExecute(
+      qTok = queryTimed(
         "SELECT UserID FROM UserTokens WHERE Token = ? LIMIT 1",
         [{ value = userToken, cfsqltype = "cf_sql_varchar" }],
         { datasource = "payfrit" }
@@ -47,7 +47,7 @@ if (userId <= 0) {
 
 try {
   // Get user's delivery addresses
-  qAddresses = queryExecute("
+  qAddresses = queryTimed("
     SELECT
       a.ID,
       a.IsDefaultDelivery,
diff --git a/api/addresses/setDefault.cfm b/api/addresses/setDefault.cfm
index 1fd2835..a2628c8 100644
--- a/api/addresses/setDefault.cfm
+++ b/api/addresses/setDefault.cfm
@@ -40,7 +40,7 @@ try {
     }
 
     // Verify address belongs to user
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID
         FROM Addresses
         WHERE ID = :addressId
@@ -61,7 +61,7 @@ try {
     }
 
     // Clear all defaults for this user
-    queryExecute("
+    queryTimed("
         UPDATE Addresses
         SET IsDefaultDelivery = 0
         WHERE UserID = :userId
@@ -72,7 +72,7 @@ try {
     }, { datasource: "payfrit" });
 
     // Set this one as default
-    queryExecute("
+    queryTimed("
         UPDATE Addresses
         SET IsDefaultDelivery = 1
         WHERE ID = :addressId
diff --git a/api/addresses/states.cfm b/api/addresses/states.cfm
index ed81780..b96b7b6 100644
--- a/api/addresses/states.cfm
+++ b/api/addresses/states.cfm
@@ -5,7 +5,7 @@
 <!--- List US states for address forms --->
 <cfscript>
 try {
-    qStates = queryExecute("
+    qStates = queryTimed("
         SELECT ID as StateID, Abbreviation as StateAbbreviation, Name as StateName
         FROM tt_States
         ORDER BY Name
diff --git a/api/addresses/types.cfm b/api/addresses/types.cfm
index 72b39eb..8000aa2 100644
--- a/api/addresses/types.cfm
+++ b/api/addresses/types.cfm
@@ -11,7 +11,7 @@
  */
 
 try {
-    qTypes = queryExecute("
+    qTypes = queryTimed("
         SELECT tt_AddressTypeID as ID, tt_AddressType as Label
         FROM tt_AddressTypes
         ORDER BY tt_AddressTypeID
diff --git a/api/admin/_scripts/addCategoryIsActiveColumn.cfm b/api/admin/_scripts/addCategoryIsActiveColumn.cfm
index 046935d..9c4b5c4 100644
--- a/api/admin/_scripts/addCategoryIsActiveColumn.cfm
+++ b/api/admin/_scripts/addCategoryIsActiveColumn.cfm
@@ -5,7 +5,7 @@
 // Add IsActive column to TaskCategories table
 try {
     // Check if column exists
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
           AND TABLE_NAME = 'TaskCategories'
@@ -13,7 +13,7 @@ try {
     ", [], { datasource: "payfrit" });
 
     if (qCheck.recordCount == 0) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE TaskCategories
             ADD COLUMN IsActive TINYINT(1) NOT NULL DEFAULT 1
         ", [], { datasource: "payfrit" });
diff --git a/api/admin/_scripts/addCategoryScheduleFields.cfm b/api/admin/_scripts/addCategoryScheduleFields.cfm
index 963e600..62f905f 100644
--- a/api/admin/_scripts/addCategoryScheduleFields.cfm
+++ b/api/admin/_scripts/addCategoryScheduleFields.cfm
@@ -19,7 +19,7 @@ response = { "OK": false };
 
 try {
     // Check if columns already exist
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT COLUMN_NAME
         FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
@@ -33,7 +33,7 @@ try {
 
     // Add ScheduleStart if not exists
     if (!listFindNoCase(existingCols, "ScheduleStart")) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Categories
             ADD COLUMN ScheduleStart TIME NULL
         ", {}, { datasource: "payfrit" });
@@ -42,7 +42,7 @@ try {
 
     // Add ScheduleEnd if not exists
     if (!listFindNoCase(existingCols, "ScheduleEnd")) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Categories
             ADD COLUMN ScheduleEnd TIME NULL
         ", {}, { datasource: "payfrit" });
@@ -51,7 +51,7 @@ try {
 
     // Add ScheduleDays if not exists
     if (!listFindNoCase(existingCols, "ScheduleDays")) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Categories
             ADD COLUMN ScheduleDays VARCHAR(20) NULL
         ", {}, { datasource: "payfrit" });
diff --git a/api/admin/_scripts/addDrinkModifiers.cfm b/api/admin/_scripts/addDrinkModifiers.cfm
index 7d62e40..3617c75 100644
--- a/api/admin/_scripts/addDrinkModifiers.cfm
+++ b/api/admin/_scripts/addDrinkModifiers.cfm
@@ -14,7 +14,7 @@ try {
     bigDeansBusinessId = 27;
 
     // Find the Fountain Soda item we created
-    qFountain = queryExecute("
+    qFountain = queryTimed("
         SELECT ID, Name FROM Items
         WHERE BusinessID = :bizId AND Name = 'Fountain Soda'
     ", { bizId: bigDeansBusinessId }, { datasource: "payfrit" });
@@ -29,14 +29,14 @@ try {
     response["FountainSodaID"] = fountainId;
 
     // Update Fountain Soda to require child selection and be collapsible
-    queryExecute("
+    queryTimed("
         UPDATE Items
         SET RequiresChildSelection = 1, IsCollapsible = 1
         WHERE ID = :itemId
     ", { itemId: fountainId }, { datasource: "payfrit" });
 
     // Check if modifiers already exist
-    qExisting = queryExecute("
+    qExisting = queryTimed("
         SELECT COUNT(*) as cnt FROM Items WHERE ParentItemID = :parentId
     ", { parentId: fountainId }, { datasource: "payfrit" });
 
@@ -48,10 +48,10 @@ try {
     }
 
     // Add Size group
-    qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
+    qMaxItem = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
     sizeGroupId = qMaxItem.nextId;
 
-    queryExecute("
+    queryTimed("
         INSERT INTO Items (
             ID, BusinessID, CategoryID, ParentItemID,
             Name, Description, Price, IsActive,
@@ -77,8 +77,8 @@ try {
 
     sizesAdded = 0;
     for (size in sizes) {
-        qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
-        queryExecute("
+        qMaxItem = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
+        queryTimed("
             INSERT INTO Items (
                 ItemID, BusinessID, CategoryID, ParentItemID,
                 Name, Description, Price, IsActive,
@@ -103,10 +103,10 @@ try {
     }
 
     // Add Type/Flavor group
-    qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
+    qMaxItem = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
     typeGroupId = qMaxItem.nextId;
 
-    queryExecute("
+    queryTimed("
         INSERT INTO Items (
             ID, BusinessID, CategoryID, ParentItemID,
             Name, Description, Price, IsActive,
@@ -136,8 +136,8 @@ try {
 
     typesAdded = 0;
     for (type in types) {
-        qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
-        queryExecute("
+        qMaxItem = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
+        queryTimed("
             INSERT INTO Items (
                 ItemID, BusinessID, CategoryID, ParentItemID,
                 Name, Description, Price, IsActive,
diff --git a/api/admin/_scripts/addItemCategoryColumn.cfm b/api/admin/_scripts/addItemCategoryColumn.cfm
index c04b791..da1b56f 100644
--- a/api/admin/_scripts/addItemCategoryColumn.cfm
+++ b/api/admin/_scripts/addItemCategoryColumn.cfm
@@ -12,7 +12,7 @@ response = { "OK": false };
 
 try {
     // Check if column already exists
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT COLUMN_NAME
         FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
@@ -25,14 +25,14 @@ try {
         response["MESSAGE"] = "CategoryID column already exists";
     } else {
         // Add the column
-        queryExecute("
+        queryTimed("
             ALTER TABLE Items
             ADD COLUMN CategoryID INT NULL DEFAULT 0 AFTER ParentItemID
         ", {}, { datasource: "payfrit" });
 
         // Add index for performance
         try {
-            queryExecute("
+            queryTimed("
                 CREATE INDEX idx_items_categoryid ON Items(CategoryID)
             ", {}, { datasource: "payfrit" });
         } catch (any indexErr) {
diff --git a/api/admin/_scripts/addLatLng.cfm b/api/admin/_scripts/addLatLng.cfm
index 5c89c1d..8afb03f 100644
--- a/api/admin/_scripts/addLatLng.cfm
+++ b/api/admin/_scripts/addLatLng.cfm
@@ -5,7 +5,7 @@
 <cfscript>
 try {
   // Check if columns already exist
-  checkCols = queryExecute(
+  checkCols = queryTimed(
     "SHOW COLUMNS FROM Addresses LIKE 'Latitude'",
     [],
     { datasource = "payfrit" }
@@ -13,7 +13,7 @@ try {
 
   if (checkCols.recordCount EQ 0) {
     // Add the columns
-    queryExecute(
+    queryTimed(
       "ALTER TABLE Addresses
        ADD COLUMN Latitude DECIMAL(10,7) NULL,
        ADD COLUMN Longitude DECIMAL(10,7) NULL",
diff --git a/api/admin/_scripts/addServiceCategoryColumn.cfm b/api/admin/_scripts/addServiceCategoryColumn.cfm
index bdbccbc..3f2d2a6 100644
--- a/api/admin/_scripts/addServiceCategoryColumn.cfm
+++ b/api/admin/_scripts/addServiceCategoryColumn.cfm
@@ -5,7 +5,7 @@
 // Add CategoryID column to tt_TaskTypes (Services) table
 try {
     // Check if column exists
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
           AND TABLE_NAME = 'tt_TaskTypes'
@@ -13,7 +13,7 @@ try {
     ", [], { datasource: "payfrit" });
 
     if (qCheck.recordCount == 0) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE tt_TaskTypes
             ADD COLUMN TaskCategoryID INT NULL
         ", [], { datasource: "payfrit" });
diff --git a/api/admin/_scripts/addTaskSourceColumns.cfm b/api/admin/_scripts/addTaskSourceColumns.cfm
index df621f0..99dc2f0 100644
--- a/api/admin/_scripts/addTaskSourceColumns.cfm
+++ b/api/admin/_scripts/addTaskSourceColumns.cfm
@@ -10,7 +10,7 @@ result = { "OK": true, "STEPS": [] };
 
 try {
     // Check if columns already exist
-    cols = queryExecute("
+    cols = queryTimed("
         SELECT COLUMN_NAME
         FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
@@ -23,7 +23,7 @@ try {
 
     // Add SourceType if missing
     if (!listFindNoCase(existingCols, "SourceType")) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Tasks ADD COLUMN SourceType VARCHAR(50) NULL
         ", [], { datasource: "payfrit" });
         arrayAppend(result.STEPS, "Added SourceType column");
@@ -33,7 +33,7 @@ try {
 
     // Add SourceID if missing
     if (!listFindNoCase(existingCols, "SourceID")) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Tasks ADD COLUMN SourceID INT NULL
         ", [], { datasource: "payfrit" });
         arrayAppend(result.STEPS, "Added SourceID column");
@@ -42,7 +42,7 @@ try {
     }
 
     // Verify columns now exist
-    verifyQuery = queryExecute("
+    verifyQuery = queryTimed("
         SELECT COLUMN_NAME, DATA_TYPE
         FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
diff --git a/api/admin/_scripts/beaconStatus.cfm b/api/admin/_scripts/beaconStatus.cfm
index a34a137..6793ad2 100644
--- a/api/admin/_scripts/beaconStatus.cfm
+++ b/api/admin/_scripts/beaconStatus.cfm
@@ -4,7 +4,7 @@
 
 <cfscript>
 // Show all beacons with their current business/service point assignments
-q = queryExecute("
+q = queryTimed("
   SELECT
     b.ID,
     b.UUID,
@@ -35,7 +35,7 @@ for (row in q) {
 }
 
 // Also get service points for reference
-spQuery = queryExecute("
+spQuery = queryTimed("
   SELECT sp.ID, sp.Name AS Name, sp.BusinessID AS BusinessID, b.Name AS Name
   FROM ServicePoints sp
   JOIN Businesses b ON b.ID = sp.BusinessID
diff --git a/api/admin/_scripts/checkBigDeans.cfm b/api/admin/_scripts/checkBigDeans.cfm
index ef674a7..c8289b9 100644
--- a/api/admin/_scripts/checkBigDeans.cfm
+++ b/api/admin/_scripts/checkBigDeans.cfm
@@ -4,14 +4,14 @@
 
 <cfscript>
 // Check Big Dean's owner
-q = queryExecute("
+q = queryTimed("
   SELECT b.ID, b.Name, b.UserID
   FROM Businesses b
   WHERE b.ID = 27
 ", {}, { datasource: "payfrit" });
 
 // Get users
-users = queryExecute("
+users = queryTimed("
   SELECT *
   FROM Users
   ORDER BY ID
diff --git a/api/admin/_scripts/checkUser.cfm b/api/admin/_scripts/checkUser.cfm
index 6994ce8..b07fad5 100644
--- a/api/admin/_scripts/checkUser.cfm
+++ b/api/admin/_scripts/checkUser.cfm
@@ -11,7 +11,7 @@ if (!len(phone)) {
   abort;
 }
 
-q = queryExecute("
+q = queryTimed("
   SELECT ID, FirstName, LastName, EmailAddress, ContactNumber, IsContactVerified
   FROM Users
   WHERE ContactNumber = :phone OR EmailAddress = :phone
diff --git a/api/admin/_scripts/cleanupBeacons.cfm b/api/admin/_scripts/cleanupBeacons.cfm
index ddb1319..b526d85 100644
--- a/api/admin/_scripts/cleanupBeacons.cfm
+++ b/api/admin/_scripts/cleanupBeacons.cfm
@@ -15,7 +15,7 @@ try {
     lazyDaisyID = 37;
 
     // Unassign beacons 7, 8, 9 from any service points
-    queryExecute("
+    queryTimed("
         UPDATE ServicePoints
         SET BeaconID = NULL, AssignedByUserID = NULL
         WHERE BeaconID IN (7, 8, 9) AND BusinessID = :bizId
@@ -23,33 +23,33 @@ try {
     response.steps.append("Unassigned beacons 7, 8, 9 from service points");
 
     // Delete duplicate beacons 7, 8, 9
-    queryExecute("
+    queryTimed("
         DELETE FROM Beacons
         WHERE ID IN (7, 8, 9) AND BusinessID = :bizId
     ", { bizId: lazyDaisyID }, { datasource: "payfrit" });
     response.steps.append("Deleted duplicate beacons 7, 8, 9");
 
     // Update original beacons with names based on their service point assignments
-    queryExecute("
+    queryTimed("
         UPDATE Beacons SET Name = 'Beacon - Table 1'
         WHERE ID = 4 AND BusinessID = :bizId
     ", { bizId: lazyDaisyID }, { datasource: "payfrit" });
     response.steps.append("Updated Beacon 4 name to 'Beacon - Table 1'");
 
-    queryExecute("
+    queryTimed("
         UPDATE Beacons SET Name = 'Beacon - Table 2'
         WHERE ID = 5 AND BusinessID = :bizId
     ", { bizId: lazyDaisyID }, { datasource: "payfrit" });
     response.steps.append("Updated Beacon 5 name to 'Beacon - Table 2'");
 
-    queryExecute("
+    queryTimed("
         UPDATE Beacons SET Name = 'Beacon - Table 3'
         WHERE ID = 6 AND BusinessID = :bizId
     ", { bizId: lazyDaisyID }, { datasource: "payfrit" });
     response.steps.append("Updated Beacon 6 name to 'Beacon - Table 3'");
 
     // Get final status
-    qFinal = queryExecute("
+    qFinal = queryTimed("
         SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
                b.Name AS BeaconName, b.UUID, sp.Name AS ServicePointName,
                biz.Name AS BusinessName
diff --git a/api/admin/_scripts/cleanupCategories.cfm b/api/admin/_scripts/cleanupCategories.cfm
index b842664..0b2ce7e 100644
--- a/api/admin/_scripts/cleanupCategories.cfm
+++ b/api/admin/_scripts/cleanupCategories.cfm
@@ -28,7 +28,7 @@ try {
     confirm = structKeyExists(url, "confirm") && url.confirm == "YES";
 
     // Verification Step 1: Check for items without BusinessID
-    qNoBusinessID = queryExecute("
+    qNoBusinessID = queryTimed("
         SELECT COUNT(*) as cnt FROM Items
         WHERE BusinessID IS NULL OR BusinessID = 0
     ", {}, { datasource: "payfrit" });
@@ -36,14 +36,14 @@ try {
     response.verification["itemsWithoutBusinessID"] = qNoBusinessID.cnt;
 
     // Verification Step 2: Check that all categories were converted
-    qCategories = queryExecute("
+    qCategories = queryTimed("
         SELECT COUNT(*) as cnt FROM Categories
     ", {}, { datasource: "payfrit" });
 
     response.verification["categoriesRemaining"] = qCategories.cnt;
 
     // Verification Step 3: Check category Items exist (ParentID=0 with children)
-    qCategoryItems = queryExecute("
+    qCategoryItems = queryTimed("
         SELECT COUNT(DISTINCT p.ItemID) as cnt
         FROM Items p
         INNER JOIN Items c ON c.ParentItemID = p.ItemID
@@ -57,7 +57,7 @@ try {
     response.verification["categoryItemsCreated"] = qCategoryItems.cnt;
 
     // Verification Step 4: Check templates exist (in lt_ItemID_TemplateItemID)
-    qTemplates = queryExecute("
+    qTemplates = queryTimed("
         SELECT COUNT(DISTINCT tl.TemplateItemID) as cnt
         FROM lt_ItemID_TemplateItemID tl
         INNER JOIN Items t ON t.ItemID = tl.TemplateItemID
@@ -67,7 +67,7 @@ try {
 
     // Verification Step 5: Find orphans at ParentID=0
     // Orphan = ParentID=0, no children pointing to it, not in lt_ItemID_TemplateItemID
-    qOrphans = queryExecute("
+    qOrphans = queryTimed("
         SELECT i.ID, i.Name, i.BusinessID
         FROM Items i
         WHERE i.ParentItemID = 0
@@ -121,7 +121,7 @@ try {
 
     // Step 1: Drop CategoryID column
     try {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Items DROP COLUMN CategoryID
         ", {}, { datasource: "payfrit" });
         arrayAppend(response.steps, "Dropped CategoryID column from Items");
@@ -135,7 +135,7 @@ try {
 
     // Step 2: Drop IsModifierTemplate column (now derived from lt_ItemID_TemplateItemID)
     try {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Items DROP COLUMN IsModifierTemplate
         ", {}, { datasource: "payfrit" });
         arrayAppend(response.steps, "Dropped IsModifierTemplate column from Items");
@@ -149,7 +149,7 @@ try {
 
     // Step 3: Drop Categories table
     try {
-        queryExecute("
+        queryTimed("
             DROP TABLE Categories
         ", {}, { datasource: "payfrit" });
         arrayAppend(response.steps, "Dropped Categories table");
diff --git a/api/admin/_scripts/cleanupDuplicateEmployees.cfm b/api/admin/_scripts/cleanupDuplicateEmployees.cfm
index 40e76d8..d5634ff 100644
--- a/api/admin/_scripts/cleanupDuplicateEmployees.cfm
+++ b/api/admin/_scripts/cleanupDuplicateEmployees.cfm
@@ -33,7 +33,7 @@ if (businessId <= 0) {
 
 try {
   // Find duplicate UserIDs for this business (keep the one with highest status or oldest)
-  qDupes = queryExecute("
+  qDupes = queryTimed("
     SELECT ID, COUNT(*) as cnt, MIN(ID) as keepId
     FROM Employees
     WHERE BusinessID = ?
@@ -44,7 +44,7 @@ try {
   deleted = 0;
   for (row in qDupes) {
     // Delete all but the one we want to keep (the one with lowest EmployeeID)
-    qDel = queryExecute("
+    qDel = queryTimed("
       DELETE FROM Employees
       WHERE BusinessID = ? AND UserID = ? AND ID != ?
     ", [
@@ -56,7 +56,7 @@ try {
   }
 
   // Get remaining employees
-  qRemaining = queryExecute("
+  qRemaining = queryTimed("
     SELECT e.ID, e.UserID, u.FirstName, u.LastName
     FROM Employees e
     JOIN Users u ON e.UserID = u.ID
diff --git a/api/admin/_scripts/cleanupForLazyDaisy.cfm b/api/admin/_scripts/cleanupForLazyDaisy.cfm
index 196a6f1..7600ff9 100644
--- a/api/admin/_scripts/cleanupForLazyDaisy.cfm
+++ b/api/admin/_scripts/cleanupForLazyDaisy.cfm
@@ -10,7 +10,7 @@ try {
     keepBusinessID = 37;
 
     // Unassign all beacons from service points of other businesses
-    queryExecute("
+    queryTimed("
         UPDATE ServicePoints
         SET BeaconID = NULL, AssignedByUserID = NULL
         WHERE BusinessID != :keepID AND BeaconID IS NOT NULL
@@ -18,7 +18,7 @@ try {
     response.steps.append("Unassigned beacons from other businesses' service points");
 
     // Get list of businesses to delete
-    qBiz = queryExecute("
+    qBiz = queryTimed("
         SELECT ID, Name FROM Businesses WHERE ID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
 
@@ -30,7 +30,7 @@ try {
 
     // Delete related data first (foreign key constraints)
     // Delete lt_ItemID_TemplateItemID for items from other businesses
-    queryExecute("
+    queryTimed("
         DELETE itl FROM lt_ItemID_TemplateItemID itl
         JOIN Items i ON i.ID = itl.ItemID
         WHERE i.BusinessID != :keepID
@@ -38,29 +38,29 @@ try {
     response.steps.append("Deleted lt_ItemID_TemplateItemID for other businesses");
 
     // Delete Items for other businesses
-    qItems = queryExecute("
+    qItems = queryTimed("
         SELECT COUNT(*) as cnt FROM Items WHERE BusinessID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
-    queryExecute("
+    queryTimed("
         DELETE FROM Items WHERE BusinessID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
     response.steps.append("Deleted " & qItems.cnt & " items from other businesses");
 
     // Delete Categories for other businesses
-    queryExecute("
+    queryTimed("
         DELETE FROM Categories WHERE BusinessID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
     response.steps.append("Deleted categories from other businesses");
 
     // Delete Hours for other businesses
-    queryExecute("
+    queryTimed("
         DELETE FROM Hours WHERE BusinessID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
     response.steps.append("Deleted hours from other businesses");
 
     // Delete Employees for other businesses
     try {
-        queryExecute("
+        queryTimed("
             DELETE FROM Employees WHERE BusinessID != :keepID
         ", { keepID: keepBusinessID }, { datasource: "payfrit" });
         response.steps.append("Deleted employees from other businesses");
@@ -70,7 +70,7 @@ try {
 
     // Delete ServicePoints for other businesses
     try {
-        queryExecute("
+        queryTimed("
             DELETE FROM ServicePoints WHERE BusinessID != :keepID
         ", { keepID: keepBusinessID }, { datasource: "payfrit" });
         response.steps.append("Deleted service points from other businesses");
@@ -80,7 +80,7 @@ try {
 
     // Delete Stations for other businesses
     try {
-        queryExecute("
+        queryTimed("
             DELETE FROM Stations WHERE BusinessID != :keepID
         ", { keepID: keepBusinessID }, { datasource: "payfrit" });
         response.steps.append("Deleted stations from other businesses");
@@ -90,7 +90,7 @@ try {
 
     // Delete beacon-business mappings for other businesses
     try {
-        queryExecute("
+        queryTimed("
             DELETE FROM lt_BeaconsID_BusinessesID WHERE BusinessID != :keepID
         ", { keepID: keepBusinessID }, { datasource: "payfrit" });
         response.steps.append("Deleted beacon mappings for other businesses");
@@ -99,13 +99,13 @@ try {
     }
 
     // Finally delete the businesses themselves
-    queryExecute("
+    queryTimed("
         DELETE FROM Businesses WHERE ID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
     response.steps.append("Deleted " & arrayLen(deletedBusinesses) & " businesses");
 
     // Get beacon status
-    qBeacons = queryExecute("
+    qBeacons = queryTimed("
         SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
                b.UUID, biz.Name AS BusinessName, sp.Name AS ServicePointName
         FROM ServicePoints sp
diff --git a/api/admin/_scripts/cleanupOrphanItem.cfm b/api/admin/_scripts/cleanupOrphanItem.cfm
index 4637990..665aefb 100644
--- a/api/admin/_scripts/cleanupOrphanItem.cfm
+++ b/api/admin/_scripts/cleanupOrphanItem.cfm
@@ -6,7 +6,7 @@ param name="url.itemId" default="11543";
 param name="url.action" default="check"; // "check" or "deactivate"
 
 // Check the item first
-qItem = queryExecute("
+qItem = queryTimed("
     SELECT ID, Name, ParentItemID, IsActive, IsCollapsible
     FROM Items
     WHERE ID = :itemId
@@ -18,7 +18,7 @@ if (qItem.recordCount == 0) {
 }
 
 // Get all children (direct only for display)
-qChildren = queryExecute("
+qChildren = queryTimed("
     SELECT ID, Name
     FROM Items
     WHERE ParentItemID = :itemId
@@ -46,14 +46,14 @@ result = {
 
 if (url.action == "deactivate") {
     // Deactivate children first
-    queryExecute("
+    queryTimed("
         UPDATE Items
         SET IsActive = 0
         WHERE ParentItemID = :itemId
     ", { itemId: url.itemId });
 
     // Then deactivate the parent
-    queryExecute("
+    queryTimed("
         UPDATE Items
         SET IsActive = 0
         WHERE ItemID = :itemId
diff --git a/api/admin/_scripts/clearCarts.cfm b/api/admin/_scripts/clearCarts.cfm
index ba7cd14..37e0d9f 100644
--- a/api/admin/_scripts/clearCarts.cfm
+++ b/api/admin/_scripts/clearCarts.cfm
@@ -3,14 +3,14 @@
 
 <cfscript>
 // Delete cart orders (status 0) to reset for testing
-result = queryExecute("
+result = queryTimed("
     DELETE FROM OrderLineItems
     WHERE OrderID IN (
         SELECT ID FROM Orders WHERE StatusID = 0
     )
 ", {}, { datasource = "payfrit" });
 
-result2 = queryExecute("
+result2 = queryTimed("
     DELETE FROM Orders WHERE StatusID = 0
 ", {}, { datasource = "payfrit" });
 
diff --git a/api/admin/_scripts/clearLocalCoffee.cfm b/api/admin/_scripts/clearLocalCoffee.cfm
index da77556..060241c 100644
--- a/api/admin/_scripts/clearLocalCoffee.cfm
+++ b/api/admin/_scripts/clearLocalCoffee.cfm
@@ -11,26 +11,26 @@ try {
 
     for (bizID in businessIDs) {
         // Delete lt_ItemID_TemplateItemID for items belonging to this business
-        queryExecute("
+        queryTimed("
             DELETE itl FROM lt_ItemID_TemplateItemID itl
             INNER JOIN Items i ON i.ID = itl.ItemID
             WHERE i.BusinessID = :bizID
         ", { bizID: bizID }, { datasource: "payfrit" });
 
         // Delete Items
-        queryExecute("DELETE FROM Items WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
+        queryTimed("DELETE FROM Items WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
 
         // Delete Categories
-        queryExecute("DELETE FROM Categories WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
+        queryTimed("DELETE FROM Categories WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
 
         // Delete Hours
-        queryExecute("DELETE FROM Hours WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
+        queryTimed("DELETE FROM Hours WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
 
         // Delete Addresses linked to this business
-        queryExecute("DELETE FROM Addresses WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
+        queryTimed("DELETE FROM Addresses WHERE BusinessID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
 
         // Delete the Business itself
-        queryExecute("DELETE FROM Businesses WHERE ID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
+        queryTimed("DELETE FROM Businesses WHERE ID = :bizID", { bizID: bizID }, { datasource: "payfrit" });
 
         response.steps.append("Deleted business " & bizID & " and all related data");
     }
diff --git a/api/admin/_scripts/closeAllChats.cfm b/api/admin/_scripts/closeAllChats.cfm
index 237f710..ff7fb58 100644
--- a/api/admin/_scripts/closeAllChats.cfm
+++ b/api/admin/_scripts/closeAllChats.cfm
@@ -3,7 +3,7 @@
 <cfscript>
 // Close all open chat tasks
 try {
-    result = queryExecute("
+    result = queryTimed("
         UPDATE Tasks
         SET CompletedOn = NOW()
         WHERE TaskTypeID = 2
diff --git a/api/admin/_scripts/copyDrinksToBigDeans.cfm b/api/admin/_scripts/copyDrinksToBigDeans.cfm
index 0e4c9ba..50a2446 100644
--- a/api/admin/_scripts/copyDrinksToBigDeans.cfm
+++ b/api/admin/_scripts/copyDrinksToBigDeans.cfm
@@ -14,7 +14,7 @@ try {
     bigDeansBusinessId = 27;
 
     // First, check if Big Dean's has a Beverages/Drinks category
-    qExistingCat = queryExecute("
+    qExistingCat = queryTimed("
         SELECT ID, Name FROM Categories
         WHERE BusinessID = :bizId AND (Name LIKE '%Drink%' OR Name LIKE '%Beverage%')
     ", { bizId: bigDeansBusinessId }, { datasource: "payfrit" });
@@ -24,14 +24,14 @@ try {
         response["CategoryNote"] = "Using existing category: " & qExistingCat.Name;
     } else {
         // Create a new Beverages category for Big Dean's
-        qMaxCat = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Categories", {}, { datasource: "payfrit" });
+        qMaxCat = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Categories", {}, { datasource: "payfrit" });
         drinksCategoryId = qMaxCat.nextId;
 
-        qMaxSort = queryExecute("
+        qMaxSort = queryTimed("
             SELECT COALESCE(MAX(SortOrder), 0) + 1 as nextSort FROM Categories WHERE BusinessID = :bizId
         ", { bizId: bigDeansBusinessId }, { datasource: "payfrit" });
 
-        queryExecute("
+        queryTimed("
             INSERT INTO Categories (ID, BusinessID, ParentCategoryID, Name, SortOrder, AddedOn)
             VALUES (:catId, :bizId, 0, 'Beverages', :sortOrder, NOW())
         ", {
@@ -60,17 +60,17 @@ try {
 
     for (drink in drinks) {
         // Check if item already exists
-        qExists = queryExecute("
+        qExists = queryTimed("
             SELECT ID FROM Items
             WHERE BusinessID = :bizId AND Name = :name AND CategoryID = :catId
         ", { bizId: bigDeansBusinessId, name: drink.name, catId: drinksCategoryId }, { datasource: "payfrit" });
 
         if (qExists.recordCount == 0) {
             // Get next ItemID
-            qMaxItem = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
+            qMaxItem = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
             newItemId = qMaxItem.nextId;
 
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (
                     ID, BusinessID, CategoryID, ParentItemID,
                     Name, Description, Price, IsActive,
@@ -100,8 +100,8 @@ try {
                 flavors = ["Chocolate", "Vanilla", "Strawberry"];
                 flavorSort = 0;
                 for (flavor in flavors) {
-                    qMaxOpt = queryExecute("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
-                    queryExecute("
+                    qMaxOpt = queryTimed("SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Items", {}, { datasource: "payfrit" });
+                    queryTimed("
                         INSERT INTO Items (
                             ID, BusinessID, CategoryID, ParentItemID,
                             Name, Description, Price, IsActive,
diff --git a/api/admin/_scripts/createBeacons.cfm b/api/admin/_scripts/createBeacons.cfm
index d7cca75..a6e8979 100644
--- a/api/admin/_scripts/createBeacons.cfm
+++ b/api/admin/_scripts/createBeacons.cfm
@@ -20,11 +20,11 @@ try {
         uuid = beaconUUIDs[i];
 
         // Check if beacon exists
-        qB = queryExecute("SELECT ID FROM Beacons WHERE UUID = :uuid", { uuid: uuid }, { datasource: "payfrit" });
+        qB = queryTimed("SELECT ID FROM Beacons WHERE UUID = :uuid", { uuid: uuid }, { datasource: "payfrit" });
 
         if (qB.recordCount == 0) {
-            queryExecute("INSERT INTO Beacons (UUID, BusinessID) VALUES (:uuid, :bizID)", { uuid: uuid, bizID: lazyDaisyID }, { datasource: "payfrit" });
-            qNew = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            queryTimed("INSERT INTO Beacons (UUID, BusinessID) VALUES (:uuid, :bizID)", { uuid: uuid, bizID: lazyDaisyID }, { datasource: "payfrit" });
+            qNew = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             beaconID = qNew.id;
             response.steps.append("Created beacon " & beaconID & " with UUID: " & uuid);
         } else {
@@ -34,17 +34,17 @@ try {
     }
 
     // Get service point Table 1
-    qSP = queryExecute("
+    qSP = queryTimed("
         SELECT ID FROM ServicePoints
         WHERE BusinessID = :bizID AND Name = 'Table 1'
     ", { bizID: lazyDaisyID }, { datasource: "payfrit" });
 
     if (qSP.recordCount == 0) {
-        queryExecute("
+        queryTimed("
             INSERT INTO ServicePoints (BusinessID, Name)
             VALUES (:bizID, 'Table 1')
         ", { bizID: lazyDaisyID }, { datasource: "payfrit" });
-        qSP = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+        qSP = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
         servicePointID = qSP.id;
         response.steps.append("Created service point 'Table 1' (ID: " & servicePointID & ")");
     } else {
@@ -53,20 +53,20 @@ try {
     }
 
     // Assign all beacons to the Table 1 service point
-    qBeacons = queryExecute("SELECT ID, UUID FROM Beacons WHERE BusinessID = :bizID", { bizID: lazyDaisyID }, { datasource: "payfrit" });
+    qBeacons = queryTimed("SELECT ID, UUID FROM Beacons WHERE BusinessID = :bizID", { bizID: lazyDaisyID }, { datasource: "payfrit" });
 
     for (i = 1; i <= qBeacons.recordCount; i++) {
         beaconID = qBeacons.ID[i];
 
         // Unassign this beacon from any existing service point
-        queryExecute("
+        queryTimed("
             UPDATE ServicePoints SET BeaconID = NULL, AssignedByUserID = NULL
             WHERE BeaconID = :beaconID
 
         ", { beaconID: beaconID }, { datasource: "payfrit" });
 
         // Assign beacon to Table 1 service point
-        queryExecute("
+        queryTimed("
             UPDATE ServicePoints SET BeaconID = :beaconID, AssignedByUserID = 1
             WHERE ID = :spID AND BusinessID = :bizID
         ", { beaconID: beaconID, bizID: lazyDaisyID, spID: servicePointID }, { datasource: "payfrit" });
@@ -74,7 +74,7 @@ try {
     }
 
     // Get final status
-    qFinal = queryExecute("
+    qFinal = queryTimed("
         SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
                b.Name AS BeaconName, b.UUID, sp.Name AS ServicePointName,
                biz.Name AS BusinessName
diff --git a/api/admin/_scripts/createChatMessagesTable.cfm b/api/admin/_scripts/createChatMessagesTable.cfm
index a641e6b..be0685c 100644
--- a/api/admin/_scripts/createChatMessagesTable.cfm
+++ b/api/admin/_scripts/createChatMessagesTable.cfm
@@ -3,7 +3,7 @@
 <cfscript>
 try {
     // Create ChatMessages table
-    queryExecute("
+    queryTimed("
         CREATE TABLE IF NOT EXISTS ChatMessages (
             ID INT AUTO_INCREMENT PRIMARY KEY,
             TaskID INT NOT NULL,
@@ -20,20 +20,20 @@ try {
     ", {}, { datasource: "payfrit" });
 
     // Also add a "Chat" category if it doesn't exist for business 17
-    existing = queryExecute("
+    existing = queryTimed("
         SELECT ID FROM TaskCategories
         WHERE BusinessID = 17 AND Name = 'Chat'
     ", {}, { datasource: "payfrit" });
 
     if (existing.recordCount == 0) {
-        queryExecute("
+        queryTimed("
             INSERT INTO TaskCategories (BusinessID, Name, Color)
             VALUES (17, 'Chat', '##2196F3')
         ", {}, { datasource: "payfrit" });
     }
 
     // Verify table was created
-    cols = queryExecute("DESCRIBE ChatMessages", {}, { datasource: "payfrit" });
+    cols = queryTimed("DESCRIBE ChatMessages", {}, { datasource: "payfrit" });
     colNames = [];
     for (c in cols) {
         arrayAppend(colNames, c.Field);
diff --git a/api/admin/_scripts/createMenusTable.cfm b/api/admin/_scripts/createMenusTable.cfm
index 38f22be..639d411 100644
--- a/api/admin/_scripts/createMenusTable.cfm
+++ b/api/admin/_scripts/createMenusTable.cfm
@@ -18,7 +18,7 @@ response = { "OK": false };
 
 try {
     // Check if Menus table exists
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT 1 FROM INFORMATION_SCHEMA.TABLES
         WHERE TABLE_SCHEMA = 'payfrit'
           AND TABLE_NAME = 'Menus'
@@ -29,7 +29,7 @@ try {
         response["MESSAGE"] = "Menus table already exists";
     } else {
         // Create Menus table
-        queryExecute("
+        queryTimed("
             CREATE TABLE Menus (
                 ID INT AUTO_INCREMENT PRIMARY KEY,
                 BusinessID INT NOT NULL,
@@ -54,7 +54,7 @@ try {
     }
 
     // Check if MenuID column exists in Categories table
-    qCatCol = queryExecute("
+    qCatCol = queryTimed("
         SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
           AND TABLE_NAME = 'Categories'
@@ -63,7 +63,7 @@ try {
 
     if (qCatCol.recordCount == 0) {
         // Add MenuID column to Categories table
-        queryExecute("
+        queryTimed("
             ALTER TABLE Categories
             ADD COLUMN MenuID INT NULL DEFAULT NULL AFTER BusinessID,
             ADD INDEX idx_categories_menu (MenuID)
diff --git a/api/admin/_scripts/createParentBusiness.cfm b/api/admin/_scripts/createParentBusiness.cfm
index a60325d..9603851 100644
--- a/api/admin/_scripts/createParentBusiness.cfm
+++ b/api/admin/_scripts/createParentBusiness.cfm
@@ -55,18 +55,18 @@ try {
     }
 
     // Create minimal address record (just a placeholder)
-    queryExecute("
+    queryTimed("
         INSERT INTO Addresses (Line1, UserID, AddressTypeID, AddedOn)
         VALUES ('Parent Business - No Physical Location', :userID, 2, NOW())
     ", {
         userID: UserID
     }, { datasource = "payfrit" });
 
-    qAddr = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource = "payfrit" });
+    qAddr = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource = "payfrit" });
     addressId = qAddr.id;
 
     // Create parent business (no menu, no hours, just a shell)
-    queryExecute("
+    queryTimed("
         INSERT INTO Businesses (Name, UserID, AddressID, ParentBusinessID, BusinessDeliveryZipCodes, AddedOn)
         VALUES (:name, :userId, :addressId, NULL, '', NOW())
     ", {
@@ -75,11 +75,11 @@ try {
         addressId: addressId
     }, { datasource = "payfrit" });
 
-    qBiz = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource = "payfrit" });
+    qBiz = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource = "payfrit" });
     newBusinessID = qBiz.id;
 
     // Link address back to business
-    queryExecute("
+    queryTimed("
         UPDATE Addresses SET BusinessID = :bizId WHERE ID = :addrId
     ", {
         bizId: newBusinessID,
@@ -91,7 +91,7 @@ try {
     for (childID in ChildBusinessIDs) {
         childID = val(childID);
         if (childID > 0) {
-            queryExecute("
+            queryTimed("
                 UPDATE Businesses SET ParentBusinessID = :parentId WHERE ID = :childId
             ", {
                 parentId: newBusinessID,
diff --git a/api/admin/_scripts/debugBigDeansDeactivated.cfm b/api/admin/_scripts/debugBigDeansDeactivated.cfm
index f77a444..a52459e 100644
--- a/api/admin/_scripts/debugBigDeansDeactivated.cfm
+++ b/api/admin/_scripts/debugBigDeansDeactivated.cfm
@@ -8,7 +8,7 @@ bizId = 27;
 // These are the items that were deactivated by fixBigDeansCategories.cfm
 deactivatedIds = [11177, 11180, 11183, 11186, 11190, 11193, 11196, 11199, 11204, 11212, 11220, 11259];
 
-qDeactivated = queryExecute("
+qDeactivated = queryTimed("
   SELECT i.ID, i.Name, i.ParentItemID, i.IsActive, i.IsCollapsible,
          (SELECT COUNT(*) FROM Items c WHERE c.ParentItemID = i.ID) as ChildCount,
          (SELECT GROUP_CONCAT(c.Name) FROM Items c WHERE c.ParentItemID = i.ID) as Children
diff --git a/api/admin/_scripts/debugBigDeansLinks.cfm b/api/admin/_scripts/debugBigDeansLinks.cfm
index 708d78e..d0ed727 100644
--- a/api/admin/_scripts/debugBigDeansLinks.cfm
+++ b/api/admin/_scripts/debugBigDeansLinks.cfm
@@ -6,7 +6,7 @@
 bizId = 27;
 
 // Get all template links for Big Dean's with item names
-qLinks = queryExecute("
+qLinks = queryTimed("
   SELECT
     tl.ItemID as MenuItemID,
     mi.Name as MenuName,
@@ -33,7 +33,7 @@ for (row in qLinks) {
 }
 
 // Get burgers specifically (parent = 11271)
-qBurgers = queryExecute("
+qBurgers = queryTimed("
   SELECT ID, Name FROM Items
   WHERE BusinessID = :bizId AND ParentItemID = 11271 AND IsActive = 1
   ORDER BY SortOrder
@@ -42,7 +42,7 @@ qBurgers = queryExecute("
 burgers = [];
 for (row in qBurgers) {
   // Get templates for this burger
-  qBurgerTemplates = queryExecute("
+  qBurgerTemplates = queryTimed("
     SELECT tl.TemplateItemID, t.Name as TemplateName
     FROM lt_ItemID_TemplateItemID tl
     JOIN Items t ON t.ItemID = tl.TemplateItemID
diff --git a/api/admin/_scripts/debugBigDeansMenu.cfm b/api/admin/_scripts/debugBigDeansMenu.cfm
index 884353e..b06638c 100644
--- a/api/admin/_scripts/debugBigDeansMenu.cfm
+++ b/api/admin/_scripts/debugBigDeansMenu.cfm
@@ -6,7 +6,7 @@
 businessID = 27;
 
 // Run the EXACT query from getForBuilder.cfm
-qCategories = queryExecute("
+qCategories = queryTimed("
     SELECT DISTINCT
         p.ItemID as CategoryID,
         p.Name as Name,
@@ -31,12 +31,12 @@ for (c in qCategories) {
 }
 
 // Also check raw counts
-rawCount = queryExecute("
+rawCount = queryTimed("
     SELECT COUNT(*) as cnt FROM Items
     WHERE BusinessID = :bizId AND ParentItemID = 0 AND IsActive = 1
 ", { bizId: businessID });
 
-childrenCount = queryExecute("
+childrenCount = queryTimed("
     SELECT COUNT(DISTINCT c.ParentItemID) as cnt
     FROM Items c
     INNER JOIN Items p ON p.ItemID = c.ParentItemID
diff --git a/api/admin/_scripts/debugBigDeansTemplates.cfm b/api/admin/_scripts/debugBigDeansTemplates.cfm
index 35c2603..72506b0 100644
--- a/api/admin/_scripts/debugBigDeansTemplates.cfm
+++ b/api/admin/_scripts/debugBigDeansTemplates.cfm
@@ -6,7 +6,7 @@
 bizId = 27;
 
 // Get all template links for Big Dean's
-qLinks = queryExecute("
+qLinks = queryTimed("
   SELECT
     tl.ItemID as MenuItemID,
     mi.Name as MenuName,
@@ -36,7 +36,7 @@ for (row in qLinks) {
 }
 
 // Get all templates that exist for this business
-qTemplates = queryExecute("
+qTemplates = queryTimed("
   SELECT ID, Name, IsActive, ParentItemID
   FROM Items
   WHERE BusinessID = :bizId
diff --git a/api/admin/_scripts/debugBigDeansTemplates2.cfm b/api/admin/_scripts/debugBigDeansTemplates2.cfm
index b61e913..c2a1025 100644
--- a/api/admin/_scripts/debugBigDeansTemplates2.cfm
+++ b/api/admin/_scripts/debugBigDeansTemplates2.cfm
@@ -8,7 +8,7 @@ bizId = 27;
 // Check the template items themselves (IDs from lt_ItemID_TemplateItemID)
 templateIds = "11267, 11251, 11246, 11224, 11233, 11230, 11240, 11243, 11237, 11227";
 
-qTemplates = queryExecute("
+qTemplates = queryTimed("
   SELECT ID, Name, IsCollapsible, IsActive, ParentItemID, BusinessID
   FROM Items
   WHERE ID IN (#templateIds#)
@@ -29,7 +29,7 @@ for (row in qTemplates) {
 
 // Also check what other templates might exist for burgers
 // Look for items that are in lt_ItemID_TemplateItemID but NOT linked to burgers
-qMissingTemplates = queryExecute("
+qMissingTemplates = queryTimed("
   SELECT DISTINCT t.ItemID, t.Name, t.IsCollapsible, t.IsActive
   FROM Items t
   WHERE t.BusinessID = :bizId
@@ -52,7 +52,7 @@ for (row in qMissingTemplates) {
 }
 
 // What templates SHOULD burgers have? Let's see all templates used by ANY item
-qAllTemplateUsage = queryExecute("
+qAllTemplateUsage = queryTimed("
   SELECT t.ItemID, t.Name, COUNT(tl.ItemID) as UsageCount
   FROM lt_ItemID_TemplateItemID tl
   JOIN Items t ON t.ItemID = tl.TemplateItemID
diff --git a/api/admin/_scripts/debugBigDeansTemplates3.cfm b/api/admin/_scripts/debugBigDeansTemplates3.cfm
index 66b34ca..1f33840 100644
--- a/api/admin/_scripts/debugBigDeansTemplates3.cfm
+++ b/api/admin/_scripts/debugBigDeansTemplates3.cfm
@@ -6,7 +6,7 @@
 bizId = 27;
 
 // Get the template items themselves
-qTemplates = queryExecute("
+qTemplates = queryTimed("
   SELECT ID, Name, IsCollapsible, IsActive, ParentItemID, BusinessID
   FROM Items
   WHERE ID IN (11267, 11251, 11246, 11224, 11233, 11230, 11240, 11243, 11237, 11227)
@@ -26,7 +26,7 @@ for (row in qTemplates) {
 }
 
 // What templates are used by burgers vs all items?
-qBurgerLinks = queryExecute("
+qBurgerLinks = queryTimed("
   SELECT mi.ID, mi.Name, GROUP_CONCAT(t.Name ORDER BY tl.SortOrder) as Templates
   FROM Items mi
   JOIN lt_ItemID_TemplateItemID tl ON tl.ItemID = mi.ID
@@ -48,7 +48,7 @@ for (row in qBurgerLinks) {
 
 // Also check: are there templates that SHOULD be linked to burgers?
 // (e.g., Add Cheese, etc.)
-qCheeseTemplate = queryExecute("
+qCheeseTemplate = queryTimed("
   SELECT ID, Name, ParentItemID, IsActive
   FROM Items
   WHERE BusinessID = :bizId
diff --git a/api/admin/_scripts/debugBusinesses.cfm b/api/admin/_scripts/debugBusinesses.cfm
index 51dd741..13a8564 100644
--- a/api/admin/_scripts/debugBusinesses.cfm
+++ b/api/admin/_scripts/debugBusinesses.cfm
@@ -25,7 +25,7 @@
 
 <cftry>
   <!--- Get raw employee records ---  >
-  <cfset qEmployees = queryExecute("
+  <cfset qEmployees = queryTimed("
     SELECT e.*, b.Name
     FROM Employees e
     INNER JOIN Businesses b ON b.ID = e.BusinessID
@@ -45,7 +45,7 @@
   </cfloop>
 
   <!--- Check for duplicate businesses ---  >
-  <cfset qDuplicates = queryExecute("
+  <cfset qDuplicates = queryTimed("
     SELECT Name, COUNT(*) AS cnt
     FROM Businesses
     GROUP BY Name
diff --git a/api/admin/_scripts/debugChatMessages.cfm b/api/admin/_scripts/debugChatMessages.cfm
index fa9b962..20f58e1 100644
--- a/api/admin/_scripts/debugChatMessages.cfm
+++ b/api/admin/_scripts/debugChatMessages.cfm
@@ -5,7 +5,7 @@
 <cfscript>
 // Debug: check ChatMessages table contents
 try {
-    qAll = queryExecute("SELECT * FROM ChatMessages ORDER BY CreatedOn DESC LIMIT 50", [], { datasource: "payfrit" });
+    qAll = queryTimed("SELECT * FROM ChatMessages ORDER BY CreatedOn DESC LIMIT 50", [], { datasource: "payfrit" });
 
     messages = [];
     for (row in qAll) {
@@ -20,7 +20,7 @@ try {
     }
 
     // Also check schema
-    schema = queryExecute("DESCRIBE ChatMessages", [], { datasource: "payfrit" });
+    schema = queryTimed("DESCRIBE ChatMessages", [], { datasource: "payfrit" });
     cols = [];
     for (col in schema) {
         arrayAppend(cols, { "Field": col.Field, "Type": col.Type });
diff --git a/api/admin/_scripts/debugDrinkStructure.cfm b/api/admin/_scripts/debugDrinkStructure.cfm
index e1df368..9dd8c26 100644
--- a/api/admin/_scripts/debugDrinkStructure.cfm
+++ b/api/admin/_scripts/debugDrinkStructure.cfm
@@ -9,7 +9,7 @@ response = { "OK": true };
 
 try {
     // Get Fountain Drinks item
-    qFountain = queryExecute("
+    qFountain = queryTimed("
         SELECT ID, Name, ParentItemID, Price, IsCollapsible, RequiresChildSelection
         FROM Items
         WHERE BusinessID = 17 AND Name LIKE '%Fountain%'
@@ -27,7 +27,7 @@ try {
         };
 
         // Get children of this item
-        qChildren = queryExecute("
+        qChildren = queryTimed("
             SELECT ID, Name, ParentItemID, Price, IsCollapsible, RequiresChildSelection, IsCheckedByDefault
             FROM Items
             WHERE ParentItemID = :parentId
@@ -45,7 +45,7 @@ try {
             };
 
             // Get grandchildren
-            qGrandchildren = queryExecute("
+            qGrandchildren = queryTimed("
                 SELECT ID, Name, Price, IsCheckedByDefault
                 FROM Items
                 WHERE ParentItemID = :parentId
diff --git a/api/admin/_scripts/debugEmployees.cfm b/api/admin/_scripts/debugEmployees.cfm
index bba761c..9bb02cf 100644
--- a/api/admin/_scripts/debugEmployees.cfm
+++ b/api/admin/_scripts/debugEmployees.cfm
@@ -13,7 +13,7 @@ try {
 if (structKeyExists(data, "Phone") && len(data.Phone)) {
   phone = reReplace(data.Phone, "[^0-9]", "", "all");
 
-  qUser = queryExecute("
+  qUser = queryTimed("
     SELECT ID, FirstName, LastName, EmailAddress, ContactNumber
     FROM Users
     WHERE REPLACE(REPLACE(REPLACE(ContactNumber, '-', ''), '(', ''), ')', '') LIKE ?
@@ -30,7 +30,7 @@ if (structKeyExists(data, "Phone") && len(data.Phone)) {
 
   userId = qUser.ID;
 
-  qEmployees = queryExecute("
+  qEmployees = queryTimed("
     SELECT e.ID, e.BusinessID, e.StatusID,
            CAST(e.IsActive AS UNSIGNED) AS IsActive,
            b.Name
@@ -66,7 +66,7 @@ if (structKeyExists(data, "Phone") && len(data.Phone)) {
 // Original behavior - list employees by BusinessID
 businessId = structKeyExists(data, "BusinessID") ? val(data.BusinessID) : 17;
 
-q = queryExecute("
+q = queryTimed("
   SELECT ID, UserID, StatusID, IsActive,
          CAST(IsActive AS UNSIGNED) AS IsActiveInt
   FROM Employees
diff --git a/api/admin/_scripts/debugTasks.cfm b/api/admin/_scripts/debugTasks.cfm
index 00c24a6..cc51e94 100644
--- a/api/admin/_scripts/debugTasks.cfm
+++ b/api/admin/_scripts/debugTasks.cfm
@@ -12,7 +12,7 @@ try {
 
 // Close all open chats action
 if (structKeyExists(data, "action") && data.action == "closeAllChats") {
-  queryExecute("
+  queryTimed("
     UPDATE Tasks SET CompletedOn = NOW()
     WHERE TaskTypeID = 2 AND CompletedOn IS NULL
   ", {}, { datasource: "payfrit" });
@@ -22,7 +22,7 @@ if (structKeyExists(data, "action") && data.action == "closeAllChats") {
 </cfscript>
 
 <cftry>
-  <cfset qTasks = queryExecute("
+  <cfset qTasks = queryTimed("
     SELECT
       t.ID,
       t.BusinessID,
@@ -50,7 +50,7 @@ if (structKeyExists(data, "action") && data.action == "closeAllChats") {
     })>
   </cfloop>
 
-  <cfset qStats = queryExecute("
+  <cfset qStats = queryTimed("
     SELECT
       COUNT(*) as Total,
       SUM(CASE WHEN ClaimedByUserID > 0 AND CompletedOn IS NULL THEN 1 ELSE 0 END) as ClaimedNotCompleted,
diff --git a/api/admin/_scripts/debugTasksRaw.cfm b/api/admin/_scripts/debugTasksRaw.cfm
index d637a3e..181125d 100644
--- a/api/admin/_scripts/debugTasksRaw.cfm
+++ b/api/admin/_scripts/debugTasksRaw.cfm
@@ -3,7 +3,7 @@
 <cfcontent type="application/json; charset=utf-8">
 
 <cftry>
-  <cfset qAll = queryExecute("
+  <cfset qAll = queryTimed("
     SELECT ID, ClaimedByUserID, CompletedOn, OrderID,
            CASE WHEN CompletedOn IS NULL THEN 'YES_NULL' ELSE 'NOT_NULL' END AS IsNull
     FROM Tasks
diff --git a/api/admin/_scripts/debugTemplateLinks.cfm b/api/admin/_scripts/debugTemplateLinks.cfm
index 4142ccc..7d7fda4 100644
--- a/api/admin/_scripts/debugTemplateLinks.cfm
+++ b/api/admin/_scripts/debugTemplateLinks.cfm
@@ -7,10 +7,10 @@
 bizId = 27;
 
 // Count total links
-qCount = queryExecute("SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID", {}, { datasource: "payfrit" });
+qCount = queryTimed("SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID", {}, { datasource: "payfrit" });
 
 // Get template item IDs for this business
-qTemplates = queryExecute("
+qTemplates = queryTimed("
   SELECT DISTINCT tl.TemplateItemID, i.Name
   FROM lt_ItemID_TemplateItemID tl
   JOIN Items i ON i.ID = tl.TemplateItemID
@@ -23,7 +23,7 @@ for (row in qTemplates) {
 }
 
 // Get items that should be categories (ParentItemID=0, not templates)
-qCategories = queryExecute("
+qCategories = queryTimed("
   SELECT i.ID, i.Name, i.ParentItemID, i.IsCollapsible
   FROM Items i
   WHERE i.BusinessID = :bizId
diff --git a/api/admin/_scripts/debugUserByPhone.cfm b/api/admin/_scripts/debugUserByPhone.cfm
index 2832190..53fc4da 100644
--- a/api/admin/_scripts/debugUserByPhone.cfm
+++ b/api/admin/_scripts/debugUserByPhone.cfm
@@ -19,7 +19,7 @@ if (len(phone) == 0) {
 }
 
 // Find user by phone
-qUser = queryExecute("
+qUser = queryTimed("
   SELECT ID, FirstName, LastName, EmailAddress, ContactNumber
   FROM Users
   WHERE REPLACE(REPLACE(REPLACE(ContactNumber, '-', ''), '(', ''), ')', '') LIKE ?
@@ -37,7 +37,7 @@ if (qUser.recordCount == 0) {
 userId = qUser.ID;
 
 // Get all employee records for this user
-qEmployees = queryExecute("
+qEmployees = queryTimed("
   SELECT e.ID, e.BusinessID, e.StatusID,
          CAST(e.IsActive AS UNSIGNED) AS IsActive,
          b.Name
diff --git a/api/admin/_scripts/deleteBusiness.cfm b/api/admin/_scripts/deleteBusiness.cfm
index c02ba6c..25a1c22 100644
--- a/api/admin/_scripts/deleteBusiness.cfm
+++ b/api/admin/_scripts/deleteBusiness.cfm
@@ -28,7 +28,7 @@ try {
         response["ERROR"] = "BusinessID required";
     } else {
         // Get address ID first
-        qBiz = queryExecute("SELECT AddressID FROM Businesses WHERE ID = :id", { id: bizID }, { datasource = "payfrit" });
+        qBiz = queryTimed("SELECT AddressID FROM Businesses WHERE ID = :id", { id: bizID }, { datasource = "payfrit" });
 
         if (qBiz.recordCount == 0) {
             response["ERROR"] = "Business not found";
@@ -36,11 +36,11 @@ try {
             addrID = qBiz.AddressID;
 
             // Delete business
-            queryExecute("DELETE FROM Businesses WHERE ID = :id", { id: bizID }, { datasource = "payfrit" });
+            queryTimed("DELETE FROM Businesses WHERE ID = :id", { id: bizID }, { datasource = "payfrit" });
 
             // Delete address if exists
             if (val(addrID) > 0) {
-                queryExecute("DELETE FROM Addresses WHERE ID = :id", { id: addrID }, { datasource = "payfrit" });
+                queryTimed("DELETE FROM Addresses WHERE ID = :id", { id: addrID }, { datasource = "payfrit" });
             }
 
             response["OK"] = true;
diff --git a/api/admin/_scripts/deleteOrphanModifiers.cfm b/api/admin/_scripts/deleteOrphanModifiers.cfm
index 38c7755..c635f8d 100644
--- a/api/admin/_scripts/deleteOrphanModifiers.cfm
+++ b/api/admin/_scripts/deleteOrphanModifiers.cfm
@@ -26,7 +26,7 @@ try {
 
     // Get all level-1 modifiers that are NOT templates
     // These are the duplicates we want to delete
-    qOrphans = queryExecute("
+    qOrphans = queryTimed("
         SELECT
             m.ItemID,
             m.Name,
@@ -49,12 +49,12 @@ try {
     for (orphan in qOrphans) {
         try {
             // Delete children of this orphan (options within the modifier group)
-            qDeleteChildren = queryExecute("
+            qDeleteChildren = queryTimed("
                 DELETE FROM Items WHERE ParentItemID = :orphanID
             ", { orphanID: orphan.ItemID }, { datasource: "payfrit" });
 
             // Delete the orphan itself
-            qDeleteOrphan = queryExecute("
+            qDeleteOrphan = queryTimed("
                 DELETE FROM Items WHERE ID = :orphanID
             ", { orphanID: orphan.ItemID }, { datasource: "payfrit" });
 
diff --git a/api/admin/_scripts/deleteOrphans.cfm b/api/admin/_scripts/deleteOrphans.cfm
index 0b0fe1f..ddcb5c9 100644
--- a/api/admin/_scripts/deleteOrphans.cfm
+++ b/api/admin/_scripts/deleteOrphans.cfm
@@ -18,7 +18,7 @@ response = { "OK": false, "deleted": 0, "orphans": [] };
 
 try {
     // Find orphans
-    qOrphans = queryExecute("
+    qOrphans = queryTimed("
         SELECT i.ID, i.Name, i.BusinessID
         FROM Items i
         WHERE i.ParentItemID = 0
@@ -43,7 +43,7 @@ try {
 
     // Delete them by ID list
     if (arrayLen(orphanIDs) > 0) {
-        queryExecute("
+        queryTimed("
             DELETE FROM Items WHERE ID IN (#arrayToList(orphanIDs)#)
         ", {}, { datasource: "payfrit" });
     }
diff --git a/api/admin/_scripts/describeItems.cfm b/api/admin/_scripts/describeItems.cfm
index 740e814..b5f9358 100644
--- a/api/admin/_scripts/describeItems.cfm
+++ b/api/admin/_scripts/describeItems.cfm
@@ -3,7 +3,7 @@
 <cfcontent type="application/json; charset=utf-8" reset="true">
 
 <cfscript>
-qDesc = queryExecute("SHOW COLUMNS FROM Items", {}, { datasource: "payfrit" });
+qDesc = queryTimed("SHOW COLUMNS FROM Items", {}, { datasource: "payfrit" });
 
 cols = [];
 for (row in qDesc) {
diff --git a/api/admin/_scripts/describeTable.cfm b/api/admin/_scripts/describeTable.cfm
index 823c6cb..bd1f21d 100644
--- a/api/admin/_scripts/describeTable.cfm
+++ b/api/admin/_scripts/describeTable.cfm
@@ -17,7 +17,7 @@ try {
     }
 
     // Get table structure
-    cols = queryExecute("DESCRIBE #tableName#", {}, { datasource: "payfrit" });
+    cols = queryTimed("DESCRIBE #tableName#", {}, { datasource: "payfrit" });
 
     columns = [];
     for (c in cols) {
@@ -31,7 +31,7 @@ try {
     }
 
     // Get sample data
-    sampleData = queryExecute("SELECT * FROM #tableName# LIMIT 5", {}, { datasource: "payfrit" });
+    sampleData = queryTimed("SELECT * FROM #tableName# LIMIT 5", {}, { datasource: "payfrit" });
 
     samples = [];
     for (row in sampleData) {
diff --git a/api/admin/_scripts/eliminateCategories.cfm b/api/admin/_scripts/eliminateCategories.cfm
index 1eacb80..af58523 100644
--- a/api/admin/_scripts/eliminateCategories.cfm
+++ b/api/admin/_scripts/eliminateCategories.cfm
@@ -37,7 +37,7 @@ try {
     // Step 1: Add BusinessID column if it doesn't exist
     try {
         if (!dryRun) {
-            queryExecute("
+            queryTimed("
                 ALTER TABLE Items ADD COLUMN BusinessID INT DEFAULT 0 AFTER ItemID
             ", {}, { datasource: "payfrit" });
         }
@@ -53,7 +53,7 @@ try {
     // Step 2: Add index on BusinessID
     try {
         if (!dryRun) {
-            queryExecute("
+            queryTimed("
                 CREATE INDEX idx_item_business ON Items (BusinessID)
             ", {}, { datasource: "payfrit" });
         }
@@ -69,7 +69,7 @@ try {
     // Step 3: Drop foreign key constraint on CategoryID if it exists
     try {
         if (!dryRun) {
-            queryExecute("
+            queryTimed("
                 ALTER TABLE Items DROP FOREIGN KEY Items_ibfk_1
             ", {}, { datasource: "payfrit" });
         }
@@ -83,7 +83,7 @@ try {
     }
 
     // Step 4: Get all Categories
-    qCategories = queryExecute("
+    qCategories = queryTimed("
         SELECT ID, BusinessID, Name
         FROM Categories
         ORDER BY BusinessID, Name
@@ -104,7 +104,7 @@ try {
         if (!dryRun) {
             // Create new Item for this category (ParentID=0, no template flag needed)
             // Note: CategoryID set to 0 temporarily until we drop that column
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (
                     BusinessID,
                     CategoryID,
@@ -136,7 +136,7 @@ try {
             }, { datasource: "payfrit" });
 
             // Get the new Item ID
-            qNewItem = queryExecute("
+            qNewItem = queryTimed("
                 SELECT ID FROM Items
                 WHERE BusinessID = :businessID
                   AND Name = :categoryName
@@ -154,7 +154,7 @@ try {
             // Update menu items in this category:
             // - Set ParentItemID = newItemID (for top-level items only)
             // - Set BusinessID = businessID (for all items)
-            queryExecute("
+            queryTimed("
                 UPDATE Items
                 SET BusinessID = :businessID,
                     ParentItemID = :newItemID
@@ -167,7 +167,7 @@ try {
             }, { datasource: "payfrit" });
 
             // Set BusinessID on ALL items in this category (including nested)
-            queryExecute("
+            queryTimed("
                 UPDATE Items
                 SET BusinessID = :businessID
                 WHERE CategoryID = :categoryID
@@ -178,7 +178,7 @@ try {
             }, { datasource: "payfrit" });
 
             // Count how many were updated
-            qCount = queryExecute("
+            qCount = queryTimed("
                 SELECT COUNT(*) as cnt FROM Items
                 WHERE ParentItemID = :newItemID
             ", { newItemID: newItemID }, { datasource: "payfrit" });
@@ -186,7 +186,7 @@ try {
             migration["itemsUpdated"] = qCount.cnt;
         } else {
             // Dry run - count what would be updated
-            qCount = queryExecute("
+            qCount = queryTimed("
                 SELECT COUNT(*) as cnt FROM Items
                 WHERE CategoryID = :categoryID
                   AND ParentItemID = 0
@@ -201,7 +201,7 @@ try {
     // Step 5: Set BusinessID for templates (items in lt_ItemID_TemplateItemID)
     // Templates get their BusinessID from the items they're linked to
     if (!dryRun) {
-        queryExecute("
+        queryTimed("
             UPDATE Items t
             INNER JOIN lt_ItemID_TemplateItemID tl ON tl.TemplateItemID = t.ItemID
             INNER JOIN Items i ON i.ID = tl.ItemID
@@ -213,7 +213,7 @@ try {
         arrayAppend(response.steps, "Set BusinessID on templates from linked items");
 
         // Set BusinessID on template children (options)
-        queryExecute("
+        queryTimed("
             UPDATE Items c
             INNER JOIN Items t ON t.ItemID = c.ParentItemID
             SET c.BusinessID = t.BusinessID
@@ -224,7 +224,7 @@ try {
         arrayAppend(response.steps, "Set BusinessID on template children");
 
         // Make sure templates have ParentID=0 (they live at top level)
-        queryExecute("
+        queryTimed("
             UPDATE Items t
             INNER JOIN lt_ItemID_TemplateItemID tl ON tl.TemplateItemID = t.ItemID
             SET t.ParentItemID = 0
diff --git a/api/admin/_scripts/fixBigDeansCategories.cfm b/api/admin/_scripts/fixBigDeansCategories.cfm
index 434ef53..5909261 100644
--- a/api/admin/_scripts/fixBigDeansCategories.cfm
+++ b/api/admin/_scripts/fixBigDeansCategories.cfm
@@ -13,20 +13,20 @@ fakeCategories = [11177, 11180, 11183, 11186, 11190, 11193, 11196, 11199, 11204,
 
 // Deactivate these items (or we could delete them, but deactivate is safer)
 for (itemId in fakeCategories) {
-  queryExecute("
+  queryTimed("
     UPDATE Items SET IsActive = 0 WHERE ItemID = :itemId AND BusinessID = :bizId
   ", { itemId: itemId, bizId: bizId }, { datasource: "payfrit" });
 }
 
 // Also deactivate their children (modifier options that belong to these fake parents)
 for (itemId in fakeCategories) {
-  queryExecute("
+  queryTimed("
     UPDATE Items SET IsActive = 0 WHERE ParentItemID = :itemId AND BusinessID = :bizId
   ", { itemId: itemId, bizId: bizId }, { datasource: "payfrit" });
 }
 
 // Now verify what categories remain
-qCategories = queryExecute("
+qCategories = queryTimed("
   SELECT i.ID, i.Name
   FROM Items i
   WHERE i.BusinessID = :bizId
diff --git a/api/admin/_scripts/fixBigDeansModifiers.cfm b/api/admin/_scripts/fixBigDeansModifiers.cfm
index dd41f76..13d5ae3 100644
--- a/api/admin/_scripts/fixBigDeansModifiers.cfm
+++ b/api/admin/_scripts/fixBigDeansModifiers.cfm
@@ -20,7 +20,7 @@ burgerIds = [11286, 11287, 11288, 11289, 11290]; // Big Dean's, Single w/Cheese,
 actions = [];
 
 // First, let's see what templates already exist and are active for burgers
-qExistingLinks = queryExecute("
+qExistingLinks = queryTimed("
   SELECT tl.ItemID as MenuItemID, tl.TemplateItemID, t.Name as TemplateName
   FROM lt_ItemID_TemplateItemID tl
   JOIN Items t ON t.ItemID = tl.TemplateItemID
@@ -33,21 +33,21 @@ for (row in qExistingLinks) {
 
 // Reactivate template 11196 (Extras with Add Cheese)
 if (!dryRun) {
-  queryExecute("UPDATE Items SET IsActive = 1 WHERE ItemID = 11196", {}, { datasource: "payfrit" });
-  queryExecute("UPDATE Items SET IsActive = 1 WHERE ParentItemID = 11196", {}, { datasource: "payfrit" });
+  queryTimed("UPDATE Items SET IsActive = 1 WHERE ItemID = 11196", {}, { datasource: "payfrit" });
+  queryTimed("UPDATE Items SET IsActive = 1 WHERE ParentItemID = 11196", {}, { datasource: "payfrit" });
 }
 arrayAppend(actions, { action: dryRun ? "WOULD_REACTIVATE" : "REACTIVATED", itemID: 11196, name: "Extras (Add Cheese, Add Onions)" });
 
 // Link template 11196 to all burgers
 for (burgerId in burgerIds) {
   // Check if link already exists
-  qCheck = queryExecute("
+  qCheck = queryTimed("
     SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID WHERE ItemID = :burgerId AND TemplateItemID = 11196
   ", { burgerId: burgerId }, { datasource: "payfrit" });
 
   if (qCheck.cnt EQ 0) {
     if (!dryRun) {
-      queryExecute("
+      queryTimed("
         INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
         VALUES (:burgerId, 11196, 2)
       ", { burgerId: burgerId }, { datasource: "payfrit" });
@@ -58,7 +58,7 @@ for (burgerId in burgerIds) {
 
 // Verify the result
 if (!dryRun) {
-  qVerify = queryExecute("
+  qVerify = queryTimed("
     SELECT mi.ID, mi.Name, GROUP_CONCAT(t.Name ORDER BY tl.SortOrder) as Templates
     FROM Items mi
     LEFT JOIN lt_ItemID_TemplateItemID tl ON tl.ItemID = mi.ID
diff --git a/api/admin/_scripts/fixBrandColors.cfm b/api/admin/_scripts/fixBrandColors.cfm
index 118804c..46f1321 100644
--- a/api/admin/_scripts/fixBrandColors.cfm
+++ b/api/admin/_scripts/fixBrandColors.cfm
@@ -2,21 +2,21 @@
 <cfcontent type="application/json" reset="true">
 <cfscript>
 // One-time fix: remove # prefix from BrandColor
-qBefore = queryExecute("
+qBefore = queryTimed("
   SELECT ID, BrandColor
   FROM Businesses
   WHERE BrandColor LIKE :pattern
 ", { pattern: { value: "##%", cfsqltype: "cf_sql_varchar" } }, { datasource: "payfrit" });
 
 if (qBefore.recordCount > 0) {
-  queryExecute("
+  queryTimed("
     UPDATE Businesses
     SET BrandColor = SUBSTRING(BrandColor, 2)
     WHERE BrandColor LIKE :pattern
   ", { pattern: { value: "##%", cfsqltype: "cf_sql_varchar" } }, { datasource: "payfrit" });
 }
 
-qAfter = queryExecute("
+qAfter = queryTimed("
   SELECT ID, BrandColor
   FROM Businesses
   WHERE BrandColor IS NOT NULL AND LENGTH(BrandColor) > 0
diff --git a/api/admin/_scripts/fixOrphanedTaskCategories.cfm b/api/admin/_scripts/fixOrphanedTaskCategories.cfm
index c2f8d15..5e92279 100644
--- a/api/admin/_scripts/fixOrphanedTaskCategories.cfm
+++ b/api/admin/_scripts/fixOrphanedTaskCategories.cfm
@@ -6,7 +6,7 @@
 // Update them to use new category ID 25 (new Service Point)
 try {
     // First check how many tasks are affected
-    qCount = queryExecute("
+    qCount = queryTimed("
         SELECT COUNT(*) as cnt FROM Tasks WHERE TaskCategoryID = 4
     ", [], { datasource: "payfrit" });
 
@@ -14,7 +14,7 @@ try {
 
     if (affectedCount > 0) {
         // Update them to the new category
-        queryExecute("
+        queryTimed("
             UPDATE Tasks SET TaskCategoryID = 25 WHERE TaskCategoryID = 4
         ", [], { datasource: "payfrit" });
 
diff --git a/api/admin/_scripts/fixShakeFlavors.cfm b/api/admin/_scripts/fixShakeFlavors.cfm
index 14e708e..90a89d3 100644
--- a/api/admin/_scripts/fixShakeFlavors.cfm
+++ b/api/admin/_scripts/fixShakeFlavors.cfm
@@ -44,7 +44,7 @@ try {
     categoryID = 46; // Fries and Shakes
 
     // Step 1: Create "Choose Flavor" modifier group under Shake
-    queryExecute("
+    queryTimed("
         INSERT INTO Items (
             CategoryID,
             Name,
@@ -80,7 +80,7 @@ try {
     }, { datasource: "payfrit" });
 
     // Get the new Choose Flavor ID
-    qNewGroup = queryExecute("
+    qNewGroup = queryTimed("
         SELECT ID FROM Items
         WHERE Name = 'Choose Flavor'
           AND ParentItemID = :shakeItemID
@@ -92,7 +92,7 @@ try {
     arrayAppend(response.steps, "Created 'Choose Flavor' group with ID: " & chooseFlavorID);
 
     // Step 2: Re-parent the three flavors under Choose Flavor
-    queryExecute("
+    queryTimed("
         UPDATE Items
         SET ParentItemID = :chooseFlavorID,
             IsModifierTemplate = 0,
@@ -108,14 +108,14 @@ try {
     arrayAppend(response.steps, "Re-parented Chocolate, Strawberry, Vanilla under Choose Flavor");
 
     // Step 3: Set Vanilla as default (common choice)
-    queryExecute("
+    queryTimed("
         UPDATE Items SET IsCheckedByDefault = 1 WHERE ItemID = :vanillaID
     ", { vanillaID: vanillaID }, { datasource: "payfrit" });
 
     arrayAppend(response.steps, "Set Vanilla as default flavor");
 
     // Step 4: Remove old template links for the flavors
-    queryExecute("
+    queryTimed("
         DELETE FROM lt_ItemID_TemplateItemID
         WHERE TemplateItemID IN (:chocolateID, :strawberryID, :vanillaID)
     ", {
@@ -127,7 +127,7 @@ try {
     arrayAppend(response.steps, "Removed old template links for flavor items");
 
     // Step 5: Create lt_ItemID_TemplateItemID for Shake -> Choose Flavor
-    queryExecute("
+    queryTimed("
         INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
         VALUES (:shakeItemID, :chooseFlavorID, 0)
         ON DUPLICATE KEY UPDATE SortOrder = 0
@@ -139,7 +139,7 @@ try {
     arrayAppend(response.steps, "Created template link: Shake -> Choose Flavor");
 
     // Step 6: Set RequiresChildSelection on shake
-    queryExecute("
+    queryTimed("
         UPDATE Items
         SET RequiresChildSelection = 1
         WHERE ItemID = :shakeItemID
diff --git a/api/admin/_scripts/linkChildBusiness.cfm b/api/admin/_scripts/linkChildBusiness.cfm
index e178295..4786570 100644
--- a/api/admin/_scripts/linkChildBusiness.cfm
+++ b/api/admin/_scripts/linkChildBusiness.cfm
@@ -28,7 +28,7 @@ try {
     if (childID <= 0) {
         response["ERROR"] = "ChildBusinessID required";
     } else {
-        queryExecute("
+        queryTimed("
             UPDATE Businesses SET ParentBusinessID = :parentId WHERE ID = :childId
         ", {
             parentId: { value = parentID > 0 ? parentID : javaCast("null", ""), cfsqltype = "cf_sql_integer", null = parentID == 0 },
diff --git a/api/admin/_scripts/listTables.cfm b/api/admin/_scripts/listTables.cfm
index 4daa9dd..1cc47ec 100644
--- a/api/admin/_scripts/listTables.cfm
+++ b/api/admin/_scripts/listTables.cfm
@@ -5,7 +5,7 @@
 <cfscript>
 try {
     // List all tables
-    tables = queryExecute("SHOW TABLES", {}, { datasource: "payfrit" });
+    tables = queryTimed("SHOW TABLES", {}, { datasource: "payfrit" });
 
     tableList = [];
     for (t in tables) {
diff --git a/api/admin/_scripts/migrateModifierTemplates.cfm b/api/admin/_scripts/migrateModifierTemplates.cfm
index e3afea9..266b1c6 100644
--- a/api/admin/_scripts/migrateModifierTemplates.cfm
+++ b/api/admin/_scripts/migrateModifierTemplates.cfm
@@ -25,7 +25,7 @@ try {
     businessID = 17; // In and Out Burger
 
     // Step 1: Get all parent items (burgers, combos, etc.)
-    qParentItems = queryExecute("
+    qParentItems = queryTimed("
         SELECT i.ID, i.Name
         FROM Items i
         INNER JOIN Categories c ON c.ID = i.CategoryID
@@ -38,7 +38,7 @@ try {
     arrayAppend(response.steps, "Found " & qParentItems.recordCount & " parent items");
 
     // Step 2: Get all direct children (level 1 modifiers) of parent items
-    qModifiers = queryExecute("
+    qModifiers = queryTimed("
         SELECT
             m.ItemID,
             m.Name,
@@ -90,7 +90,7 @@ try {
             templateItemID = templateItem.ItemID;
 
             // Mark as template
-            queryExecute("
+            queryTimed("
                 UPDATE Items SET IsModifierTemplate = 1 WHERE ItemID = :itemID
             ", { itemID: templateItemID }, { datasource: "payfrit" });
 
@@ -110,7 +110,7 @@ try {
 
                 // Insert link (ignore duplicates)
                 try {
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
                         VALUES (:itemID, :templateID, :sortOrder)
                         ON DUPLICATE KEY UPDATE SortOrder = :sortOrder
@@ -142,12 +142,12 @@ try {
         } else {
             // Single instance - still mark as template for consistency
             singleItem = instances[1];
-            queryExecute("
+            queryTimed("
                 UPDATE Items SET IsModifierTemplate = 1 WHERE ItemID = :itemID
             ", { itemID: singleItem.ItemID }, { datasource: "payfrit" });
 
             // Create link
-            queryExecute("
+            queryTimed("
                 INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
                 VALUES (:itemID, :templateID, :sortOrder)
                 ON DUPLICATE KEY UPDATE SortOrder = :sortOrder
diff --git a/api/admin/_scripts/migrateToCategories.cfm b/api/admin/_scripts/migrateToCategories.cfm
index 721bed8..9c9dbf7 100644
--- a/api/admin/_scripts/migrateToCategories.cfm
+++ b/api/admin/_scripts/migrateToCategories.cfm
@@ -26,13 +26,13 @@ try {
 
     // Find all businesses with items in unified schema
     if (len(businessFilter)) {
-        qBusinesses = queryExecute("
+        qBusinesses = queryTimed("
             SELECT DISTINCT BusinessID as BusinessID
             FROM Items
             WHERE BusinessID = :bid AND BusinessID > 0
         ", { bid: businessFilter }, { datasource: "payfrit" });
     } else {
-        qBusinesses = queryExecute("
+        qBusinesses = queryTimed("
             SELECT DISTINCT BusinessID as BusinessID
             FROM Items
             WHERE BusinessID > 0
@@ -45,7 +45,7 @@ try {
 
         try {
             // Find category-like Items (parent=0, not collapsible, has children, not in template links)
-            qCategoryItems = queryExecute("
+            qCategoryItems = queryTimed("
                 SELECT DISTINCT
                     p.ID,
                     p.Name,
@@ -64,20 +64,20 @@ try {
             sortOrder = 0;
             for (catItem in qCategoryItems) {
                 // Check if category already exists for this business with same name
-                qExisting = queryExecute("
+                qExisting = queryTimed("
                     SELECT ID FROM Categories
                     WHERE BusinessID = :bizId AND Name = :name
                 ", { bizId: bizId, name: left(catItem.Name, 30) }, { datasource: "payfrit" });
 
                 if (qExisting.recordCount == 0) {
                     // Get next CategoryID
-                    qMaxId = queryExecute("
+                    qMaxId = queryTimed("
                         SELECT COALESCE(MAX(ID), 0) + 1 as nextId FROM Categories
                     ", {}, { datasource: "payfrit" });
                     newCatId = qMaxId.nextId;
 
                     // Create new category with explicit ID
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO Categories
                         (ID, BusinessID, ParentCategoryID, Name, SortOrder, AddedOn)
                         VALUES (:catId, :bizId, 0, :name, :sortOrder, NOW())
@@ -94,7 +94,7 @@ try {
                 }
 
                 // Update all children of this category Item to have the new CategoryID
-                queryExecute("
+                queryTimed("
                     UPDATE Items
                     SET CategoryID = :catId
                     WHERE ParentItemID = :parentId
@@ -105,7 +105,7 @@ try {
                     bizId: bizId
                 }, { datasource: "payfrit" });
 
-                qUpdated = queryExecute("SELECT ROW_COUNT() as cnt", {}, { datasource: "payfrit" });
+                qUpdated = queryTimed("SELECT ROW_COUNT() as cnt", {}, { datasource: "payfrit" });
                 bizResult.ItemsUpdated += qUpdated.cnt;
 
                 sortOrder++;
diff --git a/api/admin/_scripts/randomizePrices.cfm b/api/admin/_scripts/randomizePrices.cfm
index 397885b..b952bd2 100644
--- a/api/admin/_scripts/randomizePrices.cfm
+++ b/api/admin/_scripts/randomizePrices.cfm
@@ -11,7 +11,7 @@ businessId = 27; // Big Dean's
 // Modifiers are children of menu items or modifier templates
 
 // Get category IDs (NOT modifier templates)
-categoryIds = queryExecute("
+categoryIds = queryTimed("
   SELECT ID
   FROM Items
   WHERE BusinessID = :bizId
@@ -26,7 +26,7 @@ for (cat in categoryIds) {
 
 // Now get actual menu items (direct children of categories)
 // Exclude items that are template options (their parent is a collapsible modifier group)
-items = queryExecute("
+items = queryTimed("
   SELECT i.ID, i.Name
   FROM Items i
   WHERE i.BusinessID = :bizId
@@ -97,7 +97,7 @@ for (item in items) {
     newPrice = randRange(15, 23) - 0.01; // $14.99 - $22.99
   }
 
-  queryExecute("
+  queryTimed("
     UPDATE Items
     SET Price = :price
     WHERE ItemID = :itemId
@@ -112,7 +112,7 @@ for (item in items) {
 
 // Update modifier prices (children of menu items, NOT direct children of categories)
 // Modifiers are items whose parent is NOT a category (i.e., parent is a menu item or modifier group)
-modifiers = queryExecute("
+modifiers = queryTimed("
   SELECT ID, Name
   FROM Items
   WHERE BusinessID = :bizId
@@ -148,7 +148,7 @@ for (mod in modifiers) {
     }
   }
 
-  queryExecute("
+  queryTimed("
     UPDATE Items
     SET Price = :price
     WHERE ItemID = :itemId
@@ -156,7 +156,7 @@ for (mod in modifiers) {
 }
 
 // Reset category prices to $0 (shouldn't have prices for reporting)
-queryExecute("
+queryTimed("
   UPDATE Items
   SET Price = 0
   WHERE BusinessID = :bizId
@@ -164,7 +164,7 @@ queryExecute("
 ", { bizId: businessId }, { datasource: "payfrit" });
 
 // Reset modifier group prices to $0 (only options have prices)
-queryExecute("
+queryTimed("
   UPDATE Items
   SET Price = 0
   WHERE BusinessID = :bizId
diff --git a/api/admin/_scripts/resetTestData.cfm b/api/admin/_scripts/resetTestData.cfm
index 9efb8b1..7d580b9 100644
--- a/api/admin/_scripts/resetTestData.cfm
+++ b/api/admin/_scripts/resetTestData.cfm
@@ -10,36 +10,36 @@
 
 <cftry>
   <!--- Disable foreign key checks temporarily --->
-  <cfset queryExecute("SET FOREIGN_KEY_CHECKS = 0", [], { datasource = "payfrit" })>
+  <cfset queryTimed("SET FOREIGN_KEY_CHECKS = 0", [], { datasource = "payfrit" })>
 
   <!--- Clear Tasks --->
-  <cfset queryExecute("DELETE FROM Tasks", [], { datasource = "payfrit" })>
+  <cfset queryTimed("DELETE FROM Tasks", [], { datasource = "payfrit" })>
 
   <!--- Clear Payments --->
   <cftry>
-    <cfset queryExecute("DELETE FROM Payments", [], { datasource = "payfrit" })>
+    <cfset queryTimed("DELETE FROM Payments", [], { datasource = "payfrit" })>
     <cfcatch></cfcatch>
   </cftry>
 
   <!--- Clear OrderLineItemModifiers if exists --->
   <cftry>
-    <cfset queryExecute("DELETE FROM OrderLineItemModifiers", [], { datasource = "payfrit" })>
+    <cfset queryTimed("DELETE FROM OrderLineItemModifiers", [], { datasource = "payfrit" })>
     <cfcatch></cfcatch>
   </cftry>
 
   <!--- Clear OrderLineItems --->
-  <cfset queryExecute("DELETE FROM OrderLineItems", [], { datasource = "payfrit" })>
+  <cfset queryTimed("DELETE FROM OrderLineItems", [], { datasource = "payfrit" })>
 
   <!--- Clear Orders --->
-  <cfset queryExecute("DELETE FROM Orders", [], { datasource = "payfrit" })>
+  <cfset queryTimed("DELETE FROM Orders", [], { datasource = "payfrit" })>
 
   <!--- Re-enable foreign key checks --->
-  <cfset queryExecute("SET FOREIGN_KEY_CHECKS = 1", [], { datasource = "payfrit" })>
+  <cfset queryTimed("SET FOREIGN_KEY_CHECKS = 1", [], { datasource = "payfrit" })>
 
   <!--- Reset auto-increment counters --->
-  <cfset queryExecute("ALTER TABLE Tasks AUTO_INCREMENT = 1", [], { datasource = "payfrit" })>
-  <cfset queryExecute("ALTER TABLE Orders AUTO_INCREMENT = 1", [], { datasource = "payfrit" })>
-  <cfset queryExecute("ALTER TABLE OrderLineItems AUTO_INCREMENT = 1", [], { datasource = "payfrit" })>
+  <cfset queryTimed("ALTER TABLE Tasks AUTO_INCREMENT = 1", [], { datasource = "payfrit" })>
+  <cfset queryTimed("ALTER TABLE Orders AUTO_INCREMENT = 1", [], { datasource = "payfrit" })>
+  <cfset queryTimed("ALTER TABLE OrderLineItems AUTO_INCREMENT = 1", [], { datasource = "payfrit" })>
 
   <cfset apiAbort({
     "OK": true,
diff --git a/api/admin/_scripts/setEmployeeActive.cfm b/api/admin/_scripts/setEmployeeActive.cfm
index 74486d7..1abc847 100644
--- a/api/admin/_scripts/setEmployeeActive.cfm
+++ b/api/admin/_scripts/setEmployeeActive.cfm
@@ -20,7 +20,7 @@ if (businessId <= 0 || userId <= 0) {
 
 try {
   // Update employee record
-  queryExecute("
+  queryTimed("
     UPDATE Employees
     SET IsActive = ?
     WHERE BusinessID = ? AND UserID = ?
@@ -31,7 +31,7 @@ try {
   ], { datasource: "payfrit" });
 
   // Get updated record
-  q = queryExecute("
+  q = queryTimed("
     SELECT e.ID, e.BusinessID, e.UserID, e.StatusID,
            CAST(e.IsActive AS UNSIGNED) AS IsActive,
            b.Name, u.FirstName, u.LastName
diff --git a/api/admin/_scripts/setHeaderExtension.cfm b/api/admin/_scripts/setHeaderExtension.cfm
index 1dc70d6..3c24d79 100644
--- a/api/admin/_scripts/setHeaderExtension.cfm
+++ b/api/admin/_scripts/setHeaderExtension.cfm
@@ -6,7 +6,7 @@
 response = { "OK": false };
 
 try {
-    queryExecute("
+    queryTimed("
         UPDATE Businesses SET HeaderImageExtension = 'jpg' WHERE ID = 37
     ", {}, { datasource: "payfrit" });
 
diff --git a/api/admin/_scripts/setupBeaconTables.cfm b/api/admin/_scripts/setupBeaconTables.cfm
index 0054e9d..d8328fc 100644
--- a/api/admin/_scripts/setupBeaconTables.cfm
+++ b/api/admin/_scripts/setupBeaconTables.cfm
@@ -13,7 +13,7 @@ try {
     lazyDaisyID = 37;
 
     // Get all service points for Lazy Daisy
-    qServicePoints = queryExecute("
+    qServicePoints = queryTimed("
         SELECT ID, Name AS Name
         FROM ServicePoints
         WHERE BusinessID = :bizID AND IsActive = 1
@@ -28,7 +28,7 @@ try {
         beaconName = "Beacon - " & sp.Name;
 
         // Check if beacon already exists for this business with this name
-        qExisting = queryExecute("
+        qExisting = queryTimed("
             SELECT ID FROM Beacons
             WHERE BusinessID = :bizId AND Name = :name
         ", { bizId: lazyDaisyID, name: beaconName }, { datasource: "payfrit" });
@@ -37,7 +37,7 @@ try {
             // Generate a unique UUID for this beacon (32 hex chars, no dashes)
             beaconUUID = "PAYFRIT00037" & numberFormat(sp.ID, "0000000000000000000");
 
-            queryExecute("
+            queryTimed("
                 INSERT INTO Beacons (BusinessID, Name, UUID, IsActive)
                 VALUES (:bizId, :name, :uuid, 1)
             ", {
@@ -46,11 +46,11 @@ try {
                 uuid: beaconUUID
             }, { datasource: "payfrit" });
 
-            qNewBeacon = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            qNewBeacon = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             newBeaconId = qNewBeacon.id;
 
             // Assign beacon directly to service point
-            queryExecute("
+            queryTimed("
                 UPDATE ServicePoints
                 SET BeaconID = :beaconId, AssignedByUserID = 1
                 WHERE ID = :spId AND BusinessID = :bizId
@@ -68,7 +68,7 @@ try {
     }
 
     // Get final status
-    qFinal = queryExecute("
+    qFinal = queryTimed("
         SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
                b.Name AS BeaconName, b.UUID, sp.Name AS ServicePointName,
                biz.Name AS BusinessName
diff --git a/api/admin/_scripts/setupBigDeansInfo.cfm b/api/admin/_scripts/setupBigDeansInfo.cfm
index b070bfd..9493994 100644
--- a/api/admin/_scripts/setupBigDeansInfo.cfm
+++ b/api/admin/_scripts/setupBigDeansInfo.cfm
@@ -13,18 +13,18 @@ try {
     // Hours: Mon-Thu: 11am-10pm, Fri-Sat: 11am-11pm, Sun: 11am-10pm
 
     // Get California StateID
-    qState = queryExecute("SELECT ID FROM tt_States WHERE Abbreviation = 'CA' LIMIT 1");
+    qState = queryTimed("SELECT ID FROM tt_States WHERE Abbreviation = 'CA' LIMIT 1");
     stateId = qState.recordCount > 0 ? qState.ID : 5; // Default to 5 if not found
 
     // Check if Big Dean's already has an address
-    existingAddr = queryExecute("
+    existingAddr = queryTimed("
         SELECT ID FROM Addresses
         WHERE BusinessID = :bizId AND UserID = 0
     ", { bizId: businessId });
 
     if (existingAddr.recordCount == 0) {
         // Insert new address
-        queryExecute("
+        queryTimed("
             INSERT INTO Addresses (UserID, BusinessID, AddressTypeID, Line1, City, StateID, ZIPCode, IsDeleted, AddedOn)
             VALUES (0, :bizId, '2', :line1, :city, :stateId, :zip, 0, NOW())
         ", {
@@ -37,7 +37,7 @@ try {
         response["ADDRESS_ACTION"] = "inserted";
     } else {
         // Update existing address
-        queryExecute("
+        queryTimed("
             UPDATE Addresses
             SET Line1 = :line1, City = :city, StateID = :stateId, ZIPCode = :zip
             WHERE BusinessID = :bizId AND UserID = 0
@@ -52,7 +52,7 @@ try {
     }
 
     // Check existing hours for this business
-    existingHours = queryExecute("
+    existingHours = queryTimed("
         SELECT COUNT(*) as cnt FROM Hours WHERE BusinessID = :bizId
     ", { bizId: businessId });
 
@@ -64,39 +64,39 @@ try {
         // Sun: 11am-10pm (day 1)
 
         // Sunday (1): 11am-10pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 1, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 1, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Monday (2): 11am-10pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 2, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 2, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Tuesday (3): 11am-10pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 3, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 3, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Wednesday (4): 11am-10pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 4, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 4, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Thursday (5): 11am-10pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 5, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 5, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Friday (6): 11am-11pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 6, '11:00:00', '23:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 6, '11:00:00', '23:00:00')", { bizId: businessId });
 
         // Saturday (7): 11am-11pm
-        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 7, '11:00:00', '23:00:00')", { bizId: businessId });
+        queryTimed("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 7, '11:00:00', '23:00:00')", { bizId: businessId });
 
         response["HOURS_ACTION"] = "inserted 7 days";
     } else {
         // Update existing hours
         // Mon-Thu: 11am-10pm
-        queryExecute("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '22:00:00' WHERE BusinessID = :bizId AND DayID IN (1, 2, 3, 4, 5)", { bizId: businessId });
+        queryTimed("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '22:00:00' WHERE BusinessID = :bizId AND DayID IN (1, 2, 3, 4, 5)", { bizId: businessId });
         // Fri-Sat: 11am-11pm
-        queryExecute("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '23:00:00' WHERE BusinessID = :bizId AND DayID IN (6, 7)", { bizId: businessId });
+        queryTimed("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '23:00:00' WHERE BusinessID = :bizId AND DayID IN (6, 7)", { bizId: businessId });
         response["HOURS_ACTION"] = "updated";
     }
 
     // Update phone on Businesses table (if column exists)
     try {
-        queryExecute("UPDATE Businesses SET Phone = :phone WHERE ID = :bizId", {
+        queryTimed("UPDATE Businesses SET Phone = :phone WHERE ID = :bizId", {
             phone: "(310) 393-2666",
             bizId: businessId
         });
@@ -106,14 +106,14 @@ try {
     }
 
     // Verify the data
-    address = queryExecute("
+    address = queryTimed("
         SELECT a.*, s.Abbreviation
         FROM Addresses a
         LEFT JOIN tt_States s ON s.ID = a.StateID
         WHERE a.BusinessID = :bizId AND a.UserID = 0
     ", { bizId: businessId });
 
-    hours = queryExecute("
+    hours = queryTimed("
         SELECT h.*, d.Name AS DayName
         FROM Hours h
         JOIN tt_Days d ON d.ID = h.DayID
diff --git a/api/admin/_scripts/setupBigDeansStations.cfm b/api/admin/_scripts/setupBigDeansStations.cfm
index b85c9fa..bcbea0d 100644
--- a/api/admin/_scripts/setupBigDeansStations.cfm
+++ b/api/admin/_scripts/setupBigDeansStations.cfm
@@ -8,19 +8,19 @@ response = { "OK": false };
 
 try {
     // Check if Big Dean's already has stations
-    existing = queryExecute("
+    existing = queryTimed("
         SELECT COUNT(*) as cnt FROM Stations WHERE BusinessID = :bizId
     ", { bizId: businessId });
 
     if (existing.cnt == 0) {
         // Insert Kitchen station
-        queryExecute("
+        queryTimed("
             INSERT INTO Stations (BusinessID, Name, Color, SortOrder, IsActive)
             VALUES (:bizId, 'Kitchen', :color1, 1, 1)
         ", { bizId: businessId, color1: "##FF5722" });
 
         // Insert Bar station
-        queryExecute("
+        queryTimed("
             INSERT INTO Stations (BusinessID, Name, Color, SortOrder, IsActive)
             VALUES (:bizId, 'Bar', :color2, 2, 1)
         ", { bizId: businessId, color2: "##2196F3" });
@@ -31,7 +31,7 @@ try {
     }
 
     // Get current stations
-    stations = queryExecute("
+    stations = queryTimed("
         SELECT ID, Name, Color, SortOrder
         FROM Stations
         WHERE BusinessID = :bizId AND IsActive = 1
diff --git a/api/admin/_scripts/setupLazyDaisyBeacons.cfm b/api/admin/_scripts/setupLazyDaisyBeacons.cfm
index 578d08d..278b583 100644
--- a/api/admin/_scripts/setupLazyDaisyBeacons.cfm
+++ b/api/admin/_scripts/setupLazyDaisyBeacons.cfm
@@ -9,21 +9,21 @@ try {
     lazyDaisyID = 37;
 
     // Get all beacons
-    qBeacons = queryExecute("SELECT ID, UUID FROM Beacons", {}, { datasource: "payfrit" });
+    qBeacons = queryTimed("SELECT ID, UUID FROM Beacons", {}, { datasource: "payfrit" });
     response.steps.append("Found " & qBeacons.recordCount & " beacons");
 
     // Create service point for Table 1 if it doesn't exist
-    qSP = queryExecute("
+    qSP = queryTimed("
         SELECT ID FROM ServicePoints
         WHERE BusinessID = :bizID AND Name = 'Table 1'
     ", { bizID: lazyDaisyID }, { datasource: "payfrit" });
 
     if (qSP.recordCount == 0) {
-        queryExecute("
+        queryTimed("
             INSERT INTO ServicePoints (BusinessID, Name)
             VALUES (:bizID, 'Table 1')
         ", { bizID: lazyDaisyID }, { datasource: "payfrit" });
-        qSP = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+        qSP = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
         servicePointID = qSP.id;
         response.steps.append("Created service point 'Table 1' (ID: " & servicePointID & ")");
     } else {
@@ -36,13 +36,13 @@ try {
         beaconID = qBeacons.ID[i];
 
         // Unassign this beacon from any other service point first
-        queryExecute("
+        queryTimed("
             UPDATE ServicePoints SET BeaconID = NULL, AssignedByUserID = NULL
             WHERE BeaconID = :beaconID
         ", { beaconID: beaconID }, { datasource: "payfrit" });
 
         // Assign beacon to Table 1 service point
-        queryExecute("
+        queryTimed("
             UPDATE ServicePoints SET BeaconID = :beaconID, AssignedByUserID = 1
             WHERE ID = :spID AND BusinessID = :bizID
         ", { beaconID: beaconID, bizID: lazyDaisyID, spID: servicePointID }, { datasource: "payfrit" });
@@ -50,7 +50,7 @@ try {
     }
 
     // Get final status
-    qFinal = queryExecute("
+    qFinal = queryTimed("
         SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
                b.Name AS BeaconName, b.UUID, sp.Name AS ServicePointName,
                biz.Name AS BusinessName
diff --git a/api/admin/_scripts/setupModifierTemplates.cfm b/api/admin/_scripts/setupModifierTemplates.cfm
index 340b872..d15748c 100644
--- a/api/admin/_scripts/setupModifierTemplates.cfm
+++ b/api/admin/_scripts/setupModifierTemplates.cfm
@@ -20,7 +20,7 @@ response = { "OK": false, "steps": [] };
 try {
     // Step 1: Add IsModifierTemplate column if it doesn't exist
     try {
-        queryExecute("
+        queryTimed("
             ALTER TABLE Items ADD COLUMN IsModifierTemplate TINYINT(1) DEFAULT 0
         ", {}, { datasource: "payfrit" });
         arrayAppend(response.steps, "Added IsModifierTemplate column");
@@ -34,7 +34,7 @@ try {
 
     // Step 2: Create lt_ItemID_TemplateItemID table if it doesn't exist
     try {
-        queryExecute("
+        queryTimed("
             CREATE TABLE IF NOT EXISTS lt_ItemID_TemplateItemID (
                 ID INT AUTO_INCREMENT PRIMARY KEY,
                 ItemID INT NOT NULL,
diff --git a/api/admin/_scripts/setupStations.cfm b/api/admin/_scripts/setupStations.cfm
index 1d9af68..31f2b37 100644
--- a/api/admin/_scripts/setupStations.cfm
+++ b/api/admin/_scripts/setupStations.cfm
@@ -10,7 +10,7 @@
 
 <cftry>
   <!--- Create Stations table if it doesn't exist --->
-  <cfset queryExecute("
+  <cfset queryTimed("
     CREATE TABLE IF NOT EXISTS Stations (
       ID INT AUTO_INCREMENT PRIMARY KEY,
       BusinessID INT NOT NULL,
@@ -25,7 +25,7 @@
 
   <!--- Add StationID column to Items table if it doesn't exist --->
   <cftry>
-    <cfset queryExecute("
+    <cfset queryTimed("
       ALTER TABLE Items ADD COLUMN StationID INT DEFAULT NULL
     ", [], { datasource = "payfrit" })>
     <cfset stationColumnAdded = true>
@@ -38,7 +38,7 @@
   <!--- Add foreign key if column was just added --->
   <cfif stationColumnAdded>
     <cftry>
-      <cfset queryExecute("
+      <cfset queryTimed("
         ALTER TABLE Items ADD FOREIGN KEY (StationID) REFERENCES Stations(ID)
       ", [], { datasource = "payfrit" })>
       <cfcatch></cfcatch>
@@ -46,12 +46,12 @@
   </cfif>
 
   <!--- Create some default stations for business 1 (In and Out Burger) if none exist --->
-  <cfset qCheck = queryExecute("
+  <cfset qCheck = queryTimed("
     SELECT COUNT(*) AS cnt FROM Stations WHERE BusinessID = 1
   ", [], { datasource = "payfrit" })>
 
   <cfif qCheck.cnt EQ 0>
-    <cfset queryExecute("
+    <cfset queryTimed("
       INSERT INTO Stations (BusinessID, Name, Color, SortOrder) VALUES
       (1, 'Grill', '##FF5722', 1),
       (1, 'Fry', '##FFC107', 2),
diff --git a/api/admin/_scripts/switchBeacons.cfm b/api/admin/_scripts/switchBeacons.cfm
index eb54e03..6b1b904 100644
--- a/api/admin/_scripts/switchBeacons.cfm
+++ b/api/admin/_scripts/switchBeacons.cfm
@@ -9,27 +9,27 @@ fromBiz = 17;  // In-N-Out
 toBiz = 27;    // Big Dean's
 
 // Remove mapping for source business
-queryExecute("
+queryTimed("
     DELETE FROM lt_BeaconsID_BusinessesID
     WHERE BusinessID = :fromBiz
 ", { fromBiz: fromBiz }, { datasource: "payfrit" });
 
 // Add mapping for target business (for beacons owned by source)
-queryExecute("
+queryTimed("
     INSERT INTO lt_BeaconsID_BusinessesID (BeaconID, BusinessID)
     SELECT ID, :toBiz FROM Beacons WHERE BusinessID = :fromBiz
     ON DUPLICATE KEY UPDATE ID = ID
 ", { toBiz: toBiz, fromBiz: fromBiz }, { datasource: "payfrit" });
 
 // Clear ServicePoints.BeaconID for source business (no longer valid)
-queryExecute("
+queryTimed("
     UPDATE ServicePoints
     SET BeaconID = NULL, AssignedByUserID = NULL
     WHERE BusinessID = :fromBiz AND BeaconID IS NOT NULL
 ", { fromBiz: fromBiz }, { datasource: "payfrit" });
 
 // Get current state
-q = queryExecute("
+q = queryTimed("
     SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
            b.Name AS BeaconName, biz.Name AS BusinessName,
            sp.Name AS ServicePointName
diff --git a/api/admin/_scripts/testTaskInsert.cfm b/api/admin/_scripts/testTaskInsert.cfm
index 3784189..7c6991f 100644
--- a/api/admin/_scripts/testTaskInsert.cfm
+++ b/api/admin/_scripts/testTaskInsert.cfm
@@ -4,7 +4,7 @@
 
 <cfset result = {}>
 <cftry>
-  <cfset queryExecute(
+  <cfset queryTimed(
     "
       INSERT INTO Tasks (
         BusinessID,
@@ -22,7 +22,7 @@
     { datasource = "payfrit" }
   )>
 
-  <cfset qCount = queryExecute("SELECT COUNT(*) AS cnt FROM Tasks", [], { datasource = "payfrit" })>
+  <cfset qCount = queryTimed("SELECT COUNT(*) AS cnt FROM Tasks", [], { datasource = "payfrit" })>
 
   <cfset result = {
     "OK": true,
diff --git a/api/admin/_scripts/testTaskType.cfm b/api/admin/_scripts/testTaskType.cfm
index b124247..71836c7 100644
--- a/api/admin/_scripts/testTaskType.cfm
+++ b/api/admin/_scripts/testTaskType.cfm
@@ -1,7 +1,7 @@
 <cfsetting showdebugoutput="false">
 <cfcontent type="application/json; charset=utf-8" reset="true">
 <cfscript>
-qTask = queryExecute("
+qTask = queryTimed("
     SELECT ID, TaskTypeID, ClaimedByUserID, CompletedOn
     FROM Tasks
     WHERE ID = 57
diff --git a/api/admin/_scripts/updateBeaconMapping.cfm b/api/admin/_scripts/updateBeaconMapping.cfm
index 5c5221a..b989646 100644
--- a/api/admin/_scripts/updateBeaconMapping.cfm
+++ b/api/admin/_scripts/updateBeaconMapping.cfm
@@ -9,27 +9,27 @@ oldBusinessId = 37;  // previous mapping
 newBusinessId = 17;
 
 // Remove old mapping
-queryExecute("
+queryTimed("
     DELETE FROM lt_BeaconsID_BusinessesID
     WHERE BeaconID = :beaconId AND BusinessID = :oldBizId
 ", { beaconId: beaconId, oldBizId: oldBusinessId }, { datasource: "payfrit" });
 
 // Add new mapping
-queryExecute("
+queryTimed("
     INSERT INTO lt_BeaconsID_BusinessesID (BeaconID, BusinessID)
     VALUES (:beaconId, :newBizId)
     ON DUPLICATE KEY UPDATE ID = ID
 ", { beaconId: beaconId, newBizId: newBusinessId }, { datasource: "payfrit" });
 
 // Clear ServicePoints.BeaconID for old business where this beacon was assigned
-queryExecute("
+queryTimed("
     UPDATE ServicePoints
     SET BeaconID = NULL, AssignedByUserID = NULL
     WHERE BeaconID = :beaconId AND BusinessID = :oldBizId
 ", { beaconId: beaconId, oldBizId: oldBusinessId }, { datasource: "payfrit" });
 
 // Get current state
-q = queryExecute("
+q = queryTimed("
     SELECT
         b.ID AS BeaconID,
         b.UUID,
diff --git a/api/admin/_scripts/updateBigDeans.cfm b/api/admin/_scripts/updateBigDeans.cfm
index 94558bb..f14641c 100644
--- a/api/admin/_scripts/updateBigDeans.cfm
+++ b/api/admin/_scripts/updateBigDeans.cfm
@@ -12,7 +12,7 @@ hours = "Mon-Thu: 11am-10pm, Fri-Sat: 11am-11pm, Sun: 11am-10pm";
 
 try {
     // Update phone and hours on Businesses table
-    queryExecute("
+    queryTimed("
         UPDATE Businesses
         SET Phone = :phone,
             Hours = :hours
@@ -24,14 +24,14 @@ try {
     }, { datasource: "payfrit" });
 
     // Update or insert address in Addresses table
-    qAddr = queryExecute("
+    qAddr = queryTimed("
         SELECT ID FROM Addresses
         WHERE BusinessID = :bizId AND IsDeleted = 0
         LIMIT 1
     ", { bizId: businessId }, { datasource: "payfrit" });
 
     if (qAddr.recordCount > 0) {
-        queryExecute("
+        queryTimed("
             UPDATE Addresses
             SET Line1 = :line1, City = :city, ZIPCode = :zip
             WHERE ID = :addrId
@@ -42,7 +42,7 @@ try {
             addrId: qAddr.ID
         }, { datasource: "payfrit" });
     } else {
-        queryExecute("
+        queryTimed("
             INSERT INTO Addresses (BusinessID, UserID, AddressTypeID, Line1, City, ZIPCode, AddedOn)
             VALUES (:bizId, 0, 'business', :line1, :city, :zip, NOW())
         ", {
@@ -54,7 +54,7 @@ try {
     }
 
     // Get updated record
-    updated = queryExecute("
+    updated = queryTimed("
         SELECT ID, Name, Phone, Hours
         FROM Businesses
         WHERE ID = :bizId
diff --git a/api/admin/perf-dashboard.cfm b/api/admin/perf-dashboard.cfm
new file mode 100644
index 0000000..61469fc
--- /dev/null
+++ b/api/admin/perf-dashboard.cfm
@@ -0,0 +1,313 @@
+<cfsetting showdebugoutput="false">
+<cfsetting enablecfoutputonly="false">
+<cfscript>
+// Localhost-only protection
+remoteAddr = cgi.REMOTE_ADDR;
+if (remoteAddr != "127.0.0.1" && remoteAddr != "::1" && remoteAddr != "0:0:0:0:0:0:0:1" && remoteAddr != "10.10.0.2") {
+  writeOutput("Forbidden"); abort;
+}
+</cfscript>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>API Performance Dashboard</title>
+<style>
+  * { box-sizing: border-box; margin: 0; padding: 0; }
+  body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif; background: #0f1117; color: #e1e4e8; padding: 20px; }
+  h1 { font-size: 22px; font-weight: 600; margin-bottom: 16px; color: #fff; }
+  .controls { display: flex; gap: 10px; margin-bottom: 20px; align-items: center; flex-wrap: wrap; }
+  .controls label { font-size: 13px; color: #8b949e; }
+  .controls select, .controls input { background: #1c1f26; border: 1px solid #30363d; color: #e1e4e8; padding: 6px 10px; border-radius: 6px; font-size: 13px; }
+  .controls button { background: #238636; color: #fff; border: none; padding: 6px 16px; border-radius: 6px; font-size: 13px; cursor: pointer; font-weight: 500; }
+  .controls button:hover { background: #2ea043; }
+  .controls button.secondary { background: #30363d; }
+  .controls button.secondary:hover { background: #3d444d; }
+
+  .summary-cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); gap: 12px; margin-bottom: 24px; }
+  .card { background: #1c1f26; border: 1px solid #30363d; border-radius: 8px; padding: 16px; }
+  .card .label { font-size: 11px; color: #8b949e; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 4px; }
+  .card .value { font-size: 28px; font-weight: 700; color: #fff; }
+  .card .unit { font-size: 13px; color: #8b949e; font-weight: 400; }
+  .card .sub { font-size: 13px; color: #8b949e; font-weight: 400; }
+
+  .section { margin-bottom: 28px; }
+  .section h2 { font-size: 15px; font-weight: 600; margin-bottom: 10px; color: #c9d1d9; display: flex; align-items: center; gap: 8px; }
+  .section h2 .badge { background: #30363d; padding: 2px 8px; border-radius: 10px; font-size: 11px; font-weight: 500; color: #8b949e; }
+
+  table { width: 100%; border-collapse: collapse; font-size: 13px; }
+  thead th { text-align: left; padding: 8px 12px; border-bottom: 1px solid #30363d; color: #8b949e; font-weight: 500; font-size: 11px; text-transform: uppercase; letter-spacing: 0.5px; white-space: nowrap; }
+  thead th.num { text-align: right; }
+  tbody td { padding: 8px 12px; border-bottom: 1px solid #1c1f26; }
+  tbody td.num { text-align: right; font-variant-numeric: tabular-nums; }
+  tbody tr:hover { background: #1c1f26; }
+  tbody td.endpoint { font-family: 'SF Mono', 'Fira Code', monospace; font-size: 12px; color: #58a6ff; }
+
+  .bar-cell { position: relative; }
+  .bar-bg { position: absolute; left: 0; top: 2px; bottom: 2px; border-radius: 3px; opacity: 0.15; }
+  .bar-db { background: #f0883e; }
+  .bar-app { background: #58a6ff; }
+  .bar-wrap { display: flex; height: 18px; border-radius: 3px; overflow: hidden; min-width: 80px; }
+  .bar-seg-db { background: #f0883e; height: 100%; }
+  .bar-seg-app { background: #58a6ff; height: 100%; }
+
+  .legend { display: flex; gap: 16px; font-size: 11px; color: #8b949e; margin-bottom: 12px; }
+  .legend span { display: flex; align-items: center; gap: 4px; }
+  .legend .dot { width: 10px; height: 10px; border-radius: 2px; }
+  .legend .dot.db { background: #f0883e; }
+  .legend .dot.app { background: #58a6ff; }
+
+  .status { padding: 8px 12px; background: #1c1f26; border-radius: 6px; font-size: 12px; color: #8b949e; margin-bottom: 16px; }
+  .status.error { border: 1px solid #da3633; color: #f85149; }
+  .status.loading { border: 1px solid #30363d; }
+
+  .tag { display: inline-block; padding: 1px 6px; border-radius: 4px; font-size: 11px; font-weight: 500; }
+  .tag.fast { background: #23863620; color: #3fb950; }
+  .tag.ok { background: #d29b0020; color: #d29922; }
+  .tag.slow { background: #da363320; color: #f85149; }
+
+  .auto-refresh { display: flex; align-items: center; gap: 6px; margin-left: auto; }
+  .auto-refresh input[type=checkbox] { accent-color: #238636; }
+  .timestamp { font-size: 11px; color: #484f58; }
+</style>
+</head>
+<body>
+
+<h1>API Performance Dashboard</h1>
+
+<div class="controls">
+  <label>Time range:
+    <select id="hours">
+      <option value="1">Last 1 hour</option>
+      <option value="6">Last 6 hours</option>
+      <option value="24" selected>Last 24 hours</option>
+      <option value="72">Last 3 days</option>
+      <option value="168">Last 7 days</option>
+      <option value="720">Last 30 days</option>
+    </select>
+  </label>
+  <label>Rows:
+    <input type="number" id="limit" value="20" min="5" max="100" style="width:60px">
+  </label>
+  <button onclick="loadAll()">Refresh</button>
+  <div class="auto-refresh">
+    <input type="checkbox" id="autoRefresh">
+    <label for="autoRefresh" style="font-size:12px;color:#8b949e;cursor:pointer">Auto-refresh 30s</label>
+  </div>
+  <span class="timestamp" id="lastUpdated"></span>
+</div>
+
+<div id="status" class="status loading">Loading...</div>
+
+<div id="summarySection" class="section" style="display:none">
+  <div class="summary-cards" id="summaryCards"></div>
+</div>
+
+<div class="legend">
+  <span><span class="dot db"></span> DB time</span>
+  <span><span class="dot app"></span> App time</span>
+</div>
+
+<div id="countSection" class="section" style="display:none">
+  <h2>Top Endpoints by Volume <span class="badge" id="countBadge"></span></h2>
+  <div style="overflow-x:auto"><table id="countTable"><thead></thead><tbody></tbody></table></div>
+</div>
+
+<div id="latencySection" class="section" style="display:none">
+  <h2>Top Endpoints by Latency <span class="badge" id="latencyBadge"></span></h2>
+  <div style="overflow-x:auto"><table id="latencyTable"><thead></thead><tbody></tbody></table></div>
+</div>
+
+<div id="slowSection" class="section" style="display:none">
+  <h2>Slowest Individual Requests <span class="badge" id="slowBadge"></span></h2>
+  <div style="overflow-x:auto"><table id="slowTable"><thead></thead><tbody></tbody></table></div>
+</div>
+
+<script>
+const API = 'perf.cfm';
+let refreshTimer = null;
+
+function qs(s) { return document.querySelector(s); }
+function fmt(n) { return n == null ? '-' : Number(n).toLocaleString(); }
+function fmtDate(s) {
+  if (!s || s === 'none') return 'none';
+  var d = new Date(s.replace(' ', 'T'));
+  if (isNaN(d)) return s;
+  var mo = d.getMonth() + 1, dy = d.getDate(), yr = String(d.getFullYear()).slice(-2);
+  var h = d.getHours(), mi = String(d.getMinutes()).padStart(2, '0'), ap = h >= 12 ? 'p' : 'a';
+  h = h % 12 || 12;
+  return { date: mo + '/' + dy + '/' + yr, time: h + ':' + mi + ap };
+}
+function fmtMs(n) {
+  if (n == null) return '-';
+  n = Number(n);
+  if (n < 100) return '<span class="tag fast">' + n + 'ms</span>';
+  if (n < 500) return '<span class="tag ok">' + n + 'ms</span>';
+  return '<span class="tag slow">' + n + 'ms</span>';
+}
+function fmtBytes(n) {
+  if (!n) return '-';
+  n = Number(n);
+  if (n < 1024) return n + ' B';
+  if (n < 1048576) return (n / 1024).toFixed(1) + ' KB';
+  return (n / 1048576).toFixed(1) + ' MB';
+}
+function pct(part, total) { return total > 0 ? Math.round(part / total * 100) : 0; }
+
+function timeBar(dbMs, appMs) {
+  var total = (dbMs || 0) + (appMs || 0);
+  if (total === 0) return '';
+  var dbPct = pct(dbMs, total);
+  var appPct = 100 - dbPct;
+  return '<div class="bar-wrap" title="DB: ' + dbMs + 'ms / App: ' + appMs + 'ms">'
+    + '<div class="bar-seg-db" style="width:' + dbPct + '%"></div>'
+    + '<div class="bar-seg-app" style="width:' + appPct + '%"></div>'
+    + '</div>';
+}
+
+function endpointName(ep) {
+  return ep.replace(/^\/api\//, '');
+}
+
+async function fetchView(view) {
+  var h = qs('#hours').value;
+  var l = qs('#limit').value;
+  var r = await fetch(API + '?view=' + view + '&hours=' + h + '&limit=' + l);
+  return r.json();
+}
+
+async function loadAll() {
+  qs('#status').className = 'status loading';
+  qs('#status').textContent = 'Loading...';
+  qs('#status').style.display = '';
+
+  try {
+    var [summary, count, latency, slow] = await Promise.all([
+      fetchView('summary'), fetchView('count'), fetchView('latency'), fetchView('slow')
+    ]);
+
+    if (!summary.OK) throw new Error(summary.MESSAGE || summary.ERROR);
+
+    qs('#status').style.display = 'none';
+
+    // Summary cards
+    var s = summary.DATA;
+    qs('#summaryCards').innerHTML =
+      card('Total Requests', fmt(s.TotalRequests), '') +
+      card('Unique Endpoints', fmt(s.UniqueEndpoints), '') +
+      card('Avg Latency', s.OverallAvgMs || 0, 'ms') +
+      card('Max Latency', s.OverallMaxMs || 0, 'ms') +
+      card('Avg DB Time', s.OverallAvgDbMs || 0, 'ms') +
+      card('Avg App Time', s.OverallAvgAppMs || 0, 'ms') +
+      card('Avg Queries', s.OverallAvgQueries || 0, '/req') +
+      cardDate('Data Since', fmtDate(s.FirstLog));
+    qs('#summarySection').style.display = '';
+
+    // Count table
+    renderCountTable(count.DATA || []);
+
+    // Latency table
+    renderLatencyTable(latency.DATA || []);
+
+    // Slow table
+    renderSlowTable(slow.DATA || []);
+
+    qs('#lastUpdated').textContent = 'Updated ' + new Date().toLocaleTimeString();
+
+  } catch (e) {
+    qs('#status').className = 'status error';
+    qs('#status').textContent = 'Error: ' + e.message;
+    qs('#status').style.display = '';
+  }
+}
+
+function card(label, value, unit) {
+  return '<div class="card"><div class="label">' + label + '</div><div class="value">' + value + ' <span class="unit">' + unit + '</span></div></div>';
+}
+function cardDate(label, dt) {
+  if (!dt || !dt.date) return card(label, 'none', '');
+  return '<div class="card"><div class="label">' + label + '</div><div class="value">' + dt.date + '</div><div class="sub">' + dt.time + '</div></div>';
+}
+
+function renderCountTable(data) {
+  if (!data.length) { qs('#countSection').style.display = 'none'; return; }
+  qs('#countBadge').textContent = data.length + ' endpoints';
+  var maxCalls = Math.max(...data.map(r => r.Calls));
+  var html = '<thead><tr><th>Endpoint</th><th class="num">Calls</th><th class="num">Avg</th><th class="num">DB</th><th class="num">App</th><th>DB / App Split</th><th class="num">Max</th><th class="num">Queries</th><th class="num">Avg Size</th></tr></thead><tbody>';
+  data.forEach(function(r) {
+    html += '<tr>'
+      + '<td class="endpoint">' + endpointName(r.Endpoint) + '</td>'
+      + '<td class="num">' + fmt(r.Calls) + '</td>'
+      + '<td class="num">' + fmtMs(r.AvgMs) + '</td>'
+      + '<td class="num">' + fmt(r.AvgDbMs) + 'ms</td>'
+      + '<td class="num">' + fmt(r.AvgAppMs) + 'ms</td>'
+      + '<td>' + timeBar(r.AvgDbMs, r.AvgAppMs) + '</td>'
+      + '<td class="num">' + fmtMs(r.MaxMs) + '</td>'
+      + '<td class="num">' + r.AvgQueries + '</td>'
+      + '<td class="num">' + fmtBytes(r.AvgBytes) + '</td>'
+      + '</tr>';
+  });
+  html += '</tbody>';
+  qs('#countTable').innerHTML = html;
+  qs('#countSection').style.display = '';
+}
+
+function renderLatencyTable(data) {
+  if (!data.length) { qs('#latencySection').style.display = 'none'; return; }
+  qs('#latencyBadge').textContent = data.length + ' endpoints';
+  var html = '<thead><tr><th>Endpoint</th><th class="num">Calls</th><th class="num">Avg</th><th class="num">DB</th><th class="num">App</th><th>DB / App Split</th><th class="num">Max</th><th class="num">Queries</th></tr></thead><tbody>';
+  data.forEach(function(r) {
+    html += '<tr>'
+      + '<td class="endpoint">' + endpointName(r.Endpoint) + '</td>'
+      + '<td class="num">' + fmt(r.Calls) + '</td>'
+      + '<td class="num">' + fmtMs(r.AvgMs) + '</td>'
+      + '<td class="num">' + fmt(r.AvgDbMs) + 'ms</td>'
+      + '<td class="num">' + fmt(r.AvgAppMs) + 'ms</td>'
+      + '<td>' + timeBar(r.AvgDbMs, r.AvgAppMs) + '</td>'
+      + '<td class="num">' + fmtMs(r.MaxMs) + '</td>'
+      + '<td class="num">' + r.AvgQueries + '</td>'
+      + '</tr>';
+  });
+  html += '</tbody>';
+  qs('#latencyTable').innerHTML = html;
+  qs('#latencySection').style.display = '';
+}
+
+function renderSlowTable(data) {
+  if (!data.length) { qs('#slowSection').style.display = 'none'; return; }
+  qs('#slowBadge').textContent = data.length + ' requests';
+  var html = '<thead><tr><th>Endpoint</th><th class="num">Total</th><th class="num">DB</th><th class="num">App</th><th>DB / App Split</th><th class="num">Queries</th><th class="num">Size</th><th class="num">Biz</th><th>When</th></tr></thead><tbody>';
+  data.forEach(function(r) {
+    html += '<tr>'
+      + '<td class="endpoint">' + endpointName(r.Endpoint) + '</td>'
+      + '<td class="num">' + fmtMs(r.TotalMs) + '</td>'
+      + '<td class="num">' + fmt(r.DbMs) + 'ms</td>'
+      + '<td class="num">' + fmt(r.AppMs) + 'ms</td>'
+      + '<td>' + timeBar(r.DbMs, r.AppMs) + '</td>'
+      + '<td class="num">' + r.QueryCount + '</td>'
+      + '<td class="num">' + fmtBytes(r.ResponseBytes) + '</td>'
+      + '<td class="num">' + (r.BusinessID || '-') + '</td>'
+      + '<td style="font-size:11px;color:#8b949e;white-space:nowrap">' + (r.LoggedAt || '') + '</td>'
+      + '</tr>';
+  });
+  html += '</tbody>';
+  qs('#slowTable').innerHTML = html;
+  qs('#slowSection').style.display = '';
+}
+
+// Auto-refresh
+qs('#autoRefresh').addEventListener('change', function() {
+  if (this.checked) {
+    refreshTimer = setInterval(loadAll, 30000);
+  } else {
+    clearInterval(refreshTimer);
+    refreshTimer = null;
+  }
+});
+
+// Load on page open
+loadAll();
+</script>
+</body>
+</html>
diff --git a/api/admin/perf.cfm b/api/admin/perf.cfm
new file mode 100644
index 0000000..5c094fd
--- /dev/null
+++ b/api/admin/perf.cfm
@@ -0,0 +1,179 @@
+<cfsetting showdebugoutput="false">
+<cfsetting enablecfoutputonly="true">
+<cfcontent type="application/json; charset=utf-8" reset="true">
+<cfheader name="Cache-Control" value="no-store">
+
+<cfscript>
+function apiAbort(payload) {
+  writeOutput(serializeJSON(payload));
+  abort;
+}
+
+// Localhost-only protection
+remoteAddr = cgi.REMOTE_ADDR;
+if (remoteAddr != "127.0.0.1" && remoteAddr != "::1" && remoteAddr != "0:0:0:0:0:0:0:1" && remoteAddr != "10.10.0.2") {
+  apiAbort({ "OK": false, "ERROR": "forbidden" });
+}
+
+try {
+  // Parse parameters
+  view = structKeyExists(url, "view") ? lcase(url.view) : "count";
+  hours = structKeyExists(url, "hours") ? val(url.hours) : 24;
+  if (hours <= 0 || hours > 720) hours = 24;
+  limitRows = structKeyExists(url, "limit") ? val(url.limit) : 20;
+  if (limitRows <= 0 || limitRows > 100) limitRows = 20;
+
+  // Flush any buffered metrics first
+  flushPerfBuffer();
+
+  response = { "OK": true, "VIEW": view, "HOURS": hours };
+
+  if (view == "count") {
+    // Top endpoints by call count
+    q = queryExecute("
+      SELECT
+        Endpoint,
+        COUNT(*) as Calls,
+        ROUND(AVG(TotalMs)) as AvgMs,
+        ROUND(AVG(DbMs)) as AvgDbMs,
+        ROUND(AVG(AppMs)) as AvgAppMs,
+        MAX(TotalMs) as MaxMs,
+        ROUND(AVG(QueryCount), 1) as AvgQueries,
+        ROUND(AVG(ResponseBytes)) as AvgBytes
+      FROM ApiPerfLogs
+      WHERE LoggedAt > DATE_SUB(NOW(), INTERVAL :hours HOUR)
+      GROUP BY Endpoint
+      ORDER BY Calls DESC
+      LIMIT :lim
+    ", {
+      hours: { value: hours, cfsqltype: "cf_sql_integer" },
+      lim: { value: limitRows, cfsqltype: "cf_sql_integer" }
+    }, { datasource: "payfrit" });
+
+    rows = [];
+    for (row in q) {
+      arrayAppend(rows, {
+        "Endpoint": row.Endpoint,
+        "Calls": row.Calls,
+        "AvgMs": row.AvgMs,
+        "AvgDbMs": row.AvgDbMs,
+        "AvgAppMs": row.AvgAppMs,
+        "MaxMs": row.MaxMs,
+        "AvgQueries": row.AvgQueries,
+        "AvgBytes": row.AvgBytes
+      });
+    }
+    response["DATA"] = rows;
+
+  } else if (view == "latency") {
+    // Top endpoints by average latency
+    q = queryExecute("
+      SELECT
+        Endpoint,
+        COUNT(*) as Calls,
+        ROUND(AVG(TotalMs)) as AvgMs,
+        ROUND(AVG(DbMs)) as AvgDbMs,
+        ROUND(AVG(AppMs)) as AvgAppMs,
+        MAX(TotalMs) as MaxMs,
+        ROUND(AVG(QueryCount), 1) as AvgQueries
+      FROM ApiPerfLogs
+      WHERE LoggedAt > DATE_SUB(NOW(), INTERVAL :hours HOUR)
+      GROUP BY Endpoint
+      HAVING Calls >= 3
+      ORDER BY AvgMs DESC
+      LIMIT :lim
+    ", {
+      hours: { value: hours, cfsqltype: "cf_sql_integer" },
+      lim: { value: limitRows, cfsqltype: "cf_sql_integer" }
+    }, { datasource: "payfrit" });
+
+    rows = [];
+    for (row in q) {
+      arrayAppend(rows, {
+        "Endpoint": row.Endpoint,
+        "Calls": row.Calls,
+        "AvgMs": row.AvgMs,
+        "AvgDbMs": row.AvgDbMs,
+        "AvgAppMs": row.AvgAppMs,
+        "MaxMs": row.MaxMs,
+        "AvgQueries": row.AvgQueries
+      });
+    }
+    response["DATA"] = rows;
+
+  } else if (view == "slow") {
+    // Slowest individual requests
+    q = queryExecute("
+      SELECT Endpoint, TotalMs, DbMs, AppMs, QueryCount, ResponseBytes,
+             BusinessID, UserID, LoggedAt
+      FROM ApiPerfLogs
+      WHERE LoggedAt > DATE_SUB(NOW(), INTERVAL :hours HOUR)
+      ORDER BY TotalMs DESC
+      LIMIT :lim
+    ", {
+      hours: { value: hours, cfsqltype: "cf_sql_integer" },
+      lim: { value: limitRows, cfsqltype: "cf_sql_integer" }
+    }, { datasource: "payfrit" });
+
+    rows = [];
+    for (row in q) {
+      arrayAppend(rows, {
+        "Endpoint": row.Endpoint,
+        "TotalMs": row.TotalMs,
+        "DbMs": row.DbMs,
+        "AppMs": row.AppMs,
+        "QueryCount": row.QueryCount,
+        "ResponseBytes": row.ResponseBytes,
+        "BusinessID": row.BusinessID,
+        "UserID": row.UserID,
+        "LoggedAt": dateTimeFormat(row.LoggedAt, "yyyy-mm-dd HH:nn:ss")
+      });
+    }
+    response["DATA"] = rows;
+
+  } else if (view == "summary") {
+    // Overall summary stats
+    q = queryExecute("
+      SELECT
+        COUNT(*) as TotalRequests,
+        COUNT(DISTINCT Endpoint) as UniqueEndpoints,
+        ROUND(AVG(TotalMs)) as OverallAvgMs,
+        MAX(TotalMs) as OverallMaxMs,
+        ROUND(AVG(DbMs)) as OverallAvgDbMs,
+        ROUND(AVG(AppMs)) as OverallAvgAppMs,
+        ROUND(AVG(QueryCount), 1) as OverallAvgQueries,
+        MIN(LoggedAt) as FirstLog,
+        MAX(LoggedAt) as LastLog
+      FROM ApiPerfLogs
+      WHERE LoggedAt > DATE_SUB(NOW(), INTERVAL :hours HOUR)
+    ", {
+      hours: { value: hours, cfsqltype: "cf_sql_integer" }
+    }, { datasource: "payfrit" });
+
+    response["DATA"] = {
+      "TotalRequests": q.TotalRequests,
+      "UniqueEndpoints": q.UniqueEndpoints,
+      "OverallAvgMs": q.OverallAvgMs,
+      "OverallMaxMs": q.OverallMaxMs,
+      "OverallAvgDbMs": q.OverallAvgDbMs,
+      "OverallAvgAppMs": q.OverallAvgAppMs,
+      "OverallAvgQueries": q.OverallAvgQueries,
+      "FirstLog": isDate(q.FirstLog) ? dateTimeFormat(q.FirstLog, "yyyy-mm-dd HH:nn:ss") : "",
+      "LastLog": isDate(q.LastLog) ? dateTimeFormat(q.LastLog, "yyyy-mm-dd HH:nn:ss") : ""
+    };
+
+  } else {
+    apiAbort({ "OK": false, "ERROR": "invalid_view", "MESSAGE": "Use ?view=count|latency|slow|summary" });
+  }
+
+  apiAbort(response);
+
+} catch (any e) {
+  apiAbort({
+    "OK": false,
+    "ERROR": "server_error",
+    "MESSAGE": e.message,
+    "DETAIL": e.detail
+  });
+}
+</cfscript>
diff --git a/api/admin/quickTasks/addTypeIdColumn.cfm b/api/admin/quickTasks/addTypeIdColumn.cfm
index fdb72fb..6e299d3 100644
--- a/api/admin/quickTasks/addTypeIdColumn.cfm
+++ b/api/admin/quickTasks/addTypeIdColumn.cfm
@@ -5,7 +5,7 @@
 // Add TaskTypeID column to QuickTaskTemplates table if it doesn't exist
 try {
     // Check if column exists
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
         WHERE TABLE_SCHEMA = 'payfrit'
           AND TABLE_NAME = 'QuickTaskTemplates'
@@ -13,7 +13,7 @@ try {
     ", [], { datasource: "payfrit" });
 
     if (qCheck.recordCount == 0) {
-        queryExecute("
+        queryTimed("
             ALTER TABLE QuickTaskTemplates
             ADD COLUMN TaskTypeID INT NULL AFTER TaskCategoryID
         ", [], { datasource: "payfrit" });
diff --git a/api/admin/quickTasks/cleanup.cfm b/api/admin/quickTasks/cleanup.cfm
index fb2add7..5867378 100644
--- a/api/admin/quickTasks/cleanup.cfm
+++ b/api/admin/quickTasks/cleanup.cfm
@@ -6,7 +6,7 @@
 // One-time cleanup: delete test tasks and reset
 try {
     // Delete tasks 30, 31, 32 (test tasks with bad data)
-    queryExecute("DELETE FROM Tasks WHERE ID IN (30, 31, 32)", [], { datasource: "payfrit" });
+    queryTimed("DELETE FROM Tasks WHERE ID IN (30, 31, 32)", [], { datasource: "payfrit" });
 
     writeOutput(serializeJSON({
         "OK": true,
diff --git a/api/admin/quickTasks/create.cfm b/api/admin/quickTasks/create.cfm
index 82ce682..7ad3c81 100644
--- a/api/admin/quickTasks/create.cfm
+++ b/api/admin/quickTasks/create.cfm
@@ -48,7 +48,7 @@ try {
     }
 
     // Get template details
-    qTemplate = queryExecute("
+    qTemplate = queryTimed("
         SELECT
             Title as Title,
             Details as Details,
@@ -67,7 +67,7 @@ try {
     }
 
     // Create the task (ClaimedByUserID=0 means unclaimed/pending)
-    queryExecute("
+    queryTimed("
         INSERT INTO Tasks (
             BusinessID, CategoryID, TaskTypeID,
             Title, Details, CreatedOn, ClaimedByUserID
@@ -83,7 +83,7 @@ try {
         details: { value: qTemplate.Details, cfsqltype: "cf_sql_longvarchar", null: isNull(qTemplate.Details) }
     }, { datasource: "payfrit" });
 
-    qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+    qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
 
     apiAbort({
         "OK": true,
diff --git a/api/admin/quickTasks/debug.cfm b/api/admin/quickTasks/debug.cfm
index d4a936f..fc1ebf4 100644
--- a/api/admin/quickTasks/debug.cfm
+++ b/api/admin/quickTasks/debug.cfm
@@ -4,7 +4,7 @@
 
 <cfscript>
 try {
-    q = queryExecute("
+    q = queryTimed("
         SELECT ID, Title, Details, TaskCategoryID, ClaimedByUserID, CompletedOn, CreatedOn
         FROM Tasks
         WHERE BusinessID = 47
diff --git a/api/admin/quickTasks/delete.cfm b/api/admin/quickTasks/delete.cfm
index 883f3a4..236aa21 100644
--- a/api/admin/quickTasks/delete.cfm
+++ b/api/admin/quickTasks/delete.cfm
@@ -48,7 +48,7 @@ try {
     }
 
     // Verify template exists and belongs to this business
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID FROM QuickTaskTemplates
         WHERE ID = :id AND BusinessID = :businessID
     ", {
@@ -61,7 +61,7 @@ try {
     }
 
     // Soft delete by setting IsActive to 0
-    queryExecute("
+    queryTimed("
         UPDATE QuickTaskTemplates SET IsActive = 0
         WHERE ID = :id
     ", {
diff --git a/api/admin/quickTasks/list.cfm b/api/admin/quickTasks/list.cfm
index ce4254e..9e0f36b 100644
--- a/api/admin/quickTasks/list.cfm
+++ b/api/admin/quickTasks/list.cfm
@@ -43,7 +43,7 @@ try {
     }
 
     // Get quick task templates for this business
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             qt.ID,
             qt.Name as Name,
diff --git a/api/admin/quickTasks/purge.cfm b/api/admin/quickTasks/purge.cfm
index 1240ae2..073e71f 100644
--- a/api/admin/quickTasks/purge.cfm
+++ b/api/admin/quickTasks/purge.cfm
@@ -5,7 +5,7 @@
 <cfscript>
 try {
     // Delete all Quick Task templates for business 1
-    queryExecute("DELETE FROM QuickTaskTemplates WHERE BusinessID = 1", [], { datasource: "payfrit" });
+    queryTimed("DELETE FROM QuickTaskTemplates WHERE BusinessID = 1", [], { datasource: "payfrit" });
 
     writeOutput(serializeJSON({
         "OK": true,
diff --git a/api/admin/quickTasks/save.cfm b/api/admin/quickTasks/save.cfm
index 864c6c2..002f3c3 100644
--- a/api/admin/quickTasks/save.cfm
+++ b/api/admin/quickTasks/save.cfm
@@ -68,7 +68,7 @@ try {
 
     if (templateID > 0) {
         // UPDATE existing template
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT ID FROM QuickTaskTemplates
             WHERE ID = :id AND BusinessID = :businessID
         ", {
@@ -80,7 +80,7 @@ try {
             apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Template not found" });
         }
 
-        queryExecute("
+        queryTimed("
             UPDATE QuickTaskTemplates SET
                 Name = :name,
                 Title = :title,
@@ -108,7 +108,7 @@ try {
     } else {
         // INSERT new template
         // Get next sort order
-        qSort = queryExecute("
+        qSort = queryTimed("
             SELECT COALESCE(MAX(SortOrder), 0) + 1 as nextSort
             FROM QuickTaskTemplates WHERE BusinessID = :businessID
         ", {
@@ -117,7 +117,7 @@ try {
 
         nextSort = qSort.nextSort;
 
-        queryExecute("
+        queryTimed("
             INSERT INTO QuickTaskTemplates (
                 BusinessID, Name, Title,
                 Details, TaskCategoryID,
@@ -136,7 +136,7 @@ try {
             sortOrder: { value: nextSort, cfsqltype: "cf_sql_integer" }
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
 
         apiAbort({
             "OK": true,
diff --git a/api/admin/quickTasks/setup.cfm b/api/admin/quickTasks/setup.cfm
index 9a41840..9ae1d53 100644
--- a/api/admin/quickTasks/setup.cfm
+++ b/api/admin/quickTasks/setup.cfm
@@ -13,7 +13,7 @@ function apiAbort(required struct payload) {
 
 try {
     // Create QuickTaskTemplates table
-    queryExecute("
+    queryTimed("
         CREATE TABLE IF NOT EXISTS QuickTaskTemplates (
             ID INT AUTO_INCREMENT PRIMARY KEY,
             BusinessID INT NOT NULL,
diff --git a/api/admin/scheduledTasks/delete.cfm b/api/admin/scheduledTasks/delete.cfm
index c58e212..cccb08e 100644
--- a/api/admin/scheduledTasks/delete.cfm
+++ b/api/admin/scheduledTasks/delete.cfm
@@ -48,7 +48,7 @@ try {
     }
 
     // Verify exists and belongs to business
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID FROM ScheduledTaskDefinitions
         WHERE ID = :id AND BusinessID = :businessID
     ", {
@@ -61,7 +61,7 @@ try {
     }
 
     // Hard delete the definition
-    queryExecute("
+    queryTimed("
         DELETE FROM ScheduledTaskDefinitions WHERE ID = :id
     ", {
         id: { value: taskID, cfsqltype: "cf_sql_integer" }
diff --git a/api/admin/scheduledTasks/list.cfm b/api/admin/scheduledTasks/list.cfm
index 9c2115b..15448d4 100644
--- a/api/admin/scheduledTasks/list.cfm
+++ b/api/admin/scheduledTasks/list.cfm
@@ -43,7 +43,7 @@ try {
     }
 
     // Get scheduled task definitions for this business
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             st.ID,
             st.Name as Name,
diff --git a/api/admin/scheduledTasks/run.cfm b/api/admin/scheduledTasks/run.cfm
index f6ba38c..8a42f0f 100644
--- a/api/admin/scheduledTasks/run.cfm
+++ b/api/admin/scheduledTasks/run.cfm
@@ -49,7 +49,7 @@ try {
     }
 
     // Get scheduled task definition
-    qDef = queryExecute("
+    qDef = queryTimed("
         SELECT
             Title as Title,
             Details as Details,
@@ -66,7 +66,7 @@ try {
     }
 
     // Create the task (ClaimedByUserID=0 means unclaimed/pending)
-    queryExecute("
+    queryTimed("
         INSERT INTO Tasks (
             BusinessID, CategoryID, TaskTypeID,
             Title, Details, CreatedOn, ClaimedByUserID
@@ -82,7 +82,7 @@ try {
         details: { value: qDef.Details, cfsqltype: "cf_sql_longvarchar", null: isNull(qDef.Details) }
     }, { datasource: "payfrit" });
 
-    qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+    qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
 
     apiAbort({
         "OK": true,
diff --git a/api/admin/scheduledTasks/runDue.cfm b/api/admin/scheduledTasks/runDue.cfm
index 3e9c074..0bd2d19 100644
--- a/api/admin/scheduledTasks/runDue.cfm
+++ b/api/admin/scheduledTasks/runDue.cfm
@@ -65,7 +65,7 @@ function calculateNextRun(required string cronExpression) {
 
 try {
     // Find all active scheduled tasks that are due
-    dueTasks = queryExecute("
+    dueTasks = queryTimed("
         SELECT
             ID AS ScheduledTaskID,
             BusinessID as BusinessID,
@@ -84,7 +84,7 @@ try {
 
     for (task in dueTasks) {
         // Create the actual task (ClaimedByUserID=0 means unclaimed/pending)
-        queryExecute("
+        queryTimed("
             INSERT INTO Tasks (
                 BusinessID, CategoryID, TaskTypeID,
                 Title, Details, CreatedOn, ClaimedByUserID
@@ -100,7 +100,7 @@ try {
             details: { value: task.Details, cfsqltype: "cf_sql_longvarchar", null: isNull(task.Details) }
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
 
         // Calculate next run based on schedule type
         if (task.ScheduleType == "interval_after_completion" && !isNull(task.IntervalMinutes) && task.IntervalMinutes > 0) {
@@ -115,7 +115,7 @@ try {
             nextRun = calculateNextRun(task.CronExpression);
         }
 
-        queryExecute("
+        queryTimed("
             UPDATE ScheduledTaskDefinitions SET
                 LastRunOn = NOW(),
                 NextRunOn = :nextRun
diff --git a/api/admin/scheduledTasks/save.cfm b/api/admin/scheduledTasks/save.cfm
index 8db00e1..f390088 100644
--- a/api/admin/scheduledTasks/save.cfm
+++ b/api/admin/scheduledTasks/save.cfm
@@ -156,7 +156,7 @@ try {
 
     if (taskID > 0) {
         // UPDATE existing
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT ID FROM ScheduledTaskDefinitions
             WHERE ID = :id AND BusinessID = :businessID
         ", {
@@ -168,7 +168,7 @@ try {
             apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Scheduled task not found" });
         }
 
-        queryExecute("
+        queryTimed("
             UPDATE ScheduledTaskDefinitions SET
                 Name = :name,
                 Title = :title,
@@ -202,7 +202,7 @@ try {
 
     } else {
         // INSERT new
-        queryExecute("
+        queryTimed("
             INSERT INTO ScheduledTaskDefinitions (
                 BusinessID, Name, Title,
                 Details, TaskCategoryID,
@@ -224,11 +224,11 @@ try {
             nextRun: { value: nextRunOn, cfsqltype: "cf_sql_timestamp" }
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
         newScheduledTaskID = qNew.newID;
 
         // Create the first task immediately
-        queryExecute("
+        queryTimed("
             INSERT INTO Tasks (
                 BusinessID, CategoryID, TaskTypeID,
                 Title, Details, CreatedOn, ClaimedByUserID
@@ -244,7 +244,7 @@ try {
             details: { value: taskDetails, cfsqltype: "cf_sql_longvarchar", null: !len(taskDetails) }
         }, { datasource: "payfrit" });
 
-        qTask = queryExecute("SELECT LAST_INSERT_ID() as taskID", [], { datasource: "payfrit" });
+        qTask = queryTimed("SELECT LAST_INSERT_ID() as taskID", [], { datasource: "payfrit" });
 
         // Now set the NEXT run time (not the immediate one we just created)
         if (scheduleType == "interval" || scheduleType == "interval_after_completion") {
@@ -260,7 +260,7 @@ try {
             actualNextRun = calculateNextRun(cronExpression);
         }
 
-        queryExecute("
+        queryTimed("
             UPDATE ScheduledTaskDefinitions
             SET LastRunOn = NOW(),
                 NextRunOn = :nextRun
diff --git a/api/admin/scheduledTasks/setup.cfm b/api/admin/scheduledTasks/setup.cfm
index 5408a41..a25d0e2 100644
--- a/api/admin/scheduledTasks/setup.cfm
+++ b/api/admin/scheduledTasks/setup.cfm
@@ -13,7 +13,7 @@ function apiAbort(required struct payload) {
 
 try {
     // Create ScheduledTaskDefinitions table
-    queryExecute("
+    queryTimed("
         CREATE TABLE IF NOT EXISTS ScheduledTaskDefinitions (
             ID INT AUTO_INCREMENT PRIMARY KEY,
             BusinessID INT NOT NULL,
@@ -37,7 +37,7 @@ try {
 
     // Add new columns if they don't exist (for existing tables)
     try {
-        queryExecute("
+        queryTimed("
             ALTER TABLE ScheduledTaskDefinitions
             ADD COLUMN ScheduleType VARCHAR(20) DEFAULT 'cron' AFTER CronExpression
         ", [], { datasource: "payfrit" });
@@ -46,7 +46,7 @@ try {
     }
 
     try {
-        queryExecute("
+        queryTimed("
             ALTER TABLE ScheduledTaskDefinitions
             ADD COLUMN IntervalMinutes INT NULL AFTER ScheduleType
         ", [], { datasource: "payfrit" });
diff --git a/api/admin/scheduledTasks/toggle.cfm b/api/admin/scheduledTasks/toggle.cfm
index e28df84..f72ce7a 100644
--- a/api/admin/scheduledTasks/toggle.cfm
+++ b/api/admin/scheduledTasks/toggle.cfm
@@ -98,7 +98,7 @@ try {
     }
 
     // Verify exists and get cron expression and schedule type
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID, CronExpression as CronExpression,
                COALESCE(ScheduleType, 'cron') as ScheduleType,
                IntervalMinutes as IntervalMinutes
@@ -128,7 +128,7 @@ try {
 
     // Update status
     if (isActive) {
-        queryExecute("
+        queryTimed("
             UPDATE ScheduledTaskDefinitions SET
                 IsActive = :isActive,
                 NextRunOn = :nextRun
@@ -139,7 +139,7 @@ try {
             id: { value: taskID, cfsqltype: "cf_sql_integer" }
         }, { datasource: "payfrit" });
     } else {
-        queryExecute("
+        queryTimed("
             UPDATE ScheduledTaskDefinitions SET IsActive = :isActive
             WHERE ID = :id
         ", {
diff --git a/api/auth/avatar.cfm b/api/auth/avatar.cfm
index 932d954..4b15e31 100644
--- a/api/auth/avatar.cfm
+++ b/api/auth/avatar.cfm
@@ -50,7 +50,7 @@ if (structKeyExists(request, "UserID") && isNumeric(request.UserID) && request.U
 
   if (len(userToken)) {
     try {
-      qTok = queryExecute(
+      qTok = queryTimed(
         "SELECT UserID FROM UserTokens WHERE Token = ? LIMIT 1",
         [ { value = userToken, cfsqltype = "cf_sql_varchar" } ],
         { datasource = "payfrit" }
diff --git a/api/auth/completeProfile.cfm b/api/auth/completeProfile.cfm
index b398a99..537bda3 100644
--- a/api/auth/completeProfile.cfm
+++ b/api/auth/completeProfile.cfm
@@ -70,7 +70,7 @@ try {
     }
 
     // Check if email is already used by another verified account
-    qEmailCheck = queryExecute("
+    qEmailCheck = queryTimed("
         SELECT ID FROM Users
         WHERE EmailAddress = :email
           AND IsEmailVerified = 1
@@ -86,13 +86,13 @@ try {
     }
 
     // Get current user UUID for email confirmation link
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT UUID FROM Users WHERE ID = :userId
     ", { userId: { value: userId, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
 
     // Update user profile AND mark account as verified/active
     // This completes the signup process
-    queryExecute("
+    queryTimed("
         UPDATE Users
         SET FirstName = :firstName,
             LastName = :lastName,
diff --git a/api/auth/login.cfm b/api/auth/login.cfm
index 82bf4a3..3997635 100644
--- a/api/auth/login.cfm
+++ b/api/auth/login.cfm
@@ -53,7 +53,7 @@ if (!len(username) || !len(password)) {
 }
 
 try {
-  q = queryExecute(
+  q = queryTimed(
     "
       SELECT ID, FirstName
       FROM Users
@@ -81,7 +81,7 @@ try {
 
   token = replace(createUUID(), "-", "", "all");
 
-  queryExecute(
+  queryTimed(
     "INSERT INTO UserTokens (UserID, Token) VALUES (?, ?)",
     [
       { value = q.ID, cfsqltype = "cf_sql_integer" },
diff --git a/api/auth/loginOTP.cfm b/api/auth/loginOTP.cfm
index 38b59d7..35cc2fc 100644
--- a/api/auth/loginOTP.cfm
+++ b/api/auth/loginOTP.cfm
@@ -52,7 +52,7 @@ try {
     }
 
     // Find verified account with this phone
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT ID, UUID
         FROM Users
         WHERE ContactNumber = :phone
@@ -68,7 +68,7 @@ try {
     userUUID = qUser.UUID;
     if (!len(trim(userUUID))) {
         userUUID = replace(createUUID(), "-", "", "all");
-        queryExecute("
+        queryTimed("
             UPDATE Users SET UUID = :uuid WHERE ID = :userId
         ", {
             uuid: { value: userUUID, cfsqltype: "cf_sql_varchar" },
@@ -82,7 +82,7 @@ try {
         && structKeyExists(application, "MAGIC_OTP_CODE") && len(application.MAGIC_OTP_CODE)) {
         otp = application.MAGIC_OTP_CODE;
     }
-    queryExecute("
+    queryTimed("
         UPDATE Users
         SET MobileVerifyCode = :otp
         WHERE ID = :userId
diff --git a/api/auth/profile.cfm b/api/auth/profile.cfm
index 6ee50cc..29f1d41 100644
--- a/api/auth/profile.cfm
+++ b/api/auth/profile.cfm
@@ -38,7 +38,7 @@ if (structKeyExists(request, "UserID") && isNumeric(request.UserID) && request.U
   userToken = getHeader("X-User-Token");
   if (len(userToken)) {
     try {
-      qTok = queryExecute(
+      qTok = queryTimed(
         "SELECT UserID FROM UserTokens WHERE Token = ? LIMIT 1",
         [ { value = userToken, cfsqltype = "cf_sql_varchar" } ],
         { datasource = "payfrit" }
@@ -57,7 +57,7 @@ if (userId <= 0) {
 // Handle GET - return profile
 if (cgi.REQUEST_METHOD == "GET") {
   try {
-    qUser = queryExecute("
+    qUser = queryTimed("
       SELECT
         ID,
         FirstName,
@@ -124,14 +124,14 @@ if (cgi.REQUEST_METHOD == "POST") {
     }
 
     // Execute update
-    queryExecute("
+    queryTimed("
       UPDATE Users
       SET #arrayToList(updates, ', ')#
       WHERE ID = :userId
     ", params);
 
     // Return updated profile
-    qUser = queryExecute("
+    qUser = queryTimed("
       SELECT
         ID,
         FirstName,
diff --git a/api/auth/sendLoginOTP.cfm b/api/auth/sendLoginOTP.cfm
index d34d0cc..ae2595a 100644
--- a/api/auth/sendLoginOTP.cfm
+++ b/api/auth/sendLoginOTP.cfm
@@ -37,7 +37,7 @@ genericResponse = { "OK": true, "MESSAGE": "If an account exists, a code has bee
 
 try {
   // Look up user by email
-  qUser = queryExecute("
+  qUser = queryTimed("
     SELECT ID, FirstName
     FROM Users
     WHERE EmailAddress = :email
@@ -56,7 +56,7 @@ try {
   userId = qUser.ID;
 
   // Rate limit: max 3 codes per user in last 10 minutes
-  qRateCheck = queryExecute("
+  qRateCheck = queryTimed("
     SELECT COUNT(*) AS cnt
     FROM OTPCodes
     WHERE UserID = :userId
@@ -81,7 +81,7 @@ try {
   }
 
   // Store in DB with 10-minute expiry
-  queryExecute("
+  queryTimed("
     INSERT INTO OTPCodes (UserID, Code, ExpiresAt)
     VALUES (:userId, :code, DATE_ADD(NOW(), INTERVAL 10 MINUTE))
   ", {
diff --git a/api/auth/sendOTP.cfm b/api/auth/sendOTP.cfm
index a4b46c9..d4a97a7 100644
--- a/api/auth/sendOTP.cfm
+++ b/api/auth/sendOTP.cfm
@@ -56,7 +56,7 @@ try {
 
     // Check if phone already has a COMPLETE account (verified AND has profile info)
     // An account is only "complete" if they have a first name (meaning they finished signup)
-    qExisting = queryExecute("
+    qExisting = queryTimed("
         SELECT ID, UUID, FirstName
         FROM Users
         WHERE ContactNumber = :phone
@@ -72,7 +72,7 @@ try {
 
     // Check for incomplete account with this phone (verified but no profile, OR unverified)
     // These accounts can be reused for signup
-    qIncomplete = queryExecute("
+    qIncomplete = queryTimed("
         SELECT ID, UUID
         FROM Users
         WHERE ContactNumber = :phone
@@ -90,7 +90,7 @@ try {
     if (qIncomplete.recordCount > 0) {
         // Update existing incomplete record with new OTP and reset for re-registration
         userUUID = qIncomplete.UUID;
-        queryExecute("
+        queryTimed("
             UPDATE Users
             SET MobileVerifyCode = :otp,
                 IsContactVerified = 0,
@@ -103,7 +103,7 @@ try {
     } else {
         // Create new user record
         userUUID = replace(createUUID(), "-", "", "all");
-        queryExecute("
+        queryTimed("
             INSERT INTO Users (
                 ContactNumber,
                 UUID,
diff --git a/api/auth/validateToken.cfm b/api/auth/validateToken.cfm
index ca668a7..a1b5572 100644
--- a/api/auth/validateToken.cfm
+++ b/api/auth/validateToken.cfm
@@ -32,7 +32,7 @@ try {
     }
 
     // Look up the token
-    qToken = queryExecute("
+    qToken = queryTimed("
         SELECT ut.UserID, u.FirstName, u.LastName
         FROM UserTokens ut
         JOIN Users u ON u.ID = ut.UserID
@@ -47,7 +47,7 @@ try {
     userID = qToken.UserID;
 
     // Determine if user is a worker (has any active employment)
-    qWorker = queryExecute("
+    qWorker = queryTimed("
         SELECT COUNT(*) as cnt
         FROM Employees
         WHERE UserID = :userID AND IsActive = 1
diff --git a/api/auth/verifyEmailOTP.cfm b/api/auth/verifyEmailOTP.cfm
index b1b7f1f..f7ac373 100644
--- a/api/auth/verifyEmailOTP.cfm
+++ b/api/auth/verifyEmailOTP.cfm
@@ -36,7 +36,7 @@ if (!len(email) || !len(code)) {
 
 try {
   // Look up user by email
-  qUser = queryExecute("
+  qUser = queryTimed("
     SELECT ID, FirstName
     FROM Users
     WHERE EmailAddress = :email
@@ -53,7 +53,7 @@ try {
   userId = qUser.ID;
 
   // Check for valid OTP in OTPCodes table
-  qOTP = queryExecute("
+  qOTP = queryTimed("
     SELECT ID
     FROM OTPCodes
     WHERE UserID = :userId
@@ -72,7 +72,7 @@ try {
   }
 
   // Mark OTP as used
-  queryExecute("
+  queryTimed("
     UPDATE OTPCodes
     SET UsedAt = NOW()
     WHERE ID = :otpId
@@ -83,7 +83,7 @@ try {
   // Create auth token (same as login.cfm)
   token = replace(createUUID(), "-", "", "all");
 
-  queryExecute(
+  queryTimed(
     "INSERT INTO UserTokens (UserID, Token) VALUES (?, ?)",
     [
       { value: userId, cfsqltype: "cf_sql_integer" },
diff --git a/api/auth/verifyLoginOTP.cfm b/api/auth/verifyLoginOTP.cfm
index 128a1f8..0d2da84 100644
--- a/api/auth/verifyLoginOTP.cfm
+++ b/api/auth/verifyLoginOTP.cfm
@@ -39,7 +39,7 @@ try {
 
     // Find verified user with matching UUID and OTP
     // Magic OTP only bypasses Twilio SMS (in loginOTP.cfm), not OTP verification
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT ID, FirstName, LastName
         FROM Users
         WHERE UUID = :uuid
@@ -53,7 +53,7 @@ try {
 
     if (qUser.recordCount == 0) {
         // Check if UUID exists but OTP is wrong
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT ID FROM Users WHERE UUID = :uuid AND IsContactVerified = 1
         ", { uuid: { value: userUUID, cfsqltype: "cf_sql_varchar" } }, { datasource: "payfrit" });
 
@@ -65,7 +65,7 @@ try {
     }
 
     // Clear the OTP (one-time use)
-    queryExecute("
+    queryTimed("
         UPDATE Users
         SET MobileVerifyCode = ''
         WHERE ID = :userId
@@ -73,7 +73,7 @@ try {
 
     // Create auth token
     token = replace(createUUID(), "-", "", "all");
-    queryExecute("
+    queryTimed("
         INSERT INTO UserTokens (UserID, Token) VALUES (:userId, :token)
     ", {
         userId: { value: qUser.ID, cfsqltype: "cf_sql_integer" },
diff --git a/api/auth/verifyOTP.cfm b/api/auth/verifyOTP.cfm
index 35a6af4..5704783 100644
--- a/api/auth/verifyOTP.cfm
+++ b/api/auth/verifyOTP.cfm
@@ -42,7 +42,7 @@ try {
 
     // Find unverified user with matching UUID and OTP
     // Magic OTP only bypasses Twilio SMS (in sendOTP.cfm), not OTP verification
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT ID, FirstName, LastName, EmailAddress, IsEmailVerified
         FROM Users
         WHERE UUID = :uuid
@@ -56,7 +56,7 @@ try {
 
     if (qUser.recordCount == 0) {
         // Check if UUID exists but OTP is wrong
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT ID FROM Users WHERE UUID = :uuid AND IsContactVerified = 0
         ", { uuid: { value: userUUID, cfsqltype: "cf_sql_varchar" } }, { datasource: "payfrit" });
 
@@ -69,7 +69,7 @@ try {
 
     // Clear the OTP code (one-time use) but DON'T mark as verified yet
     // Account will be marked verified after profile completion
-    queryExecute("
+    queryTimed("
         UPDATE Users
         SET MobileVerifyCode = ''
         WHERE ID = :userId
@@ -77,7 +77,7 @@ try {
 
     // Create auth token (needed for completeProfile call)
     token = replace(createUUID(), "-", "", "all");
-    queryExecute("
+    queryTimed("
         INSERT INTO UserTokens (UserID, Token) VALUES (:userId, :token)
     ", {
         userId: { value: qUser.ID, cfsqltype: "cf_sql_integer" },
diff --git a/api/beacons/save.cfm b/api/beacons/save.cfm
index 6083941..cfc0de2 100644
--- a/api/beacons/save.cfm
+++ b/api/beacons/save.cfm
@@ -35,7 +35,7 @@ if (!structKeyExists(request, "BusinessID") || !isNumeric(request.BusinessID) ||
 }
 
 // Verify the business exists
-qBiz = queryExecute(
+qBiz = queryTimed(
   "SELECT ID FROM Businesses WHERE ID = ? LIMIT 1",
   [ { value=request.BusinessID, cfsqltype="cf_sql_integer" } ],
   { datasource="payfrit" }
@@ -65,7 +65,7 @@ if (structKeyExists(data, "IsActive")) {
 
 // App is authoritative: if UUID exists, treat as update (overwrite)
 if (beaconId EQ 0 && len(uuid) GT 0) {
-  qExisting = queryExecute(
+  qExisting = queryTimed(
     "SELECT ID FROM Beacons WHERE UUID = ? LIMIT 1",
     [ { value=uuid, cfsqltype="cf_sql_varchar" } ],
     { datasource="payfrit" }
diff --git a/api/businesses/get.cfm b/api/businesses/get.cfm
index b576664..f0c002f 100644
--- a/api/businesses/get.cfm
+++ b/api/businesses/get.cfm
@@ -33,7 +33,7 @@ try {
     }
 
     // Get business details
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             ID,
             Name,
@@ -55,7 +55,7 @@ try {
     }
 
     // Get address from Addresses table (either linked via AddressBusinessID or via Businesses.BusinessAddressID)
-    qAddr = queryExecute("
+    qAddr = queryTimed("
         SELECT a.Line1 AS AddressLine1, a.Line2 AS AddressLine2, a.City AS AddressCity, a.ZIPCode AS AddressZIPCode, s.Abbreviation
         FROM Addresses a
         LEFT JOIN tt_States s ON s.ID = a.StateID
@@ -87,7 +87,7 @@ try {
     }
 
     // Get hours from Hours table
-    qHours = queryExecute("
+    qHours = queryTimed("
         SELECT h.DayID, h.OpenTime, h.ClosingTime, d.Abbrev
         FROM Hours h
         JOIN tt_Days d ON d.ID = h.DayID
diff --git a/api/businesses/getChildren.cfm b/api/businesses/getChildren.cfm
index 39d8541..a0a22be 100644
--- a/api/businesses/getChildren.cfm
+++ b/api/businesses/getChildren.cfm
@@ -33,7 +33,7 @@ if (parentBusinessId LTE 0) {
 }
 
 try {
-  q = queryExecute(
+  q = queryTimed(
     "
       SELECT
         ID,
diff --git a/api/businesses/list.cfm b/api/businesses/list.cfm
index 9f91962..580846b 100644
--- a/api/businesses/list.cfm
+++ b/api/businesses/list.cfm
@@ -40,7 +40,7 @@ try {
   hasUserLocation = (userLat != 0 AND userLng != 0);
 
   // Get businesses with their address coordinates (exclude demo and private)
-  q = queryExecute(
+  q = queryTimed(
     "
       SELECT
         b.ID,
diff --git a/api/businesses/saveBrandColor.cfm b/api/businesses/saveBrandColor.cfm
index 0e8ec84..2e9d6d0 100644
--- a/api/businesses/saveBrandColor.cfm
+++ b/api/businesses/saveBrandColor.cfm
@@ -47,7 +47,7 @@ if (len(brandColor) GT 0) {
 }
 
 // Update the database
-queryExecute("
+queryTimed("
   UPDATE Businesses
   SET BrandColor = :color
   WHERE ID = :bizId
diff --git a/api/businesses/setHiring.cfm b/api/businesses/setHiring.cfm
index bc32636..49bb7f3 100644
--- a/api/businesses/setHiring.cfm
+++ b/api/businesses/setHiring.cfm
@@ -43,7 +43,7 @@ if (isHiring == -1) {
 }
 
 try {
-  queryExecute("
+  queryTimed("
     UPDATE Businesses
     SET IsHiring = ?
     WHERE ID = ?
diff --git a/api/businesses/update.cfm b/api/businesses/update.cfm
index 669efa9..ffa4b63 100644
--- a/api/businesses/update.cfm
+++ b/api/businesses/update.cfm
@@ -47,7 +47,7 @@ try {
 
     if (len(bizName)) {
         if (isNumeric(taxRate)) {
-            queryExecute("
+            queryTimed("
                 UPDATE Businesses SET Name = :name, Phone = :phone, TaxRate = :taxRate
                 WHERE ID = :id
             ", {
@@ -57,7 +57,7 @@ try {
                 id: businessId
             }, { datasource: "payfrit" });
         } else {
-            queryExecute("
+            queryTimed("
                 UPDATE Businesses SET Name = :name, Phone = :phone
                 WHERE ID = :id
             ", {
@@ -80,7 +80,7 @@ try {
     // Get state ID
     stateID = 0;
     if (len(state)) {
-        qState = queryExecute("
+        qState = queryTimed("
             SELECT ID FROM tt_States WHERE Abbreviation = :abbr
         ", { abbr: uCase(state) }, { datasource: "payfrit" });
         if (qState.recordCount > 0) {
@@ -89,7 +89,7 @@ try {
     }
 
     // Check if business has an address
-    qAddr = queryExecute("
+    qAddr = queryTimed("
         SELECT ID FROM Addresses
         WHERE BusinessID = :bizID AND UserID = 0 AND IsDeleted = 0
         LIMIT 1
@@ -97,7 +97,7 @@ try {
 
     if (qAddr.recordCount > 0) {
         // Update existing address
-        queryExecute("
+        queryTimed("
             UPDATE Addresses SET
                 Line1 = :line1,
                 City = :city,
@@ -113,7 +113,7 @@ try {
         }, { datasource: "payfrit" });
     } else {
         // Create new address
-        queryExecute("
+        queryTimed("
             INSERT INTO Addresses (Line1, City, StateID, ZIPCode, BusinessID, UserID, AddressTypeID, AddedOn)
             VALUES (:line1, :city, :stateID, :zip, :bizID, 0, 2, NOW())
         ", {
diff --git a/api/businesses/updateHours.cfm b/api/businesses/updateHours.cfm
index ffb6fcc..0a561b8 100644
--- a/api/businesses/updateHours.cfm
+++ b/api/businesses/updateHours.cfm
@@ -37,7 +37,7 @@ try {
     hours = structKeyExists(data, "Hours") && isArray(data.Hours) ? data.Hours : [];
 
     // Delete all existing hours for this business
-    queryExecute("
+    queryTimed("
         DELETE FROM Hours WHERE BusinessID = :bizID
     ", { bizID: businessId }, { datasource: "payfrit" });
 
@@ -54,7 +54,7 @@ try {
             if (len(openTime) == 5) openTime = openTime & ":00";
             if (len(closeTime) == 5) closeTime = closeTime & ":00";
 
-            queryExecute("
+            queryTimed("
                 INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime)
                 VALUES (:bizID, :dayID, :openTime, :closeTime)
             ", {
diff --git a/api/chat/closeChat.cfm b/api/chat/closeChat.cfm
index fe15e8a..2612a0d 100644
--- a/api/chat/closeChat.cfm
+++ b/api/chat/closeChat.cfm
@@ -32,7 +32,7 @@ try {
     }
 
     // Mark the task as completed
-    queryExecute("
+    queryTimed("
         UPDATE Tasks
         SET CompletedOn = NOW()
         WHERE ID = :taskID
diff --git a/api/chat/getActiveChat.cfm b/api/chat/getActiveChat.cfm
index 0e00ee1..2c8c6c6 100644
--- a/api/chat/getActiveChat.cfm
+++ b/api/chat/getActiveChat.cfm
@@ -44,7 +44,7 @@ try {
 
     // Look for any active chat task at this service point
     // TaskTypeID = 2 (Chat), not completed, at this service point
-    qChat = queryExecute("
+    qChat = queryTimed("
         SELECT t.ID, t.Title,
                (SELECT MAX(cm.CreatedOn) FROM ChatMessages cm WHERE cm.TaskID = t.ID) as LastMessageTime
         FROM Tasks t
diff --git a/api/chat/getMessages.cfm b/api/chat/getMessages.cfm
index 10f6ce4..28b9c3b 100644
--- a/api/chat/getMessages.cfm
+++ b/api/chat/getMessages.cfm
@@ -34,7 +34,7 @@ try {
 
     // Get messages
     if (afterMessageID > 0) {
-        qMessages = queryExecute("
+        qMessages = queryTimed("
             SELECT
                 m.ID,
                 m.TaskID,
@@ -53,7 +53,7 @@ try {
             afterID: { value: afterMessageID, cfsqltype: "cf_sql_integer" }
         }, { datasource: "payfrit" });
     } else {
-        qMessages = queryExecute("
+        qMessages = queryTimed("
             SELECT
                 m.ID,
                 m.TaskID,
@@ -87,7 +87,7 @@ try {
     }
 
     // Check if chat/task is closed (completed)
-    qTask = queryExecute("
+    qTask = queryTimed("
         SELECT CompletedOn FROM Tasks WHERE ID = :taskID
     ", { taskID: { value: taskID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
 
diff --git a/api/chat/markRead.cfm b/api/chat/markRead.cfm
index a3e1818..4839267 100644
--- a/api/chat/markRead.cfm
+++ b/api/chat/markRead.cfm
@@ -41,7 +41,7 @@ try {
     // If reader is worker, mark customer messages as read
     otherType = readerType == "customer" ? "worker" : "customer";
 
-    queryExecute("
+    queryTimed("
         UPDATE ChatMessages
         SET IsRead = 1
         WHERE TaskID = :taskID AND SenderType = :otherType AND IsRead = 0
diff --git a/api/chat/sendMessage.cfm b/api/chat/sendMessage.cfm
index c4cf327..de0bc91 100644
--- a/api/chat/sendMessage.cfm
+++ b/api/chat/sendMessage.cfm
@@ -53,7 +53,7 @@ try {
     }
 
     // Verify task exists and is still open
-    taskQuery = queryExecute("
+    taskQuery = queryTimed("
         SELECT ID, ClaimedByUserID, CompletedOn FROM Tasks WHERE ID = :taskID
     ", { taskID: { value: taskID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
 
@@ -67,7 +67,7 @@ try {
     }
 
     // Insert message
-    queryExecute("
+    queryTimed("
         INSERT INTO ChatMessages (TaskID, SenderUserID, SenderType, MessageBody)
         VALUES (:taskID, :userID, :senderType, :message)
     ", {
@@ -78,7 +78,7 @@ try {
     }, { datasource: "payfrit" });
 
     // Get the new message ID
-    result = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+    result = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
     messageID = result.newID;
 
     apiAbort({
diff --git a/api/debug/checkTask.cfm b/api/debug/checkTask.cfm
index bea65ab..fff417a 100644
--- a/api/debug/checkTask.cfm
+++ b/api/debug/checkTask.cfm
@@ -15,7 +15,7 @@
 </cfif>
 
 <cftry>
-  <cfset qTask = queryExecute("
+  <cfset qTask = queryTimed("
     SELECT ID, BusinessID, TaskCategoryID, OrderID, TaskTypeID,
            ClaimedByUserID, ClaimedOn, CompletedOn,
            CreatedOn, SourceType, SourceID
diff --git a/api/debug/checkToken.cfm b/api/debug/checkToken.cfm
index ca2591a..5a94999 100644
--- a/api/debug/checkToken.cfm
+++ b/api/debug/checkToken.cfm
@@ -27,7 +27,7 @@ result = {
 
 if (len(userToken)) {
   try {
-    qTok = queryExecute(
+    qTok = queryTimed(
       "SELECT ID, Token FROM UserTokens WHERE Token = ? LIMIT 1",
       [ { value = userToken, cfsqltype = "cf_sql_varchar" } ],
       { datasource = "payfrit" }
@@ -38,7 +38,7 @@ if (len(userToken)) {
     }
 
     // Also check with LIKE to see if partial match exists
-    qPartial = queryExecute(
+    qPartial = queryTimed(
       "SELECT ID, Token FROM UserTokens WHERE Token LIKE ? LIMIT 5",
       [ { value = left(userToken, 8) & "%", cfsqltype = "cf_sql_varchar" } ],
       { datasource = "payfrit" }
@@ -52,7 +52,7 @@ if (len(userToken)) {
 
 // Also list recent tokens
 try {
-  qRecent = queryExecute(
+  qRecent = queryTimed(
     "SELECT ID, LEFT(Token, 8) as TokenPrefix, LENGTH(Token) as TokenLen FROM UserTokens ORDER BY ID DESC LIMIT 5",
     [],
     { datasource = "payfrit" }
diff --git a/api/debug/tables.cfm b/api/debug/tables.cfm
index 1e9a354..73af655 100644
--- a/api/debug/tables.cfm
+++ b/api/debug/tables.cfm
@@ -4,7 +4,7 @@
 
 <cfscript>
 try {
-    qTables = queryExecute("SHOW TABLES LIKE '%tate%'", {}, { datasource: "payfrit" });
+    qTables = queryTimed("SHOW TABLES LIKE '%tate%'", {}, { datasource: "payfrit" });
 
     tables = [];
     for (row in qTables) {
diff --git a/api/dev/seedData.cfm b/api/dev/seedData.cfm
index 47125d7..7868766 100644
--- a/api/dev/seedData.cfm
+++ b/api/dev/seedData.cfm
@@ -42,7 +42,7 @@ function readJsonBody() {
 function createTestUser(phone, firstName, lastName, isVerified = true) {
     var userUUID = replace(createUUID(), "-", "", "all");
 
-    queryExecute("
+    queryTimed("
         INSERT INTO Users (
             ContactNumber,
             UUID,
@@ -125,7 +125,7 @@ function seedTestData() {
 
 function resetTestData() {
     // Delete test users (by phone prefix 555)
-    queryExecute("
+    queryTimed("
         DELETE FROM Users
         WHERE ContactNumber LIKE '555%'
     ", {}, { datasource: "payfrit" });
@@ -134,7 +134,7 @@ function resetTestData() {
 }
 
 function getTestDataInfo() {
-    var qUsers = queryExecute("
+    var qUsers = queryTimed("
         SELECT ID, ContactNumber, FirstName, LastName,
                IsContactVerified, UUID
         FROM Users
diff --git a/api/dev/timeTravel.cfm b/api/dev/timeTravel.cfm
index b41652c..4383cf2 100644
--- a/api/dev/timeTravel.cfm
+++ b/api/dev/timeTravel.cfm
@@ -57,7 +57,7 @@ try {
                 apiAbort({ "OK": false, "ERROR": "missing_userId" });
             }
 
-            queryExecute("
+            queryTimed("
                 UPDATE UserTokens
                 SET CreatedAt = DATE_SUB(NOW(), INTERVAL 30 DAY)
                 WHERE UserID = :userId
@@ -77,7 +77,7 @@ try {
                 apiAbort({ "OK": false, "ERROR": "missing_userId_or_daysAgo" });
             }
 
-            queryExecute("
+            queryTimed("
                 UPDATE Users
                 SET AddedOn = DATE_SUB(NOW(), INTERVAL :days DAY)
                 WHERE UserID = :userId
@@ -94,7 +94,7 @@ try {
 
         case "clearotps":
             // Clear all OTPs (force re-request)
-            queryExecute("
+            queryTimed("
                 UPDATE Users SET MobileVerifyCode = ''
             ", {}, { datasource: "payfrit" });
 
@@ -110,7 +110,7 @@ try {
                 apiAbort({ "OK": false, "ERROR": "missing_phone" });
             }
 
-            queryExecute("
+            queryTimed("
                 UPDATE Users
                 SET IsContactVerified = 0,
                     IsActive = 0,
diff --git a/api/grants/_grantUtils.cfm b/api/grants/_grantUtils.cfm
index 84ee891..a67df3d 100644
--- a/api/grants/_grantUtils.cfm
+++ b/api/grants/_grantUtils.cfm
@@ -71,7 +71,7 @@ function checkGrantEligibility(
     if (arguments.eligibilityScope == "public") return true;
 
     // Check if user is employee of a given business
-    var isGuestEmployee = queryExecute(
+    var isGuestEmployee = queryTimed(
         "SELECT 1 FROM Employees WHERE BusinessID = ? AND UserID = ? AND IsActive = 1 LIMIT 1",
         [
             { value = arguments.guestBusinessID, cfsqltype = "cf_sql_integer" },
@@ -80,7 +80,7 @@ function checkGrantEligibility(
         { datasource = "payfrit" }
     ).recordCount > 0;
 
-    var isOwnerEmployee = queryExecute(
+    var isOwnerEmployee = queryTimed(
         "SELECT 1 FROM Employees WHERE BusinessID = ? AND UserID = ? AND IsActive = 1 LIMIT 1",
         [
             { value = arguments.ownerBusinessID, cfsqltype = "cf_sql_integer" },
@@ -118,7 +118,7 @@ function recordGrantHistory(
     var ip = "";
     try { ip = cgi.REMOTE_ADDR; } catch (any e) {}
 
-    queryExecute(
+    queryTimed(
         "INSERT INTO ServicePointGrantHistory (GrantID, Action, ActorUserID, ActorBusinessID, PreviousData, NewData, IPAddress)
          VALUES (?, ?, ?, ?, ?, ?, ?)",
         [
diff --git a/api/grants/accept.cfm b/api/grants/accept.cfm
index 422bc6b..e4d86a8 100644
--- a/api/grants/accept.cfm
+++ b/api/grants/accept.cfm
@@ -29,7 +29,7 @@ if (callerUserID LTE 0) {
 
 // Load grant by ID or token
 if (grantID GT 0) {
-    qGrant = queryExecute(
+    qGrant = queryTimed(
         "SELECT g.*, b.UserID AS GuestOwnerUserID
          FROM ServicePointGrants g
          JOIN Businesses b ON b.ID = g.GuestBusinessID
@@ -39,7 +39,7 @@ if (grantID GT 0) {
         { datasource = "payfrit" }
     );
 } else {
-    qGrant = queryExecute(
+    qGrant = queryTimed(
         "SELECT g.*, b.UserID AS GuestOwnerUserID
          FROM ServicePointGrants g
          JOIN Businesses b ON b.ID = g.GuestBusinessID
@@ -65,7 +65,7 @@ if (qGrant.StatusID != 0) {
 }
 
 // Accept: activate grant
-queryExecute(
+queryTimed(
     "UPDATE ServicePointGrants
      SET StatusID = 1, AcceptedOn = NOW(), AcceptedByUserID = ?, InviteToken = NULL
      WHERE ID = ?",
diff --git a/api/grants/create.cfm b/api/grants/create.cfm
index 464fbca..97db805 100644
--- a/api/grants/create.cfm
+++ b/api/grants/create.cfm
@@ -39,7 +39,7 @@ if (callerUserID LTE 0) {
     apiAbort({ "OK": false, "ERROR": "not_authenticated", "MESSAGE": "Authentication required." });
 }
 
-qOwner = queryExecute(
+qOwner = queryTimed(
     "SELECT UserID FROM Businesses WHERE ID = ? LIMIT 1",
     [{ value = ownerBusinessID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
@@ -49,7 +49,7 @@ if (qOwner.recordCount == 0 || qOwner.UserID != callerUserID) {
 }
 
 // Validate ServicePoint belongs to OwnerBusinessID
-qSP = queryExecute(
+qSP = queryTimed(
     "SELECT ID FROM ServicePoints WHERE ID = ? AND BusinessID = ? LIMIT 1",
     [
         { value = servicePointID, cfsqltype = "cf_sql_integer" },
@@ -62,7 +62,7 @@ if (qSP.recordCount == 0) {
 }
 
 // Validate GuestBusiness exists
-qGuest = queryExecute(
+qGuest = queryTimed(
     "SELECT ID FROM Businesses WHERE ID = ? LIMIT 1",
     [{ value = guestBusinessID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
@@ -72,7 +72,7 @@ if (qGuest.recordCount == 0) {
 }
 
 // Check no active or pending grant exists for this combo
-qExisting = queryExecute(
+qExisting = queryTimed(
     "SELECT ID FROM ServicePointGrants
      WHERE OwnerBusinessID = ? AND GuestBusinessID = ? AND ServicePointID = ? AND StatusID IN (0, 1)
      LIMIT 1",
@@ -109,7 +109,7 @@ if (isStruct(timePolicyData) && !structIsEmpty(timePolicyData)) {
 }
 
 // Insert grant
-queryExecute(
+queryTimed(
     "INSERT INTO ServicePointGrants
         (UUID, OwnerBusinessID, GuestBusinessID, ServicePointID, StatusID,
          EconomicsType, EconomicsValue, EligibilityScope, TimePolicyType, TimePolicyData,
@@ -132,7 +132,7 @@ queryExecute(
 );
 
 // Get the inserted grant ID
-qNew = queryExecute(
+qNew = queryTimed(
     "SELECT ID FROM ServicePointGrants WHERE UUID = ? LIMIT 1",
     [{ value = newUUID, cfsqltype = "cf_sql_varchar" }],
     { datasource = "payfrit" }
diff --git a/api/grants/decline.cfm b/api/grants/decline.cfm
index de4e1b9..b0b9790 100644
--- a/api/grants/decline.cfm
+++ b/api/grants/decline.cfm
@@ -25,7 +25,7 @@ if (callerUserID LTE 0) {
     apiAbort({ "OK": false, "ERROR": "not_authenticated" });
 }
 
-qGrant = queryExecute(
+qGrant = queryTimed(
     "SELECT g.*, b.UserID AS GuestOwnerUserID
      FROM ServicePointGrants g
      JOIN Businesses b ON b.ID = g.GuestBusinessID
@@ -47,7 +47,7 @@ if (qGrant.StatusID != 0) {
     apiAbort({ "OK": false, "ERROR": "bad_state", "MESSAGE": "Only pending grants can be declined." });
 }
 
-queryExecute(
+queryTimed(
     "UPDATE ServicePointGrants SET StatusID = 2 WHERE ID = ?",
     [{ value = grantID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
diff --git a/api/grants/get.cfm b/api/grants/get.cfm
index ae08851..3824a04 100644
--- a/api/grants/get.cfm
+++ b/api/grants/get.cfm
@@ -24,7 +24,7 @@ if (callerUserID LTE 0) {
 }
 
 // Load grant with business/SP names
-qGrant = queryExecute(
+qGrant = queryTimed(
     "SELECT
         g.*,
         ob.Name AS OwnerBusinessName,
@@ -52,7 +52,7 @@ if (qGrant.recordCount == 0) {
 }
 
 // Load history
-qHistory = queryExecute(
+qHistory = queryTimed(
     "SELECT h.*, u.FirstName, u.LastName
      FROM ServicePointGrantHistory h
      LEFT JOIN Users u ON u.ID = h.ActorUserID
diff --git a/api/grants/list.cfm b/api/grants/list.cfm
index bf3605b..574239c 100644
--- a/api/grants/list.cfm
+++ b/api/grants/list.cfm
@@ -76,7 +76,7 @@ if (statusFilter >= 0) {
     params.statusFilter = { value = statusFilter, cfsqltype = "cf_sql_integer" };
 }
 
-qGrants = queryExecute(sql, params, { datasource = "payfrit" });
+qGrants = queryTimed(sql, params, { datasource = "payfrit" });
 
 grants = [];
 for (row in qGrants) {
diff --git a/api/grants/revoke.cfm b/api/grants/revoke.cfm
index 18e83fd..9f5a509 100644
--- a/api/grants/revoke.cfm
+++ b/api/grants/revoke.cfm
@@ -26,7 +26,7 @@ if (callerUserID LTE 0) {
 }
 
 // Load grant + verify ownership
-qGrant = queryExecute(
+qGrant = queryTimed(
     "SELECT g.ID, g.OwnerBusinessID, g.GuestBusinessID, g.StatusID, b.UserID AS OwnerUserID
      FROM ServicePointGrants g
      JOIN Businesses b ON b.ID = g.OwnerBusinessID
@@ -53,7 +53,7 @@ if (qGrant.StatusID != 0 && qGrant.StatusID != 1) {
 }
 
 // Revoke immediately
-queryExecute(
+queryTimed(
     "UPDATE ServicePointGrants SET StatusID = 3, RevokedOn = NOW() WHERE ID = ?",
     [{ value = grantID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
diff --git a/api/grants/searchBusiness.cfm b/api/grants/searchBusiness.cfm
index 970b57c..8187d62 100644
--- a/api/grants/searchBusiness.cfm
+++ b/api/grants/searchBusiness.cfm
@@ -39,7 +39,7 @@ if (excludeBusinessID GT 0) {
 
 sql &= " ORDER BY Name LIMIT 20";
 
-qResults = queryExecute(sql, params, { datasource = "payfrit" });
+qResults = queryTimed(sql, params, { datasource = "payfrit" });
 
 businesses = [];
 for (row in qResults) {
diff --git a/api/grants/update.cfm b/api/grants/update.cfm
index 342827e..74fd4ef 100644
--- a/api/grants/update.cfm
+++ b/api/grants/update.cfm
@@ -26,7 +26,7 @@ if (callerUserID LTE 0) {
 }
 
 // Load current grant
-qGrant = queryExecute(
+qGrant = queryTimed(
     "SELECT g.*, b.UserID AS OwnerUserID
      FROM ServicePointGrants g
      JOIN Businesses b ON b.ID = g.OwnerBusinessID
@@ -124,7 +124,7 @@ if (arrayLen(setClauses) == 0) {
 
 // Execute update
 arrayAppend(setParams, { value = grantID, cfsqltype = "cf_sql_integer" });
-queryExecute(
+queryTimed(
     "UPDATE ServicePointGrants SET #arrayToList(setClauses, ', ')# WHERE ID = ?",
     setParams,
     { datasource = "payfrit" }
diff --git a/api/import/crimson_menu.cfm b/api/import/crimson_menu.cfm
index ef08c60..38a284f 100644
--- a/api/import/crimson_menu.cfm
+++ b/api/import/crimson_menu.cfm
@@ -13,7 +13,7 @@ try {
     response.steps.append("Creating business record...");
 
     // Check if business already exists by name
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID FROM Businesses WHERE Name = :name
     ", { name: "Crimson Mediterranean Cookhouse" }, { datasource: "payfrit" });
 
@@ -21,7 +21,7 @@ try {
         BusinessID = qCheck.BusinessID;
         response.steps.append("Business already exists with ID: " & BusinessID);
     } else {
-        queryExecute("
+        queryTimed("
             INSERT INTO Businesses (Name, BusinessOwnerUserID)
             VALUES (:name, :ownerID)
         ", {
@@ -29,7 +29,7 @@ try {
             ownerID: 2  // UserID 2 (John)
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
         BusinessID = qNew.id;
         response.steps.append("Created business with ID: " & BusinessID);
     }
@@ -53,7 +53,7 @@ try {
 
     for (cat in categories) {
         // Check if exists
-        qCat = queryExecute("
+        qCat = queryTimed("
             SELECT ID FROM Categories
             WHERE BusinessID = :bizID AND Name = :name
         ", { bizID: BusinessID, name: cat.name }, { datasource: "payfrit" });
@@ -61,7 +61,7 @@ try {
         if (qCat.recordCount > 0) {
             categoryMap[cat.id] = qCat.CategoryID;
         } else {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Categories (BusinessID, Name, SortOrder)
                 VALUES (:bizID, :name, :sortOrder)
             ", {
@@ -70,7 +70,7 @@ try {
                 sortOrder: cat.order
             }, { datasource: "payfrit" });
 
-            qNewCat = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            qNewCat = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             categoryMap[cat.id] = qNewCat.id;
         }
     }
@@ -86,7 +86,7 @@ try {
     // Helper function to create a modifier group
     function createModifierGroup(categoryID, parentItemID, groupName, groupID, options, required, maxSelect) {
         // Check if group exists
-        var qMod = queryExecute("
+        var qMod = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = :parentID
         ", { catID: categoryID, name: groupName, parentID: parentItemID }, { datasource: "payfrit" });
@@ -95,7 +95,7 @@ try {
         if (qMod.recordCount > 0) {
             groupItemID = qMod.ItemID;
         } else {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, ParentItemID, Price, IsActive,
                     RequiresChildSelection, MaxNumSelectionReq, IsCollapsible, SortOrder)
                 VALUES (:catID, :name, :parentID, 0, 1, :required, :maxSelect, 1, :sortOrder)
@@ -108,21 +108,21 @@ try {
                 sortOrder: 100
             }, { datasource: "payfrit" });
 
-            var qNewMod = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            var qNewMod = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             groupItemID = qNewMod.id;
         }
 
         // Create options
         var optionOrder = 1;
         for (var opt in options) {
-            var qOpt = queryExecute("
+            var qOpt = queryTimed("
                 SELECT ID FROM Items
                 WHERE CategoryID = :catID AND Name = :name AND ParentItemID = :parentID
             ", { catID: categoryID, name: opt.name, parentID: groupItemID }, { datasource: "payfrit" });
 
             if (qOpt.recordCount == 0) {
                 var isDefault = (optionOrder == 1 && required) ? 1 : 0;
-                queryExecute("
+                queryTimed("
                     INSERT INTO Items (CategoryID, Name, ParentItemID, Price, IsActive,
                         IsCheckedByDefault, SortOrder)
                     VALUES (:catID, :name, :parentID, :price, 1, :isDefault, :sortOrder)
@@ -158,13 +158,13 @@ try {
 
     itemOrder = 1;
     for (item in grillItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: grillCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, RequiresChildSelection, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :reqChild, :sortOrder)
@@ -198,13 +198,13 @@ try {
 
     itemOrder = 1;
     for (item in wrapItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: wrapsCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -234,13 +234,13 @@ try {
 
     itemOrder = 1;
     for (item in saladItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: saladsCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -276,13 +276,13 @@ try {
 
     itemOrder = 1;
     for (item in sideItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: sidesCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -317,13 +317,13 @@ try {
 
     itemOrder = 1;
     for (item in hotCoffeeItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: hotCoffeeCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -355,13 +355,13 @@ try {
 
     itemOrder = 1;
     for (item in icedCoffeeItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: icedCoffeeCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -391,13 +391,13 @@ try {
 
     itemOrder = 1;
     for (item in hotTeaItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: hotTeaCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -428,13 +428,13 @@ try {
 
     itemOrder = 1;
     for (item in icedTeaItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: icedTeaCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -466,13 +466,13 @@ try {
 
     itemOrder = 1;
     for (item in bevItems) {
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE CategoryID = :catID AND Name = :name AND ParentItemID = 0
         ", { catID: bevCatID, name: item.name }, { datasource: "payfrit" });
 
         if (qItem.recordCount == 0) {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (CategoryID, Name, Description, ParentItemID, Price,
                     IsActive, SortOrder)
                 VALUES (:catID, :name, :desc, 0, :price, 1, :sortOrder)
@@ -488,7 +488,7 @@ try {
     }
 
     // Count total items
-    qCount = queryExecute("
+    qCount = queryTimed("
         SELECT COUNT(*) as cnt FROM Items i
         INNER JOIN Categories c ON c.ID = i.CategoryID
         WHERE c.BusinessID = :bizID
diff --git a/api/menu/clearAllData.cfm b/api/menu/clearAllData.cfm
index 654593e..6ce1f3c 100644
--- a/api/menu/clearAllData.cfm
+++ b/api/menu/clearAllData.cfm
@@ -20,14 +20,14 @@ try {
     }
 
     // Get counts before deletion
-    qItemCount = queryExecute("SELECT COUNT(*) as cnt FROM Items", {}, { datasource: "payfrit" });
-    qCatCount = queryExecute("SELECT COUNT(*) as cnt FROM Categories", {}, { datasource: "payfrit" });
-    qLinkCount = queryExecute("SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID", {}, { datasource: "payfrit" });
+    qItemCount = queryTimed("SELECT COUNT(*) as cnt FROM Items", {}, { datasource: "payfrit" });
+    qCatCount = queryTimed("SELECT COUNT(*) as cnt FROM Categories", {}, { datasource: "payfrit" });
+    qLinkCount = queryTimed("SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID", {}, { datasource: "payfrit" });
 
     // Delete in correct order (foreign key constraints)
-    queryExecute("DELETE FROM lt_ItemID_TemplateItemID", {}, { datasource: "payfrit" });
-    queryExecute("DELETE FROM Items", {}, { datasource: "payfrit" });
-    queryExecute("DELETE FROM Categories", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM lt_ItemID_TemplateItemID", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Items", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Categories", {}, { datasource: "payfrit" });
 
     response = {
         "OK": true,
diff --git a/api/menu/clearBusinessData.cfm b/api/menu/clearBusinessData.cfm
index 8e1bc98..dec2a6d 100644
--- a/api/menu/clearBusinessData.cfm
+++ b/api/menu/clearBusinessData.cfm
@@ -24,11 +24,11 @@ try {
     }
 
     // Get counts before deletion
-    qItemCount = queryExecute("SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
-    qCatCount = queryExecute("SELECT COUNT(*) as cnt FROM Categories WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
+    qItemCount = queryTimed("SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
+    qCatCount = queryTimed("SELECT COUNT(*) as cnt FROM Categories WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
 
     // Get item IDs for this business to delete template links
-    qItemIds = queryExecute("SELECT ID FROM Items WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
+    qItemIds = queryTimed("SELECT ID FROM Items WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
     itemIds = [];
     for (row in qItemIds) {
         arrayAppend(itemIds, row.ID);
@@ -37,17 +37,17 @@ try {
     deletedLinks = 0;
     if (arrayLen(itemIds) > 0) {
         // Delete template links for these items
-        queryExecute("DELETE FROM lt_ItemID_TemplateItemID WHERE ItemID IN (:ids) OR TemplateItemID IN (:ids)",
+        queryTimed("DELETE FROM lt_ItemID_TemplateItemID WHERE ItemID IN (:ids) OR TemplateItemID IN (:ids)",
             { ids: { value: arrayToList(itemIds), cfsqltype: "cf_sql_varchar", list: true } },
             { datasource: "payfrit" });
         deletedLinks = arrayLen(itemIds);
     }
 
     // Delete all items for this business
-    queryExecute("DELETE FROM Items WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Items WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
 
     // Delete all categories for this business
-    queryExecute("DELETE FROM Categories WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Categories WHERE BusinessID = :bid", { bid: businessID }, { datasource: "payfrit" });
 
     response = {
         "OK": true,
diff --git a/api/menu/clearOrders.cfm b/api/menu/clearOrders.cfm
index 53bcdf0..56c2adb 100644
--- a/api/menu/clearOrders.cfm
+++ b/api/menu/clearOrders.cfm
@@ -20,16 +20,16 @@ try {
     }
 
     // Get counts before deletion
-    qOrderLineItems = queryExecute("SELECT COUNT(*) as cnt FROM OrderLineItems", {}, { datasource: "payfrit" });
-    qOrders = queryExecute("SELECT COUNT(*) as cnt FROM Orders", {}, { datasource: "payfrit" });
-    qAddresses = queryExecute("SELECT COUNT(*) as cnt FROM Addresses WHERE AddressTypeID != 2", {}, { datasource: "payfrit" });
-    qTasks = queryExecute("SELECT COUNT(*) as cnt FROM Tasks", {}, { datasource: "payfrit" });
+    qOrderLineItems = queryTimed("SELECT COUNT(*) as cnt FROM OrderLineItems", {}, { datasource: "payfrit" });
+    qOrders = queryTimed("SELECT COUNT(*) as cnt FROM Orders", {}, { datasource: "payfrit" });
+    qAddresses = queryTimed("SELECT COUNT(*) as cnt FROM Addresses WHERE AddressTypeID != 2", {}, { datasource: "payfrit" });
+    qTasks = queryTimed("SELECT COUNT(*) as cnt FROM Tasks", {}, { datasource: "payfrit" });
 
     // Delete in correct order (foreign key constraints)
-    queryExecute("DELETE FROM Tasks", {}, { datasource: "payfrit" });
-    queryExecute("DELETE FROM OrderLineItems", {}, { datasource: "payfrit" });
-    queryExecute("DELETE FROM Orders", {}, { datasource: "payfrit" });
-    queryExecute("DELETE FROM Addresses WHERE AddressTypeID != 2", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Tasks", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM OrderLineItems", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Orders", {}, { datasource: "payfrit" });
+    queryTimed("DELETE FROM Addresses WHERE AddressTypeID != 2", {}, { datasource: "payfrit" });
 
     response = {
         "OK": true,
diff --git a/api/menu/debug.cfm b/api/menu/debug.cfm
index 0eb535a..63a672e 100644
--- a/api/menu/debug.cfm
+++ b/api/menu/debug.cfm
@@ -7,7 +7,7 @@ response = {};
 
 try {
     // Get all businesses with items
-    qBusinesses = queryExecute("
+    qBusinesses = queryTimed("
         SELECT DISTINCT i.BusinessID, COUNT(*) as ItemCount
         FROM Items i
         WHERE i.BusinessID > 0
@@ -23,7 +23,7 @@ try {
     }
 
     // Get categories
-    qCategories = queryExecute("
+    qCategories = queryTimed("
         SELECT ID, COUNT(*) as cnt
         FROM Categories
         GROUP BY BusinessID
@@ -38,7 +38,7 @@ try {
     }
 
     // Get sample items
-    qItems = queryExecute("
+    qItems = queryTimed("
         SELECT ID, BusinessID, CategoryID, ParentItemID, Name, IsActive
         FROM Items
         WHERE IsActive = 1
@@ -58,7 +58,7 @@ try {
     }
 
     // Get template links
-    qLinks = queryExecute("
+    qLinks = queryTimed("
         SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID
     ", {}, { datasource: "payfrit" });
     response["template_link_count"] = qLinks.cnt;
diff --git a/api/menu/getForBuilder.cfm b/api/menu/getForBuilder.cfm
index 2712883..2c6a3a8 100644
--- a/api/menu/getForBuilder.cfm
+++ b/api/menu/getForBuilder.cfm
@@ -63,7 +63,7 @@ try {
     // Get all menus for this business
     allMenus = [];
     try {
-        qMenus = queryExecute("
+        qMenus = queryTimed("
             SELECT ID, Name, Description, DaysActive,
                    StartTime, EndTime, SortOrder
             FROM Menus
@@ -123,7 +123,7 @@ try {
     // Check if Categories table has data for this business
     hasCategoriesData = false;
     try {
-        qCatCheck = queryExecute("
+        qCatCheck = queryTimed("
             SELECT 1 FROM Categories WHERE BusinessID = :businessID LIMIT 1
         ", { businessID: businessID }, { datasource: "payfrit" });
         hasCategoriesData = (qCatCheck.recordCount > 0);
@@ -141,7 +141,7 @@ try {
             menuParams["menuID"] = menuID;
         }
 
-        qCategories = queryExecute("
+        qCategories = queryTimed("
             SELECT
                 ID,
                 Name,
@@ -153,7 +153,7 @@ try {
         ", menuParams, { datasource: "payfrit" });
 
         // Get menu items - items that belong to categories (not modifiers)
-        qItems = queryExecute("
+        qItems = queryTimed("
             SELECT
                 i.ID,
                 i.CategoryID as CategoryItemID,
@@ -170,7 +170,7 @@ try {
         ", { businessID: businessID }, { datasource: "payfrit" });
 
         // Get direct modifiers (items with ParentItemID pointing to menu items, not categories)
-        qDirectModifiers = queryExecute("
+        qDirectModifiers = queryTimed("
             SELECT
                 m.ItemID,
                 m.ParentItemID as ParentItemID,
@@ -190,7 +190,7 @@ try {
 
     } else {
         // NEW UNIFIED SCHEMA: Categories are Items at ParentID=0 with children
-        qCategories = queryExecute("
+        qCategories = queryTimed("
             SELECT DISTINCT
                 p.ItemID as CategoryID,
                 p.Name as Name,
@@ -206,7 +206,7 @@ try {
             ORDER BY p.SortOrder, p.Name
         ", { businessID: businessID }, { datasource: "payfrit" });
 
-        qItems = queryExecute("
+        qItems = queryTimed("
             SELECT
                 i.ID,
                 i.ParentItemID as CategoryItemID,
@@ -226,7 +226,7 @@ try {
             ORDER BY i.SortOrder, i.Name
         ", { businessID: businessID }, { datasource: "payfrit" });
 
-        qDirectModifiers = queryExecute("
+        qDirectModifiers = queryTimed("
             SELECT
                 m.ItemID,
                 m.ParentItemID as ParentItemID,
@@ -253,7 +253,7 @@ try {
     // Get template links ONLY for this business's menu items
     qTemplateLinks = queryNew("ParentItemID,TemplateItemID,SortOrder");
     if (arrayLen(menuItemIds) > 0) {
-        qTemplateLinks = queryExecute("
+        qTemplateLinks = queryTimed("
             SELECT
                 tl.ItemID as ParentItemID,
                 tl.TemplateItemID,
@@ -265,7 +265,7 @@ try {
     }
 
     // Get templates for this business only
-    qTemplates = queryExecute("
+    qTemplates = queryTimed("
         SELECT DISTINCT
             t.ItemID,
             t.Name,
@@ -290,7 +290,7 @@ try {
 
     qTemplateChildren = queryNew("ItemID,ParentItemID,Name,Price,IsDefault,SortOrder,RequiresSelection,MaxSelections");
     if (arrayLen(templateIds) > 0) {
-        qTemplateChildren = queryExecute("
+        qTemplateChildren = queryTimed("
             SELECT
                 c.ItemID,
                 c.ParentItemID as ParentItemID,
@@ -441,7 +441,7 @@ try {
     // Get business brand color
     brandColor = "";
     try {
-        qBrand = queryExecute("
+        qBrand = queryTimed("
             SELECT BrandColor AS BusinessBrandColor FROM Businesses WHERE ID = :bizId
         ", { bizId: businessID }, { datasource: "payfrit" });
         if (qBrand.recordCount > 0 && len(trim(qBrand.BusinessBrandColor))) {
diff --git a/api/menu/items.cfm b/api/menu/items.cfm
index 69b4ecf..6c3496d 100644
--- a/api/menu/items.cfm
+++ b/api/menu/items.cfm
@@ -57,7 +57,7 @@
   <!--- Check if new schema is active (BusinessID column exists and has data) --->
   <cfset newSchemaActive = false>
   <cftry>
-    <cfset qCheck = queryExecute(
+    <cfset qCheck = queryTimed(
       "SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = ? AND BusinessID > 0",
       [ { value = BusinessID, cfsqltype = "cf_sql_integer" } ],
       { datasource = "payfrit" }
@@ -74,7 +74,7 @@
     <!--- Check if Categories table has data for this business --->
     <cfset hasCategoriesData = false>
     <cftry>
-      <cfset qCatCheck = queryExecute(
+      <cfset qCatCheck = queryTimed(
         "SELECT COUNT(*) as cnt FROM Categories WHERE BusinessID = ?",
         [ { value = BusinessID, cfsqltype = "cf_sql_integer" } ],
         { datasource = "payfrit" }
@@ -91,7 +91,7 @@
       <cfset activeMenuIds = "">
       <cfset menuList = []>
       <cftry>
-        <cfset qAllMenus = queryExecute(
+        <cfset qAllMenus = queryTimed(
           "
             SELECT ID, Name FROM Menus
             WHERE BusinessID = :bizId
@@ -124,7 +124,7 @@
 
       <!--- Get category headers as virtual items --->
       <!--- Apply schedule filtering, order type filtering, and menu filtering --->
-      <cfset qCategories = queryExecute(
+      <cfset qCategories = queryTimed(
         "
           SELECT
             ID,
@@ -178,7 +178,7 @@
       <cfif len(trim(visibleCategoryIds)) EQ 0>
         <cfset visibleCategoryIds = "0">
       </cfif>
-      <cfset q = queryExecute(
+      <cfset q = queryTimed(
         "
           SELECT
             i.ID,
@@ -214,7 +214,7 @@
       )>
     <cfelse>
       <!--- Fallback: Derive categories from parent Items --->
-      <cfset q = queryExecute(
+      <cfset q = queryTimed(
         "
           SELECT
             i.ID,
@@ -269,7 +269,7 @@
     </cfif>
   <cfelse>
     <!--- OLD SCHEMA: Use Categories table --->
-    <cfset q = queryExecute(
+    <cfset q = queryTimed(
       "
         SELECT
           i.ID,
@@ -401,7 +401,7 @@
   <!--- For unified schema: Add template-linked modifiers as virtual children of menu items --->
   <cfif newSchemaActive>
     <!--- Get template links: which menu items use which templates --->
-    <cfset qTemplateLinks = queryExecute(
+    <cfset qTemplateLinks = queryTimed(
       "
         SELECT
           tl.ItemID as MenuItemID,
@@ -424,7 +424,7 @@
     )>
 
     <!--- Get template options --->
-    <cfset qTemplateOptions = queryExecute(
+    <cfset qTemplateOptions = queryTimed(
       "
         SELECT DISTINCT
           opt.ID as OptionItemID,
@@ -532,7 +532,7 @@
   <!--- Get brand color for this business --->
   <cfset brandColor = "">
   <cftry>
-    <cfset qBrand = queryExecute(
+    <cfset qBrand = queryTimed(
       "SELECT BrandColor AS BusinessBrandColor FROM Businesses WHERE ID = ?",
       [ { value = BusinessID, cfsqltype = "cf_sql_integer" } ],
       { datasource = "payfrit" }
diff --git a/api/menu/listCategories.cfm b/api/menu/listCategories.cfm
index 57f0b7c..c85c937 100644
--- a/api/menu/listCategories.cfm
+++ b/api/menu/listCategories.cfm
@@ -40,7 +40,7 @@ try {
         abort;
     }
 
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             ID,
             BusinessID,
diff --git a/api/menu/menus.cfm b/api/menu/menus.cfm
index 9191e6c..69a1c85 100644
--- a/api/menu/menus.cfm
+++ b/api/menu/menus.cfm
@@ -39,7 +39,7 @@ try {
     switch (action) {
         case "list":
             // Get all active menus for this business
-            qMenus = queryExecute("
+            qMenus = queryTimed("
                 SELECT
                     ID,
                     Name,
@@ -58,7 +58,7 @@ try {
             menus = [];
             for (i = 1; i <= qMenus.recordCount; i++) {
                 // Count categories in this menu
-                qCatCount = queryExecute("
+                qCatCount = queryTimed("
                     SELECT COUNT(*) as cnt FROM Categories
                     WHERE BusinessID = :businessID
                       AND MenuID = :menuID
@@ -90,7 +90,7 @@ try {
                 apiAbort({ "OK": false, "ERROR": "missing_menu_id", "MESSAGE": "MenuID is required" });
             }
 
-            qMenu = queryExecute("
+            qMenu = queryTimed("
                 SELECT * FROM Menus
                 WHERE ID = :menuID AND BusinessID = :businessID
             ", { menuID: menuID, businessID: businessID }, { datasource: "payfrit" });
@@ -130,7 +130,7 @@ try {
 
             if (menuID > 0) {
                 // Update existing menu
-                queryExecute("
+                queryTimed("
                     UPDATE Menus SET
                         Name = :menuName,
                         Description = :menuDescription,
@@ -153,7 +153,7 @@ try {
                 response = { "OK": true, "MenuID": menuID, "ACTION": "updated" };
             } else {
                 // Create new menu
-                queryExecute("
+                queryTimed("
                     INSERT INTO Menus (
                         BusinessID, Name, Description,
                         DaysActive, StartTime, EndTime,
@@ -173,7 +173,7 @@ try {
                     menuSortOrder: { value: menuSortOrder, cfsqltype: "cf_sql_integer" }
                 }, { datasource: "payfrit" });
 
-                result = queryExecute("SELECT LAST_INSERT_ID() as newID", {}, { datasource: "payfrit" });
+                result = queryTimed("SELECT LAST_INSERT_ID() as newID", {}, { datasource: "payfrit" });
                 response = { "OK": true, "MenuID": result.newID, "ACTION": "created" };
             }
             break;
@@ -186,21 +186,21 @@ try {
             }
 
             // Check if menu has categories/items for warning
-            qCatCheck = queryExecute("
+            qCatCheck = queryTimed("
                 SELECT COUNT(*) as cnt FROM Categories
                 WHERE MenuID = :menuID AND BusinessID = :businessID
             ", { menuID: menuID, businessID: businessID }, { datasource: "payfrit" });
 
             // Unassign categories from this menu
             if (qCatCheck.cnt > 0) {
-                queryExecute("
+                queryTimed("
                     UPDATE Categories SET MenuID = 0
                     WHERE MenuID = :menuID AND BusinessID = :businessID
                 ", { menuID: menuID, businessID: businessID }, { datasource: "payfrit" });
             }
 
             // Soft-delete the menu
-            queryExecute("
+            queryTimed("
                 UPDATE Menus SET IsActive = 0
                 WHERE ID = :menuID AND BusinessID = :businessID
             ", { menuID: menuID, businessID: businessID }, { datasource: "payfrit" });
@@ -221,7 +221,7 @@ try {
             }
 
             for (i = 1; i <= arrayLen(menuOrder); i++) {
-                queryExecute("
+                queryTimed("
                     UPDATE Menus SET SortOrder = :sortOrder
                     WHERE ID = :menuID AND BusinessID = :businessID
                 ", {
diff --git a/api/menu/saveCategory.cfm b/api/menu/saveCategory.cfm
index 3bc66c1..03e4ed5 100644
--- a/api/menu/saveCategory.cfm
+++ b/api/menu/saveCategory.cfm
@@ -50,7 +50,7 @@ try {
 
     if (CategoryID > 0) {
         // Update existing category
-        queryExecute("
+        queryTimed("
             UPDATE Categories SET
                 Name = :name,
                 SortOrder = :sortOrder,
@@ -75,7 +75,7 @@ try {
 
     } else if (BusinessID > 0 && len(Name)) {
         // Insert new category
-        queryExecute("
+        queryTimed("
             INSERT INTO Categories
             (BusinessID, Name, SortOrder, OrderTypes,
              ScheduleStart, ScheduleEnd, ScheduleDays, AddedOn)
@@ -91,7 +91,7 @@ try {
             schedDays: { value = ScheduleDays, cfsqltype = "cf_sql_varchar", null = isNull(ScheduleDays) }
         }, { datasource = "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as newId", {}, { datasource = "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as newId", {}, { datasource = "payfrit" });
         response["OK"] = true;
         response["CategoryID"] = qNew.newId;
         response["MESSAGE"] = "Category created";
diff --git a/api/menu/saveFromBuilder.cfm b/api/menu/saveFromBuilder.cfm
index dcbd92b..0833d02 100644
--- a/api/menu/saveFromBuilder.cfm
+++ b/api/menu/saveFromBuilder.cfm
@@ -22,7 +22,7 @@ function saveOptionsRecursive(options, parentID, businessID) {
 
         if (optDbId > 0) {
             optionID = optDbId;
-            queryExecute("
+            queryTimed("
                 UPDATE Items
                 SET Name = :name,
                     Price = :price,
@@ -43,7 +43,7 @@ function saveOptionsRecursive(options, parentID, businessID) {
                 maxSelections: maxSelections
             });
         } else {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (
                     BusinessID, ParentItemID, Name, Price,
                     IsCheckedByDefault, SortOrder, IsActive, AddedOn,
@@ -64,7 +64,7 @@ function saveOptionsRecursive(options, parentID, businessID) {
                 maxSelections: maxSelections
             });
 
-            var result = queryExecute("SELECT LAST_INSERT_ID() as newID");
+            var result = queryTimed("SELECT LAST_INSERT_ID() as newID");
             optionID = result.newID;
         }
 
@@ -98,7 +98,7 @@ try {
     // Check if new schema is active
     newSchemaActive = false;
     try {
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT 1 FROM Items
             WHERE BusinessID = :businessID AND BusinessID > 0
             LIMIT 1
@@ -118,7 +118,7 @@ try {
             if (newSchemaActive) {
                 if (categoryDbId > 0) {
                     categoryID = categoryDbId;
-                    queryExecute("
+                    queryTimed("
                         UPDATE Items
                         SET Name = :name,
                             SortOrder = :sortOrder
@@ -131,7 +131,7 @@ try {
                         sortOrder: catSortOrder
                     });
                 } else {
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO Items (
                             BusinessID, Name, Description,
                             ParentItemID, Price, IsActive,
@@ -147,7 +147,7 @@ try {
                         sortOrder: catSortOrder
                     });
 
-                    result = queryExecute("SELECT LAST_INSERT_ID() as newID");
+                    result = queryTimed("SELECT LAST_INSERT_ID() as newID");
                     categoryID = result.newID;
                 }
             } else {
@@ -157,7 +157,7 @@ try {
 
                 if (categoryDbId > 0) {
                     categoryID = categoryDbId;
-                    queryExecute("
+                    queryTimed("
                         UPDATE Categories
                         SET Name = :name,
                             SortOrder = :sortOrder,
@@ -170,7 +170,7 @@ try {
                         menuId: categoryMenuIdParam
                     });
                 } else {
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO Categories (BusinessID, MenuID, Name, SortOrder, AddedOn)
                         VALUES (:businessID, :menuId, :name, :sortOrder, NOW())
                     ", {
@@ -180,7 +180,7 @@ try {
                         sortOrder: catSortOrder
                     });
 
-                    result = queryExecute("SELECT LAST_INSERT_ID() as newID");
+                    result = queryTimed("SELECT LAST_INSERT_ID() as newID");
                     categoryID = result.newID;
                 }
             }
@@ -196,7 +196,7 @@ try {
                         itemID = itemDbId;
 
                         if (newSchemaActive) {
-                            queryExecute("
+                            queryTimed("
                                 UPDATE Items
                                 SET Name = :name,
                                     Description = :description,
@@ -213,7 +213,7 @@ try {
                                 sortOrder: itemSortOrder
                             });
                         } else {
-                            queryExecute("
+                            queryTimed("
                                 UPDATE Items
                                 SET Name = :name,
                                     Description = :description,
@@ -232,7 +232,7 @@ try {
                         }
                     } else {
                         if (newSchemaActive) {
-                            queryExecute("
+                            queryTimed("
                                 INSERT INTO Items (
                                     BusinessID, ParentItemID, Name, Description,
                                     Price, SortOrder, IsActive, AddedOn, CategoryID
@@ -249,7 +249,7 @@ try {
                                 sortOrder: itemSortOrder
                             });
                         } else {
-                            queryExecute("
+                            queryTimed("
                                 INSERT INTO Items (
                                     BusinessID, CategoryID, Name, Description,
                                     Price, SortOrder, IsActive, ParentItemID, AddedOn
@@ -267,14 +267,14 @@ try {
                             });
                         }
 
-                        result = queryExecute("SELECT LAST_INSERT_ID() as newID");
+                        result = queryTimed("SELECT LAST_INSERT_ID() as newID");
                         itemID = result.newID;
                     }
 
                     // Handle modifiers
                     if (structKeyExists(item, "modifiers") && isArray(item.modifiers) && arrayLen(item.modifiers) > 0) {
                         // Clear existing template links for this item
-                        queryExecute("DELETE FROM lt_ItemID_TemplateItemID WHERE ItemID = :itemID", { itemID: itemID });
+                        queryTimed("DELETE FROM lt_ItemID_TemplateItemID WHERE ItemID = :itemID", { itemID: itemID });
 
                         modSortOrder = 0;
                         for (mod in item.modifiers) {
@@ -284,7 +284,7 @@ try {
 
                             if (structKeyExists(mod, "isTemplate") && mod.isTemplate && modDbId > 0) {
                                 // This is a template reference - create link
-                                queryExecute("
+                                queryTimed("
                                     INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
                                     VALUES (:itemID, :templateID, :sortOrder)
                                     ON DUPLICATE KEY UPDATE SortOrder = :sortOrder
@@ -295,7 +295,7 @@ try {
                                 });
 
                                 // Update template's selection rules
-                                queryExecute("
+                                queryTimed("
                                     UPDATE Items
                                     SET RequiresChildSelection = :requiresSelection,
                                         MaxNumSelectionReq = :maxSelections
@@ -315,7 +315,7 @@ try {
                                 }
                             } else if (modDbId > 0) {
                                 // Direct modifier (not a template) - update it
-                                queryExecute("
+                                queryTimed("
                                     UPDATE Items
                                     SET Name = :name,
                                         Price = :price,
@@ -341,7 +341,7 @@ try {
                                 }
                             } else {
                                 // New direct modifier - insert it
-                                queryExecute("
+                                queryTimed("
                                     INSERT INTO Items (
                                         BusinessID, ParentItemID, Name, Price,
                                         IsCheckedByDefault, SortOrder, IsActive, AddedOn,
@@ -362,7 +362,7 @@ try {
                                     maxSelections: maxSelections
                                 });
 
-                                modResult = queryExecute("SELECT LAST_INSERT_ID() as newModID");
+                                modResult = queryTimed("SELECT LAST_INSERT_ID() as newModID");
                                 newModID = modResult.newModID;
                                 if (structKeyExists(mod, "options") && isArray(mod.options)) {
                                     saveOptionsRecursive(mod.options, newModID, businessID);
diff --git a/api/menu/updateStations.cfm b/api/menu/updateStations.cfm
index a3d1b68..9fa8fff 100644
--- a/api/menu/updateStations.cfm
+++ b/api/menu/updateStations.cfm
@@ -39,7 +39,7 @@
 
   <!--- First, clear all station assignments for items in this business --->
   <!--- Support both unified schema (BusinessID) and legacy (via Categories) --->
-  <cfset queryExecute("
+  <cfset queryTimed("
     UPDATE Items
     SET StationID = NULL
     WHERE BusinessID = ?
@@ -48,7 +48,7 @@
   <!--- Then apply the new assignments --->
   <cfloop array="#Assignments#" index="assignment">
     <cfif structKeyExists(assignment, "ItemID") AND structKeyExists(assignment, "StationID")>
-      <cfset queryExecute("
+      <cfset queryTimed("
         UPDATE Items
         SET StationID = ?
         WHERE ItemID = ?
diff --git a/api/orders/abandonOrder.cfm b/api/orders/abandonOrder.cfm
index 29f4a78..531fcaa 100644
--- a/api/orders/abandonOrder.cfm
+++ b/api/orders/abandonOrder.cfm
@@ -36,7 +36,7 @@
 
 <cftry>
   <!--- Verify order exists and is in cart status (0) --->
-  <cfset qOrder = queryExecute(
+  <cfset qOrder = queryTimed(
     "SELECT ID, StatusID FROM Orders WHERE ID = ? LIMIT 1",
     [{ value = OrderID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
@@ -51,14 +51,14 @@
   </cfif>
 
   <!--- Delete line items --->
-  <cfset queryExecute(
+  <cfset queryTimed(
     "DELETE FROM OrderLineItems WHERE OrderID = ?",
     [{ value = OrderID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
   )>
 
   <!--- Mark order with status 7 (Deleted and started new cart) --->
-  <cfset queryExecute(
+  <cfset queryTimed(
     "UPDATE Orders SET StatusID = 7, LastEditedOn = NOW() WHERE ID = ?",
     [{ value = OrderID, cfsqltype = "cf_sql_integer" }],
     { datasource = "payfrit" }
diff --git a/api/orders/debugLineItems.cfm b/api/orders/debugLineItems.cfm
index 661f592..5a4d926 100644
--- a/api/orders/debugLineItems.cfm
+++ b/api/orders/debugLineItems.cfm
@@ -12,7 +12,7 @@
 </cfif>
 
 <cftry>
-  <cfset qLineItems = queryExecute("
+  <cfset qLineItems = queryTimed("
     SELECT
       oli.ID,
       oli.ParentOrderLineItemID,
diff --git a/api/orders/getActiveCart.cfm b/api/orders/getActiveCart.cfm
index a9800ad..e1743ba 100644
--- a/api/orders/getActiveCart.cfm
+++ b/api/orders/getActiveCart.cfm
@@ -27,7 +27,7 @@ try {
     }
 
     // Get active cart (status = 0) for this user
-    qCart = queryExecute("
+    qCart = queryTimed("
         SELECT
             o.ID,
             o.UUID,
diff --git a/api/orders/getCart.cfm b/api/orders/getCart.cfm
index 10f5094..4b0ca24 100644
--- a/api/orders/getCart.cfm
+++ b/api/orders/getCart.cfm
@@ -34,7 +34,7 @@
 </cfif>
 
 <cftry>
-  <cfset qOrder = queryExecute(
+  <cfset qOrder = queryTimed(
     "
       SELECT
         ID,
@@ -66,7 +66,7 @@
   </cfif>
 
   <!--- Get business info for display in cart --->
-  <cfset qBusiness = queryExecute(
+  <cfset qBusiness = queryTimed(
     "SELECT DeliveryFlatFee, OrderTypes FROM Businesses WHERE ID = ? LIMIT 1",
     [ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
     { datasource = "payfrit" }
@@ -75,7 +75,7 @@
   <cfset businessOrderTypes = qBusiness.recordCount GT 0 AND len(trim(qBusiness.OrderTypes)) ? qBusiness.OrderTypes : "1,2,3">
   <cfset businessOrderTypesArray = listToArray(businessOrderTypes, ",")>
 
-  <cfset qLI = queryExecute(
+  <cfset qLI = queryTimed(
     "
       SELECT
         oli.ID,
diff --git a/api/orders/getDetail.cfm b/api/orders/getDetail.cfm
index c8183dd..07e98cb 100644
--- a/api/orders/getDetail.cfm
+++ b/api/orders/getDetail.cfm
@@ -42,7 +42,7 @@ try {
     }
 
     // Get order details
-    qOrder = queryExecute("
+    qOrder = queryTimed("
         SELECT
             o.ID,
             o.BusinessID,
@@ -78,7 +78,7 @@ try {
     }
 
     // Get line items (excluding deleted items)
-    qItems = queryExecute("
+    qItems = queryTimed("
         SELECT
             oli.ID,
             oli.ItemID,
@@ -151,7 +151,7 @@ try {
     total = subtotal + tax + tip;
 
     // Get staff who worked on this order (from Tasks table) with pending rating tokens
-    qStaff = queryExecute("
+    qStaff = queryTimed("
         SELECT DISTINCT u.ID, u.FirstName,
                (SELECT r.AccessToken
                 FROM TaskRatings r
diff --git a/api/orders/getOrCreateCart.cfm b/api/orders/getOrCreateCart.cfm
index 9ec14fd..516eab1 100644
--- a/api/orders/getOrCreateCart.cfm
+++ b/api/orders/getOrCreateCart.cfm
@@ -30,7 +30,7 @@
   <cfargument name="OrderID" type="numeric" required="true">
 
   <cfset var out = {}>
-  <cfset var qOrder = queryExecute(
+  <cfset var qOrder = queryTimed(
     "
       SELECT
         ID,
@@ -65,7 +65,7 @@
   </cfif>
 
   <!--- Get business delivery fee for display in cart --->
-  <cfset var qBusiness = queryExecute(
+  <cfset var qBusiness = queryTimed(
     "SELECT DeliveryFlatFee FROM Businesses WHERE ID = ? LIMIT 1",
     [ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
     { datasource = "payfrit" }
@@ -95,7 +95,7 @@
     "GrantEconomicsValue": val(qOrder.GrantEconomicsValue)
   }>
 
-  <cfset var qLI = queryExecute(
+  <cfset var qLI = queryTimed(
     "
       SELECT
         oli.ID,
@@ -179,7 +179,7 @@
 <cftry>
   <!--- Find existing cart (StatusID=0 assumed cart) --->
   <!--- Look for any active cart for this user/business - order type can be changed later --->
-  <cfset qFind = queryExecute(
+  <cfset qFind = queryTimed(
     "
       SELECT ID, OrderTypeID
       FROM Orders
@@ -199,7 +199,7 @@
   <cfif qFind.recordCount GT 0>
     <!--- Always update the service point to match the current table/beacon --->
     <cfif ServicePointID GT 0>
-      <cfset queryExecute(
+      <cfset queryTimed(
         "UPDATE Orders SET ServicePointID = ?, LastEditedOn = ? WHERE ID = ?",
         [
           { value = ServicePointID, cfsqltype = "cf_sql_integer" },
@@ -213,14 +213,14 @@
     <!--- Check if cart order type differs from requested and cart is empty --->
     <!--- If so, update the cart's order type to match the new flow --->
     <cfif qFind.OrderTypeID NEQ OrderTypeID>
-      <cfset qLineItems = queryExecute(
+      <cfset qLineItems = queryTimed(
         "SELECT COUNT(*) AS ItemCount FROM OrderLineItems WHERE OrderID = ? AND IsDeleted = 0",
         [ { value = qFind.ID, cfsqltype = "cf_sql_integer" } ],
         { datasource = "payfrit" }
       )>
       <!--- Only update order type if cart is empty (allows switching flows) --->
       <cfif qLineItems.ItemCount EQ 0>
-        <cfset queryExecute(
+        <cfset queryTimed(
           "UPDATE Orders SET OrderTypeID = ?, LastEditedOn = ? WHERE ID = ?",
           [
             { value = OrderTypeID, cfsqltype = "cf_sql_integer" },
@@ -236,7 +236,7 @@
   </cfif>
 
   <!--- Create new cart order --->
-  <cfset qBiz = queryExecute(
+  <cfset qBiz = queryTimed(
     "
       SELECT DeliveryMultiplier, DeliveryFlatFee
       FROM Businesses
@@ -257,14 +257,14 @@
   <cfset grantEconomicsType = "">
   <cfset grantEconomicsValue = 0>
   <cfif ServicePointID GT 0>
-    <cfset qSPOwner = queryExecute(
+    <cfset qSPOwner = queryTimed(
       "SELECT BusinessID FROM ServicePoints WHERE ID = ? LIMIT 1",
       [ { value = ServicePointID, cfsqltype = "cf_sql_integer" } ],
       { datasource = "payfrit" }
     )>
     <cfif qSPOwner.recordCount GT 0 AND qSPOwner.BusinessID NEQ BusinessID>
       <!--- SP belongs to another business - check for active grant --->
-      <cfset qGrant = queryExecute(
+      <cfset qGrant = queryTimed(
         "SELECT ID, OwnerBusinessID, EconomicsType, EconomicsValue, EligibilityScope, TimePolicyType, TimePolicyData
          FROM ServicePointGrants
          WHERE GuestBusinessID = ? AND ServicePointID = ? AND StatusID = 1
@@ -303,14 +303,14 @@
   <cfset deliveryFee = (OrderTypeID EQ 3) ? qBiz.DeliveryFlatFee : 0>
 
   <!--- Generate new OrderID (table is not auto-inc in SSOT) --->
-  <cfset qNext = queryExecute(
+  <cfset qNext = queryTimed(
     "SELECT IFNULL(MAX(ID),0) + 1 AS NextID FROM Orders",
     [],
     { datasource = "payfrit" }
   )>
   <cfset NewOrderID = qNext.NextID>
 
-  <cfset queryExecute(
+  <cfset queryTimed(
     "
       INSERT INTO Orders (
         ID,
@@ -374,7 +374,7 @@
   )>
 
   <!--- Per your rule: OrderID is determined by selecting highest after creation --->
-  <cfset qLatest = queryExecute(
+  <cfset qLatest = queryTimed(
     "SELECT MAX(ID) AS NextID FROM Orders",
     [],
     { datasource = "payfrit" }
diff --git a/api/orders/getPendingForUser.cfm b/api/orders/getPendingForUser.cfm
index a302255..5436b6e 100644
--- a/api/orders/getPendingForUser.cfm
+++ b/api/orders/getPendingForUser.cfm
@@ -37,7 +37,7 @@ try {
 
     // Get orders with status 1 (Submitted), 2 (Preparing), or 3 (Ready)
     // These are orders that are paid but not yet completed/picked up
-    qOrders = queryExecute("
+    qOrders = queryTimed("
         SELECT
             o.ID,
             o.UUID,
diff --git a/api/orders/history.cfm b/api/orders/history.cfm
index 0333a47..1fced3f 100644
--- a/api/orders/history.cfm
+++ b/api/orders/history.cfm
@@ -38,7 +38,7 @@ if (structKeyExists(request, "UserID") && isNumeric(request.UserID) && request.U
   userToken = getHeader("X-User-Token");
   if (len(userToken)) {
     try {
-      qTok = queryExecute(
+      qTok = queryTimed(
         "SELECT UserID FROM UserTokens WHERE Token = ? LIMIT 1",
         [ { value = userToken, cfsqltype = "cf_sql_varchar" } ],
         { datasource = "payfrit" }
@@ -63,7 +63,7 @@ if (offset < 0) offset = 0;
 
 try {
   // Get orders for this user (exclude carts - status 0)
-  qOrders = queryExecute("
+  qOrders = queryTimed("
     SELECT
       o.ID,
       o.UUID,
@@ -93,7 +93,7 @@ try {
   });
 
   // Get total count
-  qCount = queryExecute("
+  qCount = queryTimed("
     SELECT COUNT(*) as TotalCount
     FROM Orders
     WHERE UserID = :userId
@@ -104,7 +104,7 @@ try {
   orders = [];
   for (row in qOrders) {
     // Get line item count and calculate total
-    qItems = queryExecute("
+    qItems = queryTimed("
       SELECT
         COUNT(*) as ItemCount,
         SUM(Quantity * Price) as Subtotal
diff --git a/api/orders/listForKDS.cfm b/api/orders/listForKDS.cfm
index 0c868bb..e111d76 100644
--- a/api/orders/listForKDS.cfm
+++ b/api/orders/listForKDS.cfm
@@ -58,7 +58,7 @@
   <cfif StationID GT 0>
     <cfset stationParams = duplicate(params)>
     <cfset arrayAppend(stationParams, { value = StationID, cfsqltype = "cf_sql_integer" })>
-    <cfset qOrders = queryExecute("
+    <cfset qOrders = queryTimed("
       SELECT DISTINCT
         o.ID,
         o.UUID,
@@ -84,7 +84,7 @@
       ORDER BY o.SubmittedOn ASC, o.ID ASC
     ", stationParams, { datasource = "payfrit" })>
   <cfelse>
-    <cfset qOrders = queryExecute("
+    <cfset qOrders = queryTimed("
       SELECT
         o.ID,
         o.UUID,
@@ -113,7 +113,7 @@
     <!--- Get line items for this order --->
     <!--- If filtering by station, only show items for that station (plus modifiers) --->
     <cfif StationID GT 0>
-      <cfset qLineItems = queryExecute("
+      <cfset qLineItems = queryTimed("
         SELECT
           oli.ID,
           oli.ParentOrderLineItemID,
@@ -139,7 +139,7 @@
         { value = StationID, cfsqltype = "cf_sql_integer" }
       ], { datasource = "payfrit" })>
     <cfelse>
-      <cfset qLineItems = queryExecute("
+      <cfset qLineItems = queryTimed("
         SELECT
           oli.ID,
           oli.ParentOrderLineItemID,
diff --git a/api/orders/setLineItem.cfm b/api/orders/setLineItem.cfm
index 3af7d76..6da0cd2 100644
--- a/api/orders/setLineItem.cfm
+++ b/api/orders/setLineItem.cfm
@@ -30,7 +30,7 @@
   <cfargument name="tableName" type="string" required="true">
   <cfargument name="idField" type="string" required="true">
 
-  <cfset var q = queryExecute(
+  <cfset var q = queryTimed(
     "SELECT IFNULL(MAX(#arguments.idField#),0) + 1 AS NextID FROM #arguments.tableName#",
     [],
     { datasource = "payfrit" }
@@ -44,7 +44,7 @@
   <cfargument name="ParentItemID" type="numeric" required="true">
 
   <!--- Find immediate children where checked by default --->
-  <cfset var qKids = queryExecute(
+  <cfset var qKids = queryTimed(
     "
       SELECT ID, Price
       FROM Items
@@ -58,7 +58,7 @@
   )>
 
   <!--- Also find default children from templates linked to this item --->
-  <cfset var qTemplateKids = queryExecute(
+  <cfset var qTemplateKids = queryTimed(
     "
       SELECT i.ID, i.Price
       FROM lt_ItemID_TemplateItemID tl
@@ -99,7 +99,7 @@
   <cfargument name="Price" type="numeric" required="true">
 
   <!--- If existing, undelete; else insert new --->
-  <cfset var qExisting = queryExecute(
+  <cfset var qExisting = queryTimed(
     "
       SELECT ID
       FROM OrderLineItems
@@ -117,7 +117,7 @@
   )>
 
   <cfif qExisting.recordCount GT 0>
-    <cfset queryExecute(
+    <cfset queryTimed(
       "
         UPDATE OrderLineItems
         SET IsDeleted = b'0'
@@ -129,7 +129,7 @@
     <cfset attachDefaultChildren(arguments.OrderID, qExisting.ID, arguments.ItemID)>
   <cfelse>
     <cfset var NewLIID = nextId("OrderLineItems","ID")>
-    <cfset queryExecute(
+    <cfset queryTimed(
       "
         INSERT INTO OrderLineItems (
           ID,
@@ -173,7 +173,7 @@
   <cfargument name="OrderID" type="numeric" required="true">
 
   <cfset var out = {}>
-  <cfset var qOrder = queryExecute(
+  <cfset var qOrder = queryTimed(
     "
       SELECT
         o.ID,
@@ -224,7 +224,7 @@
     "BusinessDeliveryFee": val(qOrder.BusinessDeliveryFee)
   }>
 
-  <cfset var qLI = queryExecute(
+  <cfset var qLI = queryTimed(
     "
       SELECT
         oli.ID,
@@ -316,7 +316,7 @@
 
 <cftry>
   <!--- Load item price --->
-  <cfset qItem = queryExecute(
+  <cfset qItem = queryTimed(
     "
       SELECT ID, Price, ParentItemID, IsActive
       FROM Items
@@ -355,7 +355,7 @@
     <!--- If so, deselect siblings when selecting a new item --->
     <cfif IsSelected>
       <!--- Get the parent line item's ItemID to check maxSel --->
-      <cfset qParentLI = queryExecute(
+      <cfset qParentLI = queryTimed(
         "SELECT ItemID FROM OrderLineItems WHERE ID = ? LIMIT 1",
         [ { value = ParentLineItemID, cfsqltype = "cf_sql_integer" } ],
         { datasource = "payfrit" }
@@ -363,7 +363,7 @@
 
       <cfif qParentLI.recordCount GT 0>
         <!--- Check if this parent item has maxSel = 1 (exclusive selection) --->
-        <cfset qParentItem = queryExecute(
+        <cfset qParentItem = queryTimed(
           "SELECT MaxNumSelectionReq FROM Items WHERE ID = ? LIMIT 1",
           [ { value = qParentLI.ItemID, cfsqltype = "cf_sql_integer" } ],
           { datasource = "payfrit" }
@@ -371,7 +371,7 @@
 
         <cfif qParentItem.recordCount GT 0 AND val(qParentItem.MaxNumSelectionReq) EQ 1>
           <!--- Exclusive selection: deselect all other siblings under this parent --->
-          <cfset queryExecute(
+          <cfset queryTimed(
             "
               UPDATE OrderLineItems
               SET IsDeleted = b'1'
@@ -397,7 +397,7 @@
     <!--- ForceNew: Skip existing lookup, will always create new line item --->
     <cfset qExisting = queryNew("ID", "integer")>
   <cfelse>
-    <cfset qExisting = queryExecute(
+    <cfset qExisting = queryTimed(
       "
         SELECT ID
         FROM OrderLineItems
@@ -422,7 +422,7 @@
     <!--- Update existing --->
     <cfset arrayAppend(request.attachDebug, "Path: update existing")>
     <cfif IsSelected>
-      <cfset queryExecute(
+      <cfset queryTimed(
         "
           UPDATE OrderLineItems
           SET
@@ -450,7 +450,7 @@
       <cfset attachDefaultChildren(OrderID, qExisting.ID, ItemID)>
       <cfset arrayAppend(request.attachDebug, "AFTER attachDefaultChildren call")>
     <cfelse>
-      <cfset queryExecute(
+      <cfset queryTimed(
         "
           UPDATE OrderLineItems
           SET IsDeleted = b'1'
@@ -465,7 +465,7 @@
     <cfif IsSelected>
       <cfset NewLIID = nextId("OrderLineItems","ID")>
 
-      <cfset queryExecute(
+      <cfset queryTimed(
         "
           INSERT INTO OrderLineItems (
             ID,
@@ -510,7 +510,7 @@
 
   <!--- Touch order last edited --->
   <cftry>
-    <cfset queryExecute(
+    <cfset queryTimed(
       "UPDATE Orders SET LastEditedOn = ? WHERE ID = ?",
       [
         { value = now(), cfsqltype = "cf_sql_timestamp" },
diff --git a/api/orders/setOrderType.cfm b/api/orders/setOrderType.cfm
index 0d6d420..c6a3de4 100644
--- a/api/orders/setOrderType.cfm
+++ b/api/orders/setOrderType.cfm
@@ -30,7 +30,7 @@
   <cfargument name="OrderID" type="numeric" required="true">
 
   <cfset var out = {}>
-  <cfset var qOrder = queryExecute(
+  <cfset var qOrder = queryTimed(
     "
       SELECT
         ID,
@@ -61,7 +61,7 @@
   </cfif>
 
   <!--- Get business delivery fee for display in cart --->
-  <cfset var qBusiness = queryExecute(
+  <cfset var qBusiness = queryTimed(
     "SELECT DeliveryFlatFee FROM Businesses WHERE ID = ? LIMIT 1",
     [ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
     { datasource = "payfrit" }
@@ -87,7 +87,7 @@
     "ServicePointID": val(qOrder.ServicePointID)
   }>
 
-  <cfset var qLI = queryExecute(
+  <cfset var qLI = queryTimed(
     "
       SELECT
         oli.ID,
@@ -178,7 +178,7 @@
 
 <cftry>
   <!--- Verify order exists and is still a cart (status 0) --->
-  <cfset qOrder = queryExecute(
+  <cfset qOrder = queryTimed(
     "
       SELECT ID, BusinessID, StatusID
       FROM Orders
@@ -200,7 +200,7 @@
   <!--- Get delivery fee from business if delivery --->
   <cfset deliveryFee = 0>
   <cfif OrderTypeID EQ 3>
-    <cfset qBiz = queryExecute(
+    <cfset qBiz = queryTimed(
       "SELECT DeliveryFlatFee FROM Businesses WHERE ID = ? LIMIT 1",
       [ { value = qOrder.BusinessID, cfsqltype = "cf_sql_integer" } ],
       { datasource = "payfrit" }
@@ -214,7 +214,7 @@
   <cftry>
     <cfif OrderTypeID EQ 3>
       <!--- Delivery: set address and fee --->
-      <cfset queryExecute(
+      <cfset queryTimed(
         "
           UPDATE Orders
           SET OrderTypeID = ?,
@@ -234,7 +234,7 @@
       )>
     <cfelse>
       <!--- Takeaway/Dine-in: clear address and fee --->
-      <cfset queryExecute(
+      <cfset queryTimed(
         "
           UPDATE Orders
           SET OrderTypeID = ?,
diff --git a/api/orders/submit.cfm b/api/orders/submit.cfm
index 25b1591..c6dc3f7 100644
--- a/api/orders/submit.cfm
+++ b/api/orders/submit.cfm
@@ -34,7 +34,7 @@
   <cfset out.children = {}> <!--- parentLineItemId -> array(lineItemId) --->
   <cfset out.itemMeta = {}> <!--- ItemID -> struct(meta) --->
 
-  <cfset var qLI = queryExecute(
+  <cfset var qLI = queryTimed(
     "
       SELECT
         ID,
@@ -76,7 +76,7 @@
   <cfset var uniqIds = structKeyArray(uniq)>
   <cfif arrayLen(uniqIds) GT 0>
     <cfset var inList = arrayToList(uniqIds)>
-    <cfset var qMeta = queryExecute(
+    <cfset var qMeta = queryTimed(
       "
         SELECT
           ID,
@@ -139,7 +139,7 @@
 </cfif>
 
 <cftry>
-  <cfset qOrder = queryExecute(
+  <cfset qOrder = queryTimed(
     "
       SELECT o.ID, o.StatusID, o.OrderTypeID, o.BusinessID, o.ServicePointID,
              o.GrantID, o.GrantOwnerBusinessID,
@@ -168,7 +168,7 @@
 
   <!--- Delivery orders require an address --->
   <cfif qOrder.OrderTypeID EQ 3>
-    <cfset qAddr = queryExecute(
+    <cfset qAddr = queryTimed(
       "SELECT AddressID FROM Orders WHERE ID = ? LIMIT 1",
       [ { value = OrderID, cfsqltype = "cf_sql_integer" } ],
       { datasource = "payfrit" }
@@ -180,7 +180,7 @@
 
   <!--- SP-SM: Re-validate grant is still active (instant revocation enforcement) --->
   <cfif val(qOrder.GrantID) GT 0>
-    <cfset qGrantCheck = queryExecute(
+    <cfset qGrantCheck = queryTimed(
       "SELECT StatusID, TimePolicyType, TimePolicyData
        FROM ServicePointGrants WHERE ID = ? LIMIT 1",
       [ { value = qOrder.GrantID, cfsqltype = "cf_sql_integer" } ],
@@ -195,7 +195,7 @@
   </cfif>
 
   <!--- Must have at least one non-deleted root line item --->
-  <cfset qRoots = queryExecute(
+  <cfset qRoots = queryTimed(
     "
       SELECT COUNT(*) AS Cnt
       FROM OrderLineItems
@@ -264,7 +264,7 @@
   </cfloop>
 
   <!--- Submit: mark submitted + status 1 --->
-  <cfset queryExecute(
+  <cfset queryTimed(
     "
       UPDATE Orders
       SET
diff --git a/api/orders/updateStatus.cfm b/api/orders/updateStatus.cfm
index 31a06cd..bc64269 100644
--- a/api/orders/updateStatus.cfm
+++ b/api/orders/updateStatus.cfm
@@ -36,7 +36,7 @@
 
 <cftry>
   <!--- Verify order exists and get details --->
-  <cfset qOrder = queryExecute("
+  <cfset qOrder = queryTimed("
     SELECT o.ID, o.StatusID, o.BusinessID, o.ServicePointID,
            sp.Name AS Name
     FROM Orders o
@@ -52,7 +52,7 @@
   <cfset oldStatusID = qOrder.StatusID>
 
   <!--- Update status --->
-  <cfset queryExecute("
+  <cfset queryTimed("
     UPDATE Orders
     SET StatusID = ?,
         LastEditedOn = ?
@@ -90,13 +90,13 @@
   <cfif NewStatusID EQ 3 AND oldStatusID NEQ 3>
     <cftry>
       <!--- Check if task already exists for this order to prevent duplicates --->
-      <cfset qExisting = queryExecute("
+      <cfset qExisting = queryTimed("
         SELECT ID FROM Tasks WHERE ID = ? LIMIT 1
       ", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
 
       <cfif qExisting.recordCount EQ 0>
         <!--- Get order type --->
-        <cfset qOrderDetails = queryExecute("
+        <cfset qOrderDetails = queryTimed("
           SELECT o.OrderTypeID
           FROM Orders o
           WHERE o.ID = ?
@@ -123,7 +123,7 @@
         </cfif>
 
         <cfif len(taskTitle)>
-          <cfset queryExecute("
+          <cfset queryTimed("
             INSERT INTO Tasks (
               BusinessID,
               OrderID,
diff --git a/api/portal/addTeamMember.cfm b/api/portal/addTeamMember.cfm
index d2bbfab..0c0d43e 100644
--- a/api/portal/addTeamMember.cfm
+++ b/api/portal/addTeamMember.cfm
@@ -32,7 +32,7 @@ if (userId <= 0) {
 
 try {
   // Check if already exists
-  qCheck = queryExecute("
+  qCheck = queryTimed("
     SELECT ID, IsActive FROM Employees
     WHERE BusinessID = ? AND UserID = ?
   ", [
@@ -42,7 +42,7 @@ try {
 
   if (qCheck.recordCount > 0) {
     // Update to active
-    queryExecute("
+    queryTimed("
       UPDATE Employees
       SET IsActive = 1, StatusID = 2
       WHERE BusinessID = ? AND UserID = ?
@@ -57,7 +57,7 @@ try {
   // NOTE: BusinessID in Employees is technically redundant since
   // the business relationship is established via ServicePoint -> Beacon chain.
   // Kept for legacy/convenience but could be derived from context.
-  queryExecute("
+  queryTimed("
     INSERT INTO Employees (BusinessID, UserID, StatusID, IsActive)
     VALUES (?, ?, 2, 1)
   ", [
@@ -65,7 +65,7 @@ try {
     { value: userId, cfsqltype: "cf_sql_integer" }
   ], { datasource: "payfrit" });
 
-  qNew = queryExecute("SELECT LAST_INSERT_ID() AS EmployeeID", {}, { datasource: "payfrit" });
+  qNew = queryTimed("SELECT LAST_INSERT_ID() AS EmployeeID", {}, { datasource: "payfrit" });
 
   apiAbort({ "OK": true, "MESSAGE": "Team member added", "EmployeeID": qNew.ID });
 
diff --git a/api/portal/getSettings.cfm b/api/portal/getSettings.cfm
index b128375..55c859d 100644
--- a/api/portal/getSettings.cfm
+++ b/api/portal/getSettings.cfm
@@ -22,7 +22,7 @@ if (!structKeyExists(request, "BusinessID") || !isNumeric(request.BusinessID) ||
 }
 
 try {
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             b.ID,
             b.Name,
@@ -38,7 +38,7 @@ try {
     }
 
     // Get address from Addresses table
-    qAddr = queryExecute("
+    qAddr = queryTimed("
         SELECT a.Line1, a.Line2, a.City, a.ZIPCode, s.Abbreviation AS State
         FROM Addresses a
         LEFT JOIN tt_States s ON s.ID = a.StateID
@@ -59,7 +59,7 @@ try {
     }
 
     // Get owner email from Users table
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT ContactNumber, EmailAddress
         FROM Users
         WHERE ID = (SELECT UserID FROM Businesses WHERE ID = :businessId)
diff --git a/api/portal/myBusinesses.cfm b/api/portal/myBusinesses.cfm
index b4ca131..58f90dd 100644
--- a/api/portal/myBusinesses.cfm
+++ b/api/portal/myBusinesses.cfm
@@ -44,7 +44,7 @@ try {
 
     // Get businesses for this user (owner only)
 
-    q = queryExecute("
+    q = queryTimed("
         SELECT b.ID, b.Name
         FROM Businesses b
         WHERE b.UserID = :userID
diff --git a/api/portal/searchUser.cfm b/api/portal/searchUser.cfm
index a4634c2..3857fb3 100644
--- a/api/portal/searchUser.cfm
+++ b/api/portal/searchUser.cfm
@@ -40,7 +40,7 @@ try {
   if (isPhone) {
     // Search by phone - normalize both sides
     phoneDigits = normalizePhone(query);
-    qUser = queryExecute("
+    qUser = queryTimed("
       SELECT ID, FirstName, LastName, ContactNumber, EmailAddress
       FROM Users
       WHERE REPLACE(REPLACE(REPLACE(REPLACE(ContactNumber, '-', ''), ' ', ''), '(', ''), ')', '') LIKE :phone
@@ -50,7 +50,7 @@ try {
     }, { datasource: "payfrit" });
   } else if (isEmail) {
     // Search by email (partial match)
-    qUser = queryExecute("
+    qUser = queryTimed("
       SELECT ID, FirstName, LastName, ContactNumber, EmailAddress
       FROM Users
       WHERE EmailAddress LIKE :email
@@ -60,7 +60,7 @@ try {
     }, { datasource: "payfrit" });
   } else {
     // Search by name
-    qUser = queryExecute("
+    qUser = queryTimed("
       SELECT ID, FirstName, LastName, ContactNumber, EmailAddress
       FROM Users
       WHERE FirstName LIKE :name OR LastName LIKE :name
@@ -73,7 +73,7 @@ try {
 
   if (qUser.recordCount > 0) {
     // Check if already on team
-    qTeam = queryExecute("
+    qTeam = queryTimed("
       SELECT ID FROM Employees
       WHERE BusinessID = :bizId AND UserID = :userId
     ", {
diff --git a/api/portal/stats.cfm b/api/portal/stats.cfm
index 479bf66..24e3301 100644
--- a/api/portal/stats.cfm
+++ b/api/portal/stats.cfm
@@ -37,7 +37,7 @@ try {
     todayEnd = dateFormat(now(), "yyyy-mm-dd") & " 23:59:59";
 
     // Orders today count
-    qOrdersToday = queryExecute("
+    qOrdersToday = queryTimed("
         SELECT COUNT(*) as cnt
         FROM Orders
         WHERE BusinessID = :businessID
@@ -50,7 +50,7 @@ try {
     });
 
     // Revenue today (sum of line items)
-    qRevenueToday = queryExecute("
+    qRevenueToday = queryTimed("
         SELECT COALESCE(SUM(li.Quantity * li.Price), 0) as total
         FROM Orders o
         JOIN OrderLineItems li ON li.OrderID = o.ID
@@ -65,7 +65,7 @@ try {
     });
 
     // Pending orders (status 1 = submitted, 2 = preparing)
-    qPendingOrders = queryExecute("
+    qPendingOrders = queryTimed("
         SELECT COUNT(*) as cnt
         FROM Orders
         WHERE BusinessID = :businessID
@@ -74,7 +74,7 @@ try {
 
     // Menu items count (active items that have a parent category, excluding categories themselves)
     // Categories are items with ParentItemID = 0 and IsCollapsible = 0
-    qMenuItems = queryExecute("
+    qMenuItems = queryTimed("
         SELECT COUNT(*) as cnt
         FROM Items
         WHERE BusinessID = :businessID
diff --git a/api/portal/team.cfm b/api/portal/team.cfm
index 64e55e1..f1c8e4a 100644
--- a/api/portal/team.cfm
+++ b/api/portal/team.cfm
@@ -40,7 +40,7 @@ if (businessId <= 0) {
 try {
   // Get employees for this business with user details
   // Cast BIT to INT to avoid binary comparison issues
-  qTeam = queryExecute("
+  qTeam = queryTimed("
     SELECT
       e.ID,
       e.UserID,
diff --git a/api/portal/updateSettings.cfm b/api/portal/updateSettings.cfm
index ff01f74..a314481 100644
--- a/api/portal/updateSettings.cfm
+++ b/api/portal/updateSettings.cfm
@@ -99,12 +99,12 @@ try {
     // Build and execute Businesses update
     if (arrayLen(updates) > 0) {
         sql = "UPDATE Businesses SET " & arrayToList(updates, ", ") & " WHERE ID = :businessId";
-        queryExecute(sql, params, { datasource: "payfrit" });
+        queryTimed(sql, params, { datasource: "payfrit" });
     }
 
     // Update address in Addresses table if needed
     if (hasAddressUpdate) {
-        qExistingAddr = queryExecute("
+        qExistingAddr = queryTimed("
             SELECT ID FROM Addresses
             WHERE (BusinessID = :businessId OR ID = (SELECT AddressID FROM Businesses WHERE ID = :businessId))
               AND IsDeleted = 0
@@ -127,21 +127,21 @@ try {
                 addrParams.zip = { value: addrFields.ZIPCode, cfsqltype: "cf_sql_varchar" };
             }
             if (arrayLen(addrUpdates) > 0) {
-                queryExecute("UPDATE Addresses SET " & arrayToList(addrUpdates, ", ") & " WHERE ID = :addrId",
+                queryTimed("UPDATE Addresses SET " & arrayToList(addrUpdates, ", ") & " WHERE ID = :addrId",
                     addrParams, { datasource: "payfrit" });
             }
         }
     }
 
     // Return updated settings
-    q = queryExecute("
+    q = queryTimed("
         SELECT b.ID, b.Name, b.TaxRate, b.Phone
         FROM Businesses b
         WHERE b.ID = :businessId
         LIMIT 1
     ", { businessId: request.BusinessID }, { datasource: "payfrit" });
 
-    qAddr = queryExecute("
+    qAddr = queryTimed("
         SELECT a.Line1, a.City, a.ZIPCode, s.Abbreviation AS State
         FROM Addresses a
         LEFT JOIN tt_States s ON s.ID = a.StateID
diff --git a/api/ratings/createAdminRating.cfm b/api/ratings/createAdminRating.cfm
index cfb1a8f..eb90f05 100644
--- a/api/ratings/createAdminRating.cfm
+++ b/api/ratings/createAdminRating.cfm
@@ -45,7 +45,7 @@ try {
     }
 
     // Verify task exists and is completed
-    qTask = queryExecute("
+    qTask = queryTimed("
         SELECT t.ID, t.ClaimedByUserID, t.CompletedOn, t.BusinessID
         FROM Tasks t
         WHERE t.ID = :taskID
@@ -68,7 +68,7 @@ try {
     }
 
     // Check if admin rating already exists for this task
-    qExisting = queryExecute("
+    qExisting = queryTimed("
         SELECT ID FROM TaskRatings
         WHERE TaskID = :taskID
           AND Direction = 'admin_rates_worker'
@@ -82,7 +82,7 @@ try {
 
     // Insert the admin rating (completed immediately since admin submits directly)
     token = generateToken();
-    queryExecute("
+    queryTimed("
         INSERT INTO TaskRatings (
             TaskID, ByUserID, ForUserID, Direction,
             OnTime, CompletedScope, RequiredFollowup, ContinueAllow,
@@ -103,7 +103,7 @@ try {
         token: token
     });
 
-    ratingID = queryExecute("SELECT LAST_INSERT_ID() AS id", {}).id;
+    ratingID = queryTimed("SELECT LAST_INSERT_ID() AS id", {}).id;
 
     writeOutput(serializeJSON({
         "OK": true,
diff --git a/api/ratings/listForAdmin.cfm b/api/ratings/listForAdmin.cfm
index 56a42d6..a73d9da 100644
--- a/api/ratings/listForAdmin.cfm
+++ b/api/ratings/listForAdmin.cfm
@@ -30,7 +30,7 @@ try {
 
     // Get completed tasks from last 7 days where a worker was assigned
     // and no admin rating exists yet
-    qTasks = queryExecute("
+    qTasks = queryTimed("
         SELECT t.ID, t.Title, t.CompletedOn, t.ClaimedByUserID, t.OrderID,
                u.FirstName AS WorkerFirstName, u.LastName AS WorkerLastName,
                o.ID, o.UserID,
diff --git a/api/ratings/setup.cfm b/api/ratings/setup.cfm
index 018b46c..d21a85b 100644
--- a/api/ratings/setup.cfm
+++ b/api/ratings/setup.cfm
@@ -3,7 +3,7 @@
 <cfscript>
 try {
     // Create TaskRatings table
-    queryExecute("
+    queryTimed("
         CREATE TABLE IF NOT EXISTS TaskRatings (
             ID INT AUTO_INCREMENT PRIMARY KEY,
             TaskID INT NOT NULL,
@@ -39,7 +39,7 @@ try {
     ", {}, { datasource: "payfrit" });
 
     // Verify table was created
-    cols = queryExecute("DESCRIBE TaskRatings", {}, { datasource: "payfrit" });
+    cols = queryTimed("DESCRIBE TaskRatings", {}, { datasource: "payfrit" });
     colNames = [];
     for (c in cols) {
         arrayAppend(colNames, c.Field);
diff --git a/api/ratings/submit.cfm b/api/ratings/submit.cfm
index 54b6a81..1058d20 100644
--- a/api/ratings/submit.cfm
+++ b/api/ratings/submit.cfm
@@ -26,7 +26,7 @@ try {
     }
 
     // Look up the rating by token
-    qRating = queryExecute("
+    qRating = queryTimed("
         SELECT r.*, t.Title,
                u_for.FirstName AS ForFirstName, u_for.LastName AS ForLastName,
                u_by.FirstName AS ByFirstName, u_by.LastName AS ByLastName
@@ -95,7 +95,7 @@ try {
 
     // Process submission based on direction
     if (qRating.Direction == "customer_rates_worker" || qRating.Direction == "admin_rates_worker") {
-        queryExecute("
+        queryTimed("
             UPDATE TaskRatings SET
                 OnTime = ?,
                 CompletedScope = ?,
@@ -111,7 +111,7 @@ try {
             { value = qRating.ID, cfsqltype = "cf_sql_integer" }
         ]);
     } else if (qRating.Direction == "worker_rates_customer") {
-        queryExecute("
+        queryTimed("
             UPDATE TaskRatings SET
                 Prepared = ?,
                 CompletedScope = ?,
diff --git a/api/setup/checkDuplicate.cfm b/api/setup/checkDuplicate.cfm
index a8ebfc5..eecb043 100644
--- a/api/setup/checkDuplicate.cfm
+++ b/api/setup/checkDuplicate.cfm
@@ -43,7 +43,7 @@ try {
 
     // Build query to find potential duplicates
     // Match by name (case-insensitive) OR by address components
-    qDuplicates = queryExecute("
+    qDuplicates = queryTimed("
         SELECT DISTINCT
             b.ID AS BusinessID,
             b.Name AS Name,
diff --git a/api/setup/importBusiness.cfm b/api/setup/importBusiness.cfm
index 460933d..681415e 100644
--- a/api/setup/importBusiness.cfm
+++ b/api/setup/importBusiness.cfm
@@ -92,7 +92,7 @@ try {
     // Step 1: Create or find business
     response.steps.append("Step 1: Creating business record...");
 
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID FROM Businesses WHERE Name = :name
     ", { name: biz.name }, { datasource: "payfrit" });
 
@@ -101,13 +101,13 @@ try {
         response.steps.append("Business already exists with ID: " & BusinessID);
         response.warnings.append("Existing business found - will add to existing menu");
     } else if (!dryRun) {
-        queryExecute("
+        queryTimed("
             INSERT INTO Businesses (Name, UserID, AddressID, BusinessDeliveryZipCodes, AddedOn) VALUES (:name, :ownerID, 0, '', NOW())
         ", {
             name: biz.name, ownerID: ownerUserID
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
         BusinessID = qNew.id;
         response.steps.append("Created business with ID: " & BusinessID);
     } else {
@@ -129,7 +129,7 @@ try {
 
         if (!dryRun) {
             // Check if template already exists for this business
-            qTmpl = queryExecute("
+            qTmpl = queryTimed("
                 SELECT ID FROM Items
                 WHERE BusinessID = :bizID
                   AND Name = :name
@@ -143,7 +143,7 @@ try {
             } else {
                 // Create template as Item at ParentID=0, with IsCollapsible=1 to mark it as a template
                 // This ensures the API filter excludes it from categories
-                queryExecute("
+                queryTimed("
                     INSERT INTO Items (
                         BusinessID, Name, ParentItemID, Price,
                         IsActive, RequiresChildSelection, MaxNumSelectionReq, SortOrder, IsCollapsible
@@ -157,7 +157,7 @@ try {
                     maxSelect: maxSelections
                 }, { datasource: "payfrit" });
 
-                qNewTmpl = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+                qNewTmpl = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
                 templateItemID = qNewTmpl.id;
                 response.steps.append("Created template: " & templateName & " (ID: " & templateItemID & ")");
             }
@@ -172,13 +172,13 @@ try {
                 optPrice = structKeyExists(opt, "price") ? val(opt.price) : 0;
                 optDefault = structKeyExists(opt, "isDefault") && opt.isDefault == true;
 
-                qOpt = queryExecute("
+                qOpt = queryTimed("
                     SELECT ID FROM Items
                     WHERE BusinessID = :bizID AND Name = :name AND ParentItemID = :parentID
                 ", { bizID: BusinessID, name: optName, parentID: templateItemID }, { datasource: "payfrit" });
 
                 if (qOpt.recordCount == 0) {
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO Items (
                             BusinessID, Name, ParentItemID, Price,
                             IsActive, IsCheckedByDefault, SortOrder
@@ -214,7 +214,7 @@ try {
 
         if (!dryRun) {
             // Check if category exists (Item at ParentID=0, not a template)
-            qCat = queryExecute("
+            qCat = queryTimed("
                 SELECT ID FROM Items
                 WHERE BusinessID = :bizID
                   AND Name = :name
@@ -226,7 +226,7 @@ try {
                 categoryItemID = qCat.ItemID;
                 response.steps.append("Category exists: " & catName);
             } else {
-                queryExecute("
+                queryTimed("
                     INSERT INTO Items (
                         BusinessID, Name, ParentItemID, Price,
                         IsActive, SortOrder
@@ -239,7 +239,7 @@ try {
                     sortOrder: catOrder
                 }, { datasource: "payfrit" });
 
-                qNewCat = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+                qNewCat = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
                 categoryItemID = qNewCat.id;
                 response.steps.append("Created category: " & catName & " (ID: " & categoryItemID & ")");
             }
@@ -271,7 +271,7 @@ try {
 
             if (!dryRun) {
                 // Check if item exists
-                qItem = queryExecute("
+                qItem = queryTimed("
                     SELECT ID FROM Items
                     WHERE BusinessID = :bizID AND Name = :name AND ParentItemID = :parentID
                 ", { bizID: BusinessID, name: itemName, parentID: categoryItemID }, { datasource: "payfrit" });
@@ -279,7 +279,7 @@ try {
                 if (qItem.recordCount > 0) {
                     menuItemID = qItem.ID;
                 } else {
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO Items (
                             BusinessID, Name, Description, ParentItemID,
                             Price, IsActive, SortOrder
@@ -295,7 +295,7 @@ try {
                         sortOrder: itemOrder
                     }, { datasource: "payfrit" });
 
-                    qNewItem = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+                    qNewItem = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
                     menuItemID = qNewItem.id;
                 }
 
@@ -307,13 +307,13 @@ try {
                         templateItemID = templateMap[modRef];
 
                         // Check if link exists
-                        qLink = queryExecute("
+                        qLink = queryTimed("
                             SELECT 1 FROM lt_ItemID_TemplateItemID
                             WHERE ItemID = :itemID AND TemplateItemID = :templateID
                         ", { itemID: menuItemID, templateID: templateItemID }, { datasource: "payfrit" });
 
                         if (qLink.recordCount == 0) {
-                            queryExecute("
+                            queryTimed("
                                 INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
                                 VALUES (:itemID, :templateID, :sortOrder)
                             ", {
diff --git a/api/setup/reimportBigDeans.cfm b/api/setup/reimportBigDeans.cfm
index 6dfe0e8..0f6de7c 100644
--- a/api/setup/reimportBigDeans.cfm
+++ b/api/setup/reimportBigDeans.cfm
@@ -16,9 +16,9 @@ actions = [];
 // ============================================================
 if (!dryRun) {
   // Delete template links first
-  queryExecute("DELETE FROM lt_ItemID_TemplateItemID WHERE ItemID IN (SELECT ID FROM Items WHERE BusinessID = :bizId)", { bizId: bizId });
+  queryTimed("DELETE FROM lt_ItemID_TemplateItemID WHERE ItemID IN (SELECT ID FROM Items WHERE BusinessID = :bizId)", { bizId: bizId });
   // Delete all items
-  queryExecute("DELETE FROM Items WHERE BusinessID = :bizId", { bizId: bizId });
+  queryTimed("DELETE FROM Items WHERE BusinessID = :bizId", { bizId: bizId });
 }
 arrayAppend(actions, { step: "CLEAR", message: dryRun ? "Would clear existing data" : "Cleared existing data" });
 
@@ -30,7 +30,7 @@ arrayAppend(actions, { step: "CLEAR", message: dryRun ? "Would clear existing da
 function insertItem(name, description, parentId, price, isActive, isCheckedByDefault, requiresChild, maxSelections, isCollapsible, sortOrder) {
   if (dryRun) return 0;
   // Note: IsActive is BIT(1) type, use b'1' or b'0' syntax
-  queryExecute("
+  queryTimed("
     INSERT INTO Items (BusinessID, Name, Description, ParentItemID, Price,
                        IsActive, IsCheckedByDefault, RequiresChildSelection,
                        MaxNumSelectionReq, IsCollapsible, SortOrder, AddedOn)
@@ -41,14 +41,14 @@ function insertItem(name, description, parentId, price, isActive, isCheckedByDef
     maxSel: maxSelections, isCollapse: isCollapsible, sort: sortOrder
   });
 
-  qId = queryExecute("SELECT LAST_INSERT_ID() as id");
+  qId = queryTimed("SELECT LAST_INSERT_ID() as id");
   return qId.id;
 }
 
 // Helper to link template to item
 function linkTemplate(menuItemId, templateId, sortOrder) {
   if (dryRun) return;
-  queryExecute("
+  queryTimed("
     INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
     VALUES (:itemId, :templateId, :sort)
   ", { itemId: menuItemId, templateId: templateId, sort: sortOrder });
@@ -316,13 +316,13 @@ arrayAppend(actions, { step: "ITEMS", category: "Hot Dogs & Such", count: 3 });
 
 // Count totals
 if (!dryRun) {
-  qCount = queryExecute("SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = :bizId", { bizId: bizId });
+  qCount = queryTimed("SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = :bizId", { bizId: bizId });
   totalItems = qCount.cnt;
 
-  qTemplateCount = queryExecute("SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = :bizId AND ParentItemID = 0 AND IsCollapsible = 1", { bizId: bizId });
+  qTemplateCount = queryTimed("SELECT COUNT(*) as cnt FROM Items WHERE BusinessID = :bizId AND ParentItemID = 0 AND IsCollapsible = 1", { bizId: bizId });
   templateCount = qTemplateCount.cnt;
 
-  qLinkCount = queryExecute("
+  qLinkCount = queryTimed("
     SELECT COUNT(*) as cnt FROM lt_ItemID_TemplateItemID tl
     JOIN Items i ON i.ID = tl.ItemID
     WHERE i.BusinessID = :bizId
diff --git a/api/setup/saveWizard.cfm b/api/setup/saveWizard.cfm
index e40f8a9..ad6589f 100644
--- a/api/setup/saveWizard.cfm
+++ b/api/setup/saveWizard.cfm
@@ -70,7 +70,7 @@ try {
         stateID = 0;
         response.steps.append("State value received: '" & state & "' (len: " & len(state) & ")");
         if (len(state)) {
-            qState = queryExecute("
+            qState = queryTimed("
                 SELECT ID FROM tt_States WHERE Abbreviation = :abbr
             ", { abbr: uCase(state) }, { datasource: "payfrit" });
 
@@ -81,7 +81,7 @@ try {
             }
         }
 
-        queryExecute("
+        queryTimed("
             INSERT INTO Addresses (Line1, City, StateID, ZIPCode, UserID, AddressTypeID, AddedOn)
             VALUES (:line1, :city, :stateID, :zip, :userID, :typeID, NOW())
         ", {
@@ -93,7 +93,7 @@ try {
             typeID: 2
         }, { datasource: "payfrit" });
 
-        qNewAddr = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+        qNewAddr = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
         addressId = qNewAddr.id;
         response.steps.append("Created address record (ID: " & addressId & ")");
 
@@ -102,7 +102,7 @@ try {
         if (communityMealType < 1 || communityMealType > 2) communityMealType = 1;
 
         // Create new business with address link and phone
-        queryExecute("
+        queryTimed("
             INSERT INTO Businesses (Name, Phone, UserID, AddressID, DeliveryZIPCodes, BusinessCommunityMealType, TaxRate, BusinessAddedOn)
             VALUES (:name, :phone, :userId, :addressId, :deliveryZips, :communityMealType, :taxRate, NOW())
         ", {
@@ -115,12 +115,12 @@ try {
             taxRate: { value: bizTaxRate, cfsqltype: "cf_sql_decimal" }
         }, { datasource: "payfrit" });
 
-        qNewBiz = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+        qNewBiz = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
         businessId = qNewBiz.id;
         response.steps.append("Created new business: " & bizName & " (ID: " & businessId & ")");
 
         // Update address with business ID link
-        queryExecute("
+        queryTimed("
             UPDATE Addresses SET BusinessID = :businessID WHERE ID = :addressID
         ", {
             businessID: businessId,
@@ -140,7 +140,7 @@ try {
 
         for (tt = 1; tt <= arrayLen(defaultTaskTypes); tt++) {
             taskType = defaultTaskTypes[tt];
-            queryExecute("
+            queryTimed("
                 INSERT INTO tt_TaskTypes (Name, Description, Icon, Color, BusinessID, SortOrder)
                 VALUES (:name, :description, :icon, :color, :businessID, :sortOrder)
             ", {
@@ -172,7 +172,7 @@ try {
                 if (len(closeTime) == 5) closeTime = closeTime & ":00";
 
                 // Insert hours record for this day
-                queryExecute("
+                queryTimed("
                     INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime)
                     VALUES (:bizID, :dayID, :openTime, :closeTime)
                 ", {
@@ -187,7 +187,7 @@ try {
         }
     } else {
         // Verify existing business exists
-        qBiz = queryExecute("
+        qBiz = queryTimed("
             SELECT ID, Name AS BusinessName FROM Businesses WHERE ID = :id
         ", { id: businessId }, { datasource: "payfrit" });
 
@@ -219,7 +219,7 @@ try {
         response.steps.append("Template '" & tmplName & "' has " & arrayLen(options) & " options (type: " & (isArray(options) ? "array" : "other") & ")");
 
         // Check if template already exists for this business
-        qTmpl = queryExecute("
+        qTmpl = queryTimed("
             SELECT i.ID FROM Items i
             WHERE i.BusinessID = :bizID
               AND i.Name = :name
@@ -232,7 +232,7 @@ try {
             response.steps.append("Template exists: " & tmplName & " (ID: " & templateItemID & ")");
         } else {
             // Create template as Item with CategoryID=0 to mark as template
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (
                     BusinessID, Name, ParentItemID, CategoryID, Price,
                     IsActive, RequiresChildSelection, MaxNumSelectionReq,
@@ -246,7 +246,7 @@ try {
                 required: required ? 1 : 0
             }, { datasource: "payfrit" });
 
-            qNewTmpl = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            qNewTmpl = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             templateItemID = qNewTmpl.id;
             response.steps.append("Created template: " & tmplName & " (ID: " & templateItemID & ")");
         }
@@ -266,13 +266,13 @@ try {
             optName = opt.name;
             optPrice = structKeyExists(opt, "price") && isSimpleValue(opt.price) ? val(opt.price) : 0;
 
-            qOpt = queryExecute("
+            qOpt = queryTimed("
                 SELECT ID FROM Items
                 WHERE BusinessID = :bizID AND Name = :name AND ParentItemID = :parentID
             ", { bizID: businessId, name: optName, parentID: templateItemID }, { datasource: "payfrit" });
 
             if (qOpt.recordCount == 0) {
-                queryExecute("
+                queryTimed("
                     INSERT INTO Items (
                         BusinessID, Name, ParentItemID, CategoryID,
                         Price, IsActive, SortOrder
@@ -295,7 +295,7 @@ try {
     if (providedMenuId > 0) {
         menuID = providedMenuId;
         // Look up the menu name for logging
-        qName = queryExecute("SELECT Name FROM Menus WHERE ID = :id", { id: menuID }, { datasource: "payfrit" });
+        qName = queryTimed("SELECT Name FROM Menus WHERE ID = :id", { id: menuID }, { datasource: "payfrit" });
         menuName = qName.recordCount > 0 ? qName.Name : "Menu " & menuID;
         response.steps.append("Using provided menu: " & menuName & " (ID: " & menuID & ")");
     } else {
@@ -318,7 +318,7 @@ try {
 
         // Validate menu hours fall within business operating hours
         if (len(menuStartTime) && len(menuEndTime)) {
-            qHours = queryExecute("
+            qHours = queryTimed("
                 SELECT MIN(OpenTime) as earliestOpen, MAX(ClosingTime) as latestClose
                 FROM Hours
                 WHERE BusinessID = :bizID
@@ -335,7 +335,7 @@ try {
             }
         }
 
-        qMenu = queryExecute("
+        qMenu = queryTimed("
             SELECT ID FROM Menus
             WHERE BusinessID = :bizID AND Name = :name AND IsActive = 1
         ", { bizID: businessId, name: menuName }, { datasource: "payfrit" });
@@ -344,7 +344,7 @@ try {
             menuID = qMenu.ID;
             // Update existing menu with new time range if provided
             if (len(menuStartTime) && len(menuEndTime)) {
-                queryExecute("
+                queryTimed("
                     UPDATE Menus SET StartTime = :startTime, EndTime = :endTime
                     WHERE ID = :menuID
                 ", {
@@ -357,7 +357,7 @@ try {
                 response.steps.append("Using existing menu: " & menuName & " (ID: " & menuID & ")");
             }
         } else {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Menus (
                     BusinessID, Name, DaysActive, StartTime, EndTime, SortOrder, IsActive, AddedOn
                 ) VALUES (
@@ -370,7 +370,7 @@ try {
                 endTime: len(menuEndTime) ? menuEndTime : javaCast("null", "")
             }, { datasource: "payfrit" });
 
-            qNewMenu = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            qNewMenu = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             menuID = qNewMenu.id;
             timeInfo = len(menuStartTime) && len(menuEndTime) ? " (" & menuStartTime & " - " & menuEndTime & ")" : " (all day)";
             response.steps.append("Created menu: " & menuName & timeInfo & " (ID: " & menuID & ")");
@@ -393,7 +393,7 @@ try {
         }
 
         // Check if category exists in Categories table for this menu
-        qCat = queryExecute("
+        qCat = queryTimed("
             SELECT ID FROM Categories
             WHERE BusinessID = :bizID AND Name = :name AND MenuID = :menuID
         ", { bizID: businessId, name: catName, menuID: menuID }, { datasource: "payfrit" });
@@ -403,7 +403,7 @@ try {
             response.steps.append("Category exists: " & catName & " (ID: " & categoryID & ")");
         } else {
             // Create category in Categories table with MenuID
-            queryExecute("
+            queryTimed("
                 INSERT INTO Categories (
                     BusinessID, MenuID, Name, SortOrder
                 ) VALUES (
@@ -416,7 +416,7 @@ try {
                 sortOrder: catOrder
             }, { datasource: "payfrit" });
 
-            qNewCat = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            qNewCat = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             categoryID = qNewCat.id;
             response.steps.append("Created category: " & catName & " in menu " & menuName & " (ID: " & categoryID & ")");
         }
@@ -482,7 +482,7 @@ try {
         categoryItemOrder[itemCategory]++;
 
         // Check if item exists
-        qItem = queryExecute("
+        qItem = queryTimed("
             SELECT ID FROM Items
             WHERE BusinessID = :bizID
               AND Name = :name
@@ -492,7 +492,7 @@ try {
         if (qItem.recordCount > 0) {
             menuItemID = qItem.ID;
             // Update existing item
-            queryExecute("
+            queryTimed("
                 UPDATE Items SET
                     Description = :desc,
                     Price = :price,
@@ -505,7 +505,7 @@ try {
                 id: menuItemID
             }, { datasource: "payfrit" });
         } else {
-            queryExecute("
+            queryTimed("
                 INSERT INTO Items (
                     BusinessID, Name, Description, ParentItemID,
                     CategoryID, Price, IsActive, SortOrder
@@ -521,7 +521,7 @@ try {
                 sortOrder: itemOrder
             }, { datasource: "payfrit" });
 
-            qNewItem = queryExecute("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
+            qNewItem = queryTimed("SELECT LAST_INSERT_ID() as id", {}, { datasource: "payfrit" });
             menuItemID = qNewItem.id;
         }
 
@@ -543,13 +543,13 @@ try {
                 templateItemID = templateMap[modName];
 
                 // Check if link exists
-                qLink = queryExecute("
+                qLink = queryTimed("
                     SELECT 1 FROM lt_ItemID_TemplateItemID
                     WHERE ItemID = :itemID AND TemplateItemID = :templateID
                 ", { itemID: menuItemID, templateID: templateItemID }, { datasource: "payfrit" });
 
                 if (qLink.recordCount == 0) {
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO lt_ItemID_TemplateItemID (ItemID, TemplateItemID, SortOrder)
                         VALUES (:itemID, :templateID, :sortOrder)
                     ", {
diff --git a/api/stations/list.cfm b/api/stations/list.cfm
index b47750a..abb64a1 100644
--- a/api/stations/list.cfm
+++ b/api/stations/list.cfm
@@ -34,7 +34,7 @@
 </cfif>
 
 <cftry>
-  <cfset q = queryExecute("
+  <cfset q = queryTimed("
     SELECT ID, BusinessID, Name, Color, SortOrder, IsActive
     FROM Stations
     WHERE BusinessID = ? AND IsActive = 1
diff --git a/api/stripe/createPaymentIntent.cfm b/api/stripe/createPaymentIntent.cfm
index 25f5041..6f23e84 100644
--- a/api/stripe/createPaymentIntent.cfm
+++ b/api/stripe/createPaymentIntent.cfm
@@ -61,7 +61,7 @@ try {
     }
 
     // Get business Stripe account
-    qBusiness = queryExecute("
+    qBusiness = queryTimed("
         SELECT StripeAccountID AS BusinessStripeAccountID, StripeOnboardingComplete AS BusinessStripeOnboardingComplete, Name AS BusinessName
         FROM Businesses
         WHERE BusinessID = :businessID
@@ -74,7 +74,7 @@ try {
     }
 
     // Get order's delivery fee and grant economics (if applicable)
-    qOrder = queryExecute("
+    qOrder = queryTimed("
         SELECT OrderDeliveryFee, OrderTypeID, GrantID, GrantOwnerBusinessID, GrantEconomicsType, GrantEconomicsValue
         FROM Orders
         WHERE OrderID = :orderID
@@ -169,7 +169,7 @@ try {
 
     // Link PaymentIntent to worker payout ledger (if a ledger row exists for this order's task)
     try {
-        queryExecute("
+        queryTimed("
             UPDATE WorkPayoutLedgers wpl
             INNER JOIN Tasks t ON t.ID = wpl.TaskID AND t.OrderID = :orderID
             SET wpl.StripePaymentIntentID = :piID
diff --git a/api/stripe/onboard.cfm b/api/stripe/onboard.cfm
index 6f14273..4764410 100644
--- a/api/stripe/onboard.cfm
+++ b/api/stripe/onboard.cfm
@@ -31,7 +31,7 @@ try {
     }
 
     // Check if business already has a Stripe account
-    qBusiness = queryExecute("
+    qBusiness = queryTimed("
         SELECT StripeAccountID AS BusinessStripeAccountID, Name AS BusinessName
         FROM Businesses
         WHERE ID = :businessID
@@ -71,7 +71,7 @@ try {
         stripeAccountID = accountData.id;
 
         // Save to database
-        queryExecute("
+        queryTimed("
             UPDATE Businesses
             SET StripeAccountID = :stripeAccountID,
                 StripeOnboardingStarted = NOW()
diff --git a/api/stripe/status.cfm b/api/stripe/status.cfm
index 7c2cdcc..3fd60a5 100644
--- a/api/stripe/status.cfm
+++ b/api/stripe/status.cfm
@@ -22,7 +22,7 @@ try {
     stripeSecretKey = application.stripeSecretKey ?: "";
 
     // Get business Stripe info
-    qBusiness = queryExecute("
+    qBusiness = queryTimed("
         SELECT StripeAccountID AS BusinessStripeAccountID, StripeOnboardingComplete AS BusinessStripeOnboardingComplete
         FROM Businesses
         WHERE ID = :businessID
@@ -74,7 +74,7 @@ try {
 
             // Mark as complete in database if not already
             if (!qBusiness.BusinessStripeOnboardingComplete) {
-                queryExecute("
+                queryTimed("
                     UPDATE Businesses
                     SET StripeOnboardingComplete = 1
                     WHERE ID = :businessID
diff --git a/api/stripe/webhook.cfm b/api/stripe/webhook.cfm
index 323bfed..0c2362b 100644
--- a/api/stripe/webhook.cfm
+++ b/api/stripe/webhook.cfm
@@ -78,7 +78,7 @@ try {
             if (orderID > 0) {
                 // Update order status to paid/submitted (status 1)
                 // Note: Task is created later when order status changes to Ready (3) in updateStatus.cfm
-                queryExecute("
+                queryTimed("
                     UPDATE Orders
                     SET PaymentStatus = 'paid',
                         PaymentCompletedOn = NOW(),
@@ -92,7 +92,7 @@ try {
             // === WORKER PAYOUT TRANSFER ===
             // Find ledger row for this PaymentIntent
             try {
-                qLedger = queryExecute("
+                qLedger = queryTimed("
                     SELECT wpl.ID, wpl.UserID, wpl.TaskID, wpl.NetTransferCents,
                            wpl.StripeTransferID, wpl.Status
                     FROM WorkPayoutLedgers wpl
@@ -102,13 +102,13 @@ try {
 
                 if (qLedger.recordCount > 0 && isNull(qLedger.StripeTransferID) && qLedger.Status == "pending_charge") {
                     // Mark as charged
-                    queryExecute("
+                    queryTimed("
                         UPDATE WorkPayoutLedgers SET Status = 'charged', UpdatedAt = NOW()
                         WHERE ID = :ledgerID
                     ", { ledgerID: qLedger.ID });
 
                     // Look up worker's Stripe Connected Account
-                    qWorker = queryExecute("
+                    qWorker = queryTimed("
                         SELECT StripeConnectedAccountID FROM Users WHERE ID = :userID
                     ", { userID: qLedger.UserID });
 
@@ -135,7 +135,7 @@ try {
                         transferData = deserializeJSON(transferResult.fileContent);
 
                         if (structKeyExists(transferData, "id")) {
-                            queryExecute("
+                            queryTimed("
                                 UPDATE WorkPayoutLedgers
                                 SET StripeTransferID = :transferID, Status = 'transferred', UpdatedAt = NOW()
                                 WHERE ID = :ledgerID
@@ -147,7 +147,7 @@ try {
                         }
                     } else if (qLedger.NetTransferCents == 0) {
                         // Nothing to transfer (entire amount withheld for activation)
-                        queryExecute("
+                        queryTimed("
                             UPDATE WorkPayoutLedgers SET Status = 'transferred', UpdatedAt = NOW()
                             WHERE ID = :ledgerID
                         ", { ledgerID: qLedger.ID });
@@ -166,7 +166,7 @@ try {
 
                 if (grantOwnerFeeCents > 0 && grantOwnerBizID > 0) {
                     // Look up owner business Stripe account
-                    qOwnerBiz = queryExecute("
+                    qOwnerBiz = queryTimed("
                         SELECT StripeAccountID FROM Businesses WHERE ID = :bizID
                     ", { bizID: grantOwnerBizID });
 
@@ -212,7 +212,7 @@ try {
             failureMessage = eventData.last_payment_error.message ?: "Payment failed";
 
             if (orderID > 0) {
-                queryExecute("
+                queryTimed("
                     UPDATE Orders
                     SET PaymentStatus = 'failed',
                         PaymentError = :failureMessage
@@ -233,13 +233,13 @@ try {
             refundAmount = eventData.amount_refunded / 100;
 
             if (paymentIntentID != "") {
-                qOrder = queryExecute("
+                qOrder = queryTimed("
                     SELECT ID FROM Orders
                     WHERE OrderStripePaymentIntentID = :paymentIntentID
                 ", { paymentIntentID: paymentIntentID });
 
                 if (qOrder.recordCount > 0) {
-                    queryExecute("
+                    queryTimed("
                         UPDATE Orders
                         SET PaymentStatus = 'refunded',
                             OrderRefundAmount = :refundAmount,
@@ -261,20 +261,20 @@ try {
             paymentIntentID = eventData.payment_intent ?: "";
 
             if (paymentIntentID != "") {
-                qOrder = queryExecute("
+                qOrder = queryTimed("
                     SELECT ID, BusinessID FROM Orders
                     WHERE OrderStripePaymentIntentID = :paymentIntentID
                 ", { paymentIntentID: paymentIntentID });
 
                 if (qOrder.recordCount > 0) {
-                    queryExecute("
+                    queryTimed("
                         UPDATE Orders
                         SET PaymentStatus = 'disputed'
                         WHERE OrderStripePaymentIntentID = :paymentIntentID
                     ", { paymentIntentID: paymentIntentID });
 
                     // Create a task for the dispute
-                    queryExecute("
+                    queryTimed("
                         INSERT INTO Tasks (BusinessID, CategoryID, Title, Details, CreatedOn, StatusID, SourceType, SourceID)
                         VALUES (:businessID, 4, 'Payment Dispute', 'Order ###qOrder.ID# has been disputed. Review immediately.', NOW(), 0, 'dispute', :orderID)
                     ", {
@@ -295,7 +295,7 @@ try {
 
             // Business accounts
             if (chargesEnabled && payoutsEnabled) {
-                queryExecute("
+                queryTimed("
                     UPDATE Businesses
                     SET StripeOnboardingComplete = 1
                     WHERE StripeAccountID = :accountID
@@ -306,14 +306,14 @@ try {
 
             // Worker accounts — update StripePayoutsEnabled for tier derivation
             try {
-                qWorkerAcct = queryExecute("
+                qWorkerAcct = queryTimed("
                     SELECT ID FROM Users
                     WHERE StripeConnectedAccountID = :accountID
                     LIMIT 1
                 ", { accountID: accountID });
 
                 if (qWorkerAcct.recordCount > 0) {
-                    queryExecute("
+                    queryTimed("
                         UPDATE Users
                         SET StripePayoutsEnabled = :payoutsEnabled
                         WHERE StripeConnectedAccountID = :accountID
@@ -338,7 +338,7 @@ try {
                 metaUserID = val(sessionMetadata.user_id ?: 0);
 
                 if (metaType == "activation_unlock" && metaUserID > 0) {
-                    queryExecute("
+                    queryTimed("
                         UPDATE Users
                         SET ActivationBalanceCents = ActivationCapCents
                         WHERE ID = :userID
@@ -355,7 +355,7 @@ try {
 
                     if (metaTipID > 0) {
                         // Mark tip as paid
-                        queryExecute("
+                        queryTimed("
                             UPDATE Tips
                             SET Status = 'paid',
                                 PaidOn = NOW(),
@@ -370,14 +370,14 @@ try {
 
                         // Transfer tip to worker's Stripe Connect account
                         if (metaWorkerID > 0) {
-                            qTipWorker = queryExecute("
+                            qTipWorker = queryTimed("
                                 SELECT StripeConnectedAccountID FROM Users WHERE ID = :userID
                             ", { userID: metaWorkerID }, { datasource: "payfrit" });
 
                             tipWorkerAcct = qTipWorker.recordCount > 0 ? (qTipWorker.StripeConnectedAccountID ?: "") : "";
 
                             if (len(trim(tipWorkerAcct)) > 0) {
-                                qTipAmt = queryExecute("
+                                qTipAmt = queryTimed("
                                     SELECT AmountCents FROM Tips WHERE ID = :tipID
                                 ", { tipID: metaTipID }, { datasource: "payfrit" });
 
@@ -400,7 +400,7 @@ try {
                                     tipTransferData = deserializeJSON(tipTransferResult.fileContent);
 
                                     if (structKeyExists(tipTransferData, "id")) {
-                                        queryExecute("
+                                        queryTimed("
                                             UPDATE Tips
                                             SET Status = 'transferred', StripeTransferID = :transferID
                                             WHERE ID = :tipID
diff --git a/api/tasks/accept.cfm b/api/tasks/accept.cfm
index ea6f9b0..92abf03 100644
--- a/api/tasks/accept.cfm
+++ b/api/tasks/accept.cfm
@@ -36,7 +36,7 @@
 
 <cftry>
   <!--- Verify task exists and is unclaimed --->
-  <cfset qTask = queryExecute("
+  <cfset qTask = queryTimed("
     SELECT ID, ClaimedByUserID, BusinessID, OrderID
     FROM Tasks
     WHERE ID = ?
@@ -51,7 +51,7 @@
   </cfif>
 
   <!--- Update task to claimed --->
-  <cfset queryExecute("
+  <cfset queryTimed("
     UPDATE Tasks
     SET ClaimedByUserID = ?,
         ClaimedOn = NOW()
diff --git a/api/tasks/callServer.cfm b/api/tasks/callServer.cfm
index 58f9b18..17e6a31 100644
--- a/api/tasks/callServer.cfm
+++ b/api/tasks/callServer.cfm
@@ -41,7 +41,7 @@ try {
     }
 
     // Get service point info (table name)
-    spQuery = queryExecute("
+    spQuery = queryTimed("
         SELECT Name FROM ServicePoints WHERE ID = :spID
     ", { spID: { value: servicePointID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
 
@@ -50,7 +50,7 @@ try {
     // Get user name if available
     userName = "";
     if (userID > 0) {
-        userQuery = queryExecute("
+        userQuery = queryTimed("
             SELECT FirstName FROM Users WHERE ID = :userID
         ", { userID: { value: userID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
         if (userQuery.recordCount && len(trim(userQuery.FirstName))) {
@@ -62,7 +62,7 @@ try {
     taskTypeName = "";
     taskTypeCategoryID = 0;
     if (taskTypeID > 0) {
-        typeQuery = queryExecute("
+        typeQuery = queryTimed("
             SELECT Name, TaskCategoryID FROM tt_TaskTypes WHERE tt_TaskTypeID = :typeID
         ", { typeID: { value: taskTypeID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
         if (typeQuery.recordCount) {
@@ -104,7 +104,7 @@ try {
         categoryID = taskTypeCategoryID;
     } else {
         // Fallback: look up or create a "Service" category for this business
-        catQuery = queryExecute("
+        catQuery = queryTimed("
             SELECT ID FROM TaskCategories
             WHERE BusinessID = :businessID AND Name = 'Service'
             LIMIT 1
@@ -112,12 +112,12 @@ try {
 
         if (catQuery.recordCount == 0) {
             // Create the category
-            queryExecute("
+            queryTimed("
                 INSERT INTO TaskCategories (BusinessID, Name, Color)
                 VALUES (:businessID, 'Service', '##FF9800')
             ", { businessID: { value: businessID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
 
-            catResult = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+            catResult = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
             categoryID = catResult.newID;
         } else {
             categoryID = catQuery.ID;
@@ -125,7 +125,7 @@ try {
     }
 
     // Insert task
-    queryExecute("
+    queryTimed("
         INSERT INTO Tasks (
             BusinessID,
             CategoryID,
@@ -155,7 +155,7 @@ try {
     }, { datasource: "payfrit" });
 
     // Get the new task ID
-    result = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+    result = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
     taskID = result.newID;
 
     apiAbort({
diff --git a/api/tasks/complete.cfm b/api/tasks/complete.cfm
index 64d59e1..0a8f62c 100644
--- a/api/tasks/complete.cfm
+++ b/api/tasks/complete.cfm
@@ -44,7 +44,7 @@
 
 <cftry>
   <!--- Verify task exists --->
-  <cfset qTask = queryExecute("
+  <cfset qTask = queryTimed("
     SELECT t.ID, t.ClaimedByUserID, t.CompletedOn, t.OrderID, t.TaskTypeID, t.BusinessID,
            o.UserID, o.ServicePointID
     FROM Tasks t
@@ -102,7 +102,7 @@
   </cfif>
 
   <!--- Mark task as completed --->
-  <cfset queryExecute("
+  <cfset queryTimed("
     UPDATE Tasks
     SET CompletedOn = NOW()
     WHERE ID = ?
@@ -111,7 +111,7 @@
   <!--- If task has an associated order, mark it as Delivered/Complete (status 5) --->
   <cfset orderUpdated = false>
   <cfif qTask.OrderID GT 0>
-    <cfset queryExecute("
+    <cfset queryTimed("
       UPDATE Orders
       SET StatusID = 5,
           LastEditedOn = NOW()
@@ -125,14 +125,14 @@
   <cfset workerUserID_for_payout = val(qTask.ClaimedByUserID)>
   <cfif workerUserID_for_payout GT 0>
     <!--- Get PayCents from the task --->
-    <cfset qTaskPay = queryExecute("
+    <cfset qTaskPay = queryTimed("
       SELECT PayCents FROM Tasks WHERE ID = ?
     ", [ { value = TaskID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
     <cfset grossCents = val(qTaskPay.PayCents)>
 
     <cfif grossCents GT 0>
       <!--- Get worker's activation state --->
-      <cfset qActivation = queryExecute("
+      <cfset qActivation = queryTimed("
         SELECT ActivationBalanceCents, ActivationCapCents
         FROM Users WHERE ID = ?
       ", [ { value = workerUserID_for_payout, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
@@ -149,7 +149,7 @@
       <cfset netCents = grossCents - activationWithhold>
 
       <!--- Insert ledger row --->
-      <cfset queryExecute("
+      <cfset queryTimed("
         INSERT INTO WorkPayoutLedgers
           (UserID, TaskID, GrossEarningsCents, ActivationWithheldCents, NetTransferCents, Status)
         VALUES
@@ -164,7 +164,7 @@
 
       <!--- Increment activation balance --->
       <cfif activationWithhold GT 0>
-        <cfset queryExecute("
+        <cfset queryTimed("
           UPDATE Users
           SET ActivationBalanceCents = ActivationBalanceCents + :withhold
           WHERE ID = :userID
@@ -182,7 +182,7 @@
   <cfif hasServicePoint AND customerUserID GT 0 AND workerUserID GT 0>
     <!--- 1. Customer rates Worker (always created, submitted via receipt link) --->
     <cfset customerToken = generateToken()>
-    <cfset queryExecute("
+    <cfset queryTimed("
       INSERT INTO TaskRatings (
         TaskID, ByUserID, ForUserID, Direction,
         AccessToken, ExpiresOn
@@ -201,7 +201,7 @@
     <!--- 2. Worker rates Customer (if provided or required) --->
     <cfif NOT structIsEmpty(workerRating)>
       <cfset workerToken = generateToken()>
-      <cfset queryExecute("
+      <cfset queryTimed("
         INSERT INTO TaskRatings (
           TaskID, ByUserID, ForUserID, Direction,
           Prepared, CompletedScope, Respectful, WouldAutoAssign,
diff --git a/api/tasks/completeChat.cfm b/api/tasks/completeChat.cfm
index c113352..a6e06a7 100644
--- a/api/tasks/completeChat.cfm
+++ b/api/tasks/completeChat.cfm
@@ -35,7 +35,7 @@
 
 <cftry>
   <!--- Verify task exists and is a chat task --->
-  <cfset qTask = queryExecute("
+  <cfset qTask = queryTimed("
     SELECT ID, ClaimedByUserID, CompletedOn, OrderID, TaskTypeID
     FROM Tasks
     WHERE ID = ?
@@ -56,7 +56,7 @@
   </cfif>
 
   <!--- Mark task as completed --->
-  <cfset queryExecute("
+  <cfset queryTimed("
     UPDATE Tasks
     SET CompletedOn = NOW()
     WHERE ID = ?
diff --git a/api/tasks/create.cfm b/api/tasks/create.cfm
index edeb522..8595b64 100644
--- a/api/tasks/create.cfm
+++ b/api/tasks/create.cfm
@@ -30,7 +30,7 @@ try {
         message = jsonData.Message ?: "";
 
         // Get task type info for display
-        taskTypeQuery = queryExecute("
+        taskTypeQuery = queryTimed("
             SELECT Name, Color, Icon
             FROM tt_TaskTypes
             WHERE tt_TaskTypeID = :taskTypeID
@@ -45,7 +45,7 @@ try {
         taskDetails = message;
 
         // Insert service bell task
-        queryExecute("
+        queryTimed("
             INSERT INTO Tasks (
                 BusinessID,
                 TaskTypeID,
@@ -83,7 +83,7 @@ try {
         // Get item info if itemID provided
         itemName = "";
         if (itemID > 0) {
-            itemQuery = queryExecute("
+            itemQuery = queryTimed("
                 SELECT Name FROM Items WHERE ID = :itemID
             ", { itemID: itemID });
             if (itemQuery.recordCount) {
@@ -105,7 +105,7 @@ try {
         }
 
         // Insert legacy task
-        queryExecute("
+        queryTimed("
             INSERT INTO Tasks (
                 BusinessID,
                 TaskItemID,
@@ -136,7 +136,7 @@ try {
     }
 
     // Get the new task ID
-    result = queryExecute("SELECT LAST_INSERT_ID() as newID", {}, { datasource: "payfrit" });
+    result = queryTimed("SELECT LAST_INSERT_ID() as newID", {}, { datasource: "payfrit" });
     taskID = result.newID;
 
     response = {
diff --git a/api/tasks/createChat.cfm b/api/tasks/createChat.cfm
index af02596..9bf7020 100644
--- a/api/tasks/createChat.cfm
+++ b/api/tasks/createChat.cfm
@@ -45,7 +45,7 @@ try {
     if (!forceNew) {
         // Look for any active chat for this business
         // Check by: order match, service point match, OR user match (for remote chats)
-        existingChat = queryExecute("
+        existingChat = queryTimed("
             SELECT t.ID, t.CreatedOn,
                    (SELECT MAX(cm.CreatedOn) FROM ChatMessages cm WHERE cm.TaskID = t.ID) as LastMessageTime
             FROM Tasks t
@@ -78,7 +78,7 @@ try {
 
             if (chatAge > 30) {
                 // Auto-close stale chat
-                queryExecute("
+                queryTimed("
                     UPDATE Tasks SET CompletedOn = NOW()
                     WHERE TaskID = :taskID
                 ", { taskID: { value: existingChat.ID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
@@ -97,7 +97,7 @@ try {
     // Get service point info (table name) - only if dine-in
     tableName = "";
     if (servicePointID > 0) {
-        spQuery = queryExecute("
+        spQuery = queryTimed("
             SELECT Name FROM ServicePoints WHERE ID = :spID
         ", { spID: { value: servicePointID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
         tableName = spQuery.recordCount ? spQuery.Name : "Table ##" & servicePointID;
@@ -106,7 +106,7 @@ try {
     // Get user name if available
     userName = "";
     if (userID > 0) {
-        userQuery = queryExecute("
+        userQuery = queryTimed("
             SELECT FirstName FROM Users WHERE ID = :userID
         ", { userID: { value: userID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
         if (userQuery.recordCount && len(trim(userQuery.FirstName))) {
@@ -136,7 +136,7 @@ try {
     }
 
     // Look up or create a "Chat" category for this business
-    catQuery = queryExecute("
+    catQuery = queryTimed("
         SELECT ID FROM TaskCategories
         WHERE BusinessID = :businessID AND Name = 'Chat'
         LIMIT 1
@@ -144,12 +144,12 @@ try {
 
     if (catQuery.recordCount == 0) {
         // Create the category (blue color for chat)
-        queryExecute("
+        queryTimed("
             INSERT INTO TaskCategories (BusinessID, Name, Color)
             VALUES (:businessID, 'Chat', '##2196F3')
         ", { businessID: { value: businessID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
 
-        catResult = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+        catResult = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
         categoryID = catResult.newID;
     } else {
         categoryID = catQuery.ID;
@@ -165,7 +165,7 @@ try {
     }
 
     // Insert task with TaskTypeID = 2 (Chat)
-    queryExecute("
+    queryTimed("
         INSERT INTO Tasks (
             BusinessID,
             CategoryID,
@@ -200,12 +200,12 @@ try {
     }, { datasource: "payfrit" });
 
     // Get the new task ID
-    result = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+    result = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
     taskID = result.newID;
 
     // If there's an initial message, save it
     if (len(initialMessage) && userID > 0) {
-        queryExecute("
+        queryTimed("
             INSERT INTO ChatMessages (TaskID, SenderUserID, SenderType, MessageBody)
             VALUES (:taskID, :userID, 'customer', :message)
         ", {
diff --git a/api/tasks/deleteCategory.cfm b/api/tasks/deleteCategory.cfm
index 5e8c311..5575607 100644
--- a/api/tasks/deleteCategory.cfm
+++ b/api/tasks/deleteCategory.cfm
@@ -50,7 +50,7 @@ try {
     }
 
     // Verify ownership
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT ID FROM TaskCategories
         WHERE ID = :id AND BusinessID = :businessID
     ", {
@@ -63,7 +63,7 @@ try {
     }
 
     // Check if any tasks use this category
-    qTasks = queryExecute("
+    qTasks = queryTimed("
         SELECT COUNT(*) as cnt FROM Tasks
         WHERE CategoryID = :id
     ", {
@@ -72,7 +72,7 @@ try {
 
     if (qTasks.cnt > 0) {
         // Soft delete - just deactivate
-        queryExecute("
+        queryTimed("
             UPDATE TaskCategories SET IsActive = 0
             WHERE ID = :id
         ", {
@@ -85,7 +85,7 @@ try {
         });
     } else {
         // Hard delete - no tasks use it
-        queryExecute("
+        queryTimed("
             DELETE FROM TaskCategories WHERE ID = :id
         ", {
             id: { value: categoryID, cfsqltype: "cf_sql_integer" }
diff --git a/api/tasks/deleteType.cfm b/api/tasks/deleteType.cfm
index 2ba1bbe..cd6f63d 100644
--- a/api/tasks/deleteType.cfm
+++ b/api/tasks/deleteType.cfm
@@ -45,7 +45,7 @@ try {
     }
 
     // Verify task type exists and belongs to this business
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT tt_TaskTypeID, BusinessID
         FROM tt_TaskTypes
         WHERE tt_TaskTypeID = :taskTypeID
@@ -62,7 +62,7 @@ try {
     }
 
     // Delete the task type
-    queryExecute("
+    queryTimed("
         DELETE FROM tt_TaskTypes
         WHERE tt_TaskTypeID = :taskTypeID
           AND BusinessID = :businessID
diff --git a/api/tasks/expireStaleChats.cfm b/api/tasks/expireStaleChats.cfm
index bf6fc3e..e1bc7be 100644
--- a/api/tasks/expireStaleChats.cfm
+++ b/api/tasks/expireStaleChats.cfm
@@ -19,7 +19,7 @@ try {
     // 2. CompletedOn IS NULL (not closed)
     // 3. No messages in the last 20 minutes AND task is older than 20 minutes
 
-    staleChats = queryExecute("
+    staleChats = queryTimed("
         SELECT t.ID, t.CreatedOn,
                (SELECT MAX(cm.CreatedOn) FROM ChatMessages cm WHERE cm.TaskID = t.ID) as LastMessageOn
         FROM Tasks t
@@ -47,7 +47,7 @@ try {
         }
 
         if (shouldExpire) {
-            queryExecute("
+            queryTimed("
                 UPDATE Tasks SET CompletedOn = NOW()
                 WHERE ID = :taskID
             ", { taskID: { value: chat.ID, cfsqltype: "cf_sql_integer" } }, { datasource: "payfrit" });
diff --git a/api/tasks/getDetails.cfm b/api/tasks/getDetails.cfm
index d45741e..71c4693 100644
--- a/api/tasks/getDetails.cfm
+++ b/api/tasks/getDetails.cfm
@@ -35,7 +35,7 @@
 
 <cftry>
   <!--- Get the task and linked order details --->
-  <cfset qTask = queryExecute("
+  <cfset qTask = queryTimed("
     SELECT
       t.ID AS TaskID,
       t.BusinessID,
@@ -125,7 +125,7 @@
 
   <!--- Get beacon UUID for the service point (for auto-completion on Works app) --->
   <cfif val(qTask.ServicePointID) GT 0>
-    <cfset qBeacon = queryExecute("
+    <cfset qBeacon = queryTimed("
       SELECT b.UUID
       FROM ServicePoints sp_link
       INNER JOIN Beacons b ON b.ID = sp_link.BeaconID
@@ -140,7 +140,7 @@
 
   <!--- Get order line items if there's an order --->
   <cfif qTask.OrderID GT 0>
-    <cfset qLineItems = queryExecute("
+    <cfset qLineItems = queryTimed("
       SELECT
         oli.ID AS OrderLineItemID,
         oli.ParentOrderLineItemID,
diff --git a/api/tasks/listAllTypes.cfm b/api/tasks/listAllTypes.cfm
index 602a385..a0a4a9a 100644
--- a/api/tasks/listAllTypes.cfm
+++ b/api/tasks/listAllTypes.cfm
@@ -43,7 +43,7 @@ try {
     }
 
     // Get task types for this business
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             tt_TaskTypeID as TaskTypeID,
             Name as TaskTypeName,
diff --git a/api/tasks/listCategories.cfm b/api/tasks/listCategories.cfm
index 1bd0c27..fc0d7a2 100644
--- a/api/tasks/listCategories.cfm
+++ b/api/tasks/listCategories.cfm
@@ -46,7 +46,7 @@ try {
     }
 
     // Get Task Categories (separate from Services/Task Types)
-    qCategories = queryExecute("
+    qCategories = queryTimed("
         SELECT
             ID,
             Name,
diff --git a/api/tasks/listMine.cfm b/api/tasks/listMine.cfm
index c92c6ca..385bc08 100644
--- a/api/tasks/listMine.cfm
+++ b/api/tasks/listMine.cfm
@@ -64,7 +64,7 @@
 
   <cfset whereSQL = arrayToList(whereClauses, " AND ")>
 
-  <cfset qTasks = queryExecute("
+  <cfset qTasks = queryTimed("
     SELECT
       t.ID,
       t.BusinessID,
diff --git a/api/tasks/listPending.cfm b/api/tasks/listPending.cfm
index 577e397..9c4c20f 100644
--- a/api/tasks/listPending.cfm
+++ b/api/tasks/listPending.cfm
@@ -36,7 +36,7 @@
 
 <cftry>
   <!--- Get business name --->
-  <cfset qBusiness = queryExecute("
+  <cfset qBusiness = queryTimed("
     SELECT Name FROM Businesses WHERE ID = ?
   ", [ { value = BusinessID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
   <cfset businessName = qBusiness.recordCount GT 0 ? qBusiness.Name : "">
@@ -54,7 +54,7 @@
 
   <cfset whereSQL = arrayToList(whereClauses, " AND ")>
 
-  <cfset qTasks = queryExecute("
+  <cfset qTasks = queryTimed("
     SELECT
       t.ID,
       t.BusinessID,
diff --git a/api/tasks/listTypes.cfm b/api/tasks/listTypes.cfm
index c72ca4a..98a7eec 100644
--- a/api/tasks/listTypes.cfm
+++ b/api/tasks/listTypes.cfm
@@ -44,7 +44,7 @@ try {
     }
 
     // Get task types for this business
-    q = queryExecute("
+    q = queryTimed("
         SELECT
             ID as TaskTypeID,
             Name as TaskTypeName,
diff --git a/api/tasks/reorderTypes.cfm b/api/tasks/reorderTypes.cfm
index 75dddd6..05f896a 100644
--- a/api/tasks/reorderTypes.cfm
+++ b/api/tasks/reorderTypes.cfm
@@ -46,7 +46,7 @@ try {
     for (taskTypeID in orderArray) {
         if (isNumeric(taskTypeID)) {
             sortOrder++;
-            queryExecute("
+            queryTimed("
                 UPDATE tt_TaskTypes
                 SET SortOrder = :sortOrder
                 WHERE tt_TaskTypeID = :taskTypeID
diff --git a/api/tasks/saveCategory.cfm b/api/tasks/saveCategory.cfm
index 120ff6c..501901f 100644
--- a/api/tasks/saveCategory.cfm
+++ b/api/tasks/saveCategory.cfm
@@ -65,7 +65,7 @@ try {
 
     if (categoryID > 0) {
         // UPDATE existing category
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT ID FROM TaskCategories
             WHERE ID = :id AND BusinessID = :businessID
         ", {
@@ -77,7 +77,7 @@ try {
             apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Category not found" });
         }
 
-        queryExecute("
+        queryTimed("
             UPDATE TaskCategories SET
                 Name = :name,
                 Color = :color
@@ -96,7 +96,7 @@ try {
 
     } else {
         // INSERT new category
-        queryExecute("
+        queryTimed("
             INSERT INTO TaskCategories (BusinessID, Name, Color)
             VALUES (:businessID, :name, :color)
         ", {
@@ -105,7 +105,7 @@ try {
             color: { value: categoryColor, cfsqltype: "cf_sql_varchar" }
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
 
         apiAbort({
             "OK": true,
diff --git a/api/tasks/saveType.cfm b/api/tasks/saveType.cfm
index 75e9aa2..0c59742 100644
--- a/api/tasks/saveType.cfm
+++ b/api/tasks/saveType.cfm
@@ -94,7 +94,7 @@ try {
 
     if (taskTypeID > 0) {
         // UPDATE - verify it belongs to this business
-        qCheck = queryExecute("
+        qCheck = queryTimed("
             SELECT tt_TaskTypeID FROM tt_TaskTypes
             WHERE tt_TaskTypeID = :taskTypeID
               AND BusinessID = :businessID
@@ -107,7 +107,7 @@ try {
             apiAbort({ "OK": false, "ERROR": "not_found", "MESSAGE": "Task type not found or does not belong to this business" });
         }
 
-        queryExecute("
+        queryTimed("
             UPDATE tt_TaskTypes
             SET Name = :taskTypeName,
                 Description = :taskTypeDescription,
@@ -131,7 +131,7 @@ try {
         });
     } else {
         // INSERT new task type
-        queryExecute("
+        queryTimed("
             INSERT INTO tt_TaskTypes (Name, Description, Icon, Color, BusinessID, TaskCategoryID)
             VALUES (:taskTypeName, :taskTypeDescription, :taskTypeIcon, :taskTypeColor, :businessID, :categoryID)
         ", {
@@ -143,7 +143,7 @@ try {
             categoryID: { value: taskTypeCategoryID, cfsqltype: "cf_sql_integer", null: isNull(taskTypeCategoryID) }
         }, { datasource: "payfrit" });
 
-        qNew = queryExecute("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
+        qNew = queryTimed("SELECT LAST_INSERT_ID() as newID", [], { datasource: "payfrit" });
         newID = qNew.newID;
 
         apiAbort({
diff --git a/api/tasks/seedCategories.cfm b/api/tasks/seedCategories.cfm
index b48f60b..7687f5b 100644
--- a/api/tasks/seedCategories.cfm
+++ b/api/tasks/seedCategories.cfm
@@ -45,7 +45,7 @@ try {
     }
 
     // Check if categories already exist
-    qCheck = queryExecute("
+    qCheck = queryTimed("
         SELECT COUNT(*) AS cnt FROM TaskCategories
         WHERE BusinessID = :businessID
     ", {
@@ -54,7 +54,7 @@ try {
 
     if (qCheck.cnt > 0) {
         // Categories already exist, just return them
-        qCategories = queryExecute("
+        qCategories = queryTimed("
             SELECT ID, Name, Color
             FROM TaskCategories
             WHERE BusinessID = :businessID AND IsActive = 1
@@ -92,7 +92,7 @@ try {
 
     // Insert defaults
     for (cat in defaults) {
-        queryExecute("
+        queryTimed("
             INSERT INTO TaskCategories (BusinessID, Name, Color)
             VALUES (:businessID, :name, :color)
         ", {
@@ -103,7 +103,7 @@ try {
     }
 
     // Return the created categories
-    qCategories = queryExecute("
+    qCategories = queryTimed("
         SELECT ID, Name, Color
         FROM TaskCategories
         WHERE BusinessID = :businessID AND IsActive = 1
diff --git a/api/tasks/setup.cfm b/api/tasks/setup.cfm
index e623fb6..5aca0e1 100644
--- a/api/tasks/setup.cfm
+++ b/api/tasks/setup.cfm
@@ -2,7 +2,7 @@
 <cfcontent type="application/json; charset=utf-8">
 
 <cftry>
-  <cfset queryExecute("
+  <cfset queryTimed("
     CREATE TABLE IF NOT EXISTS TaskCategories (
       ID INT AUTO_INCREMENT PRIMARY KEY,
       BusinessID INT NOT NULL,
@@ -15,10 +15,10 @@
   ", [], { datasource = "payfrit" })>
 
   <!--- Check if categories exist --->
-  <cfset qCheck = queryExecute("SELECT COUNT(*) AS cnt FROM TaskCategories WHERE BusinessID = 17", [], { datasource = "payfrit" })>
+  <cfset qCheck = queryTimed("SELECT COUNT(*) AS cnt FROM TaskCategories WHERE BusinessID = 17", [], { datasource = "payfrit" })>
   
   <cfif qCheck.cnt EQ 0>
-    <cfset queryExecute("
+    <cfset queryTimed("
       INSERT INTO TaskCategories (BusinessID, Name, Color) VALUES
       (17, 'Delivery', '##FF5722'),
       (17, 'Pickup', '##4CAF50'),
@@ -27,10 +27,10 @@
   </cfif>
 
   <!--- Add test tasks if none exist --->
-  <cfset qTasks = queryExecute("SELECT COUNT(*) AS cnt FROM Tasks WHERE BusinessID = 17 AND StatusID = 0", [], { datasource = "payfrit" })>
+  <cfset qTasks = queryTimed("SELECT COUNT(*) AS cnt FROM Tasks WHERE BusinessID = 17 AND StatusID = 0", [], { datasource = "payfrit" })>
   
   <cfif qTasks.cnt EQ 0>
-    <cfset queryExecute("
+    <cfset queryTimed("
       INSERT INTO Tasks (BusinessID, CategoryID, Title, Details, StatusID) VALUES
       (17, 1, 'Deliver Order ##1042', 'Customer: John Smith, Address: 123 Main St', 0),
       (17, 2, 'Pickup Ready - Table 5', 'Order ready for customer pickup', 0),
diff --git a/api/users/search.cfm b/api/users/search.cfm
index ca30315..f646619 100644
--- a/api/users/search.cfm
+++ b/api/users/search.cfm
@@ -36,7 +36,7 @@ try {
     // Exclude the current user from results
     searchTerm = "%" & query & "%";
 
-    qUsers = queryExecute("
+    qUsers = queryTimed("
         SELECT
             u.ID,
             u.FirstName,
diff --git a/api/workers/createAccount.cfm b/api/workers/createAccount.cfm
index 2d9d7ba..a5c2ad7 100644
--- a/api/workers/createAccount.cfm
+++ b/api/workers/createAccount.cfm
@@ -24,7 +24,7 @@ try {
         abort;
     }
 
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT StripeConnectedAccountID, EmailAddress, FirstName, LastName
         FROM Users WHERE ID = :userID
     ", { userID: userID }, { datasource: "payfrit" });
@@ -78,7 +78,7 @@ try {
     newAccountID = acctData.id;
 
     // Save to Users table
-    queryExecute("
+    queryTimed("
         UPDATE Users SET StripeConnectedAccountID = :acctID WHERE ID = :userID
     ", { acctID: newAccountID, userID: userID }, { datasource: "payfrit" });
 
diff --git a/api/workers/earlyUnlock.cfm b/api/workers/earlyUnlock.cfm
index 2dee73c..1de0c7c 100644
--- a/api/workers/earlyUnlock.cfm
+++ b/api/workers/earlyUnlock.cfm
@@ -25,7 +25,7 @@ try {
         abort;
     }
 
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT ActivationBalanceCents, ActivationCapCents
         FROM Users WHERE ID = :userID
     ", { userID: userID }, { datasource: "payfrit" });
diff --git a/api/workers/ledger.cfm b/api/workers/ledger.cfm
index 3bfb7fa..4955ba4 100644
--- a/api/workers/ledger.cfm
+++ b/api/workers/ledger.cfm
@@ -25,7 +25,7 @@ try {
     }
 
     // Get ledger entries (most recent first)
-    qLedger = queryExecute("
+    qLedger = queryTimed("
         SELECT ID, TaskID, GrossEarningsCents, ActivationWithheldCents,
                NetTransferCents, Status, CreatedAt
         FROM WorkPayoutLedgers
@@ -35,7 +35,7 @@ try {
     ", { userID: userID }, { datasource: "payfrit" });
 
     // Get totals
-    qTotals = queryExecute("
+    qTotals = queryTimed("
         SELECT
             COALESCE(SUM(GrossEarningsCents), 0) AS TotalGrossCents,
             COALESCE(SUM(ActivationWithheldCents), 0) AS TotalWithheldCents,
diff --git a/api/workers/myBusinesses.cfm b/api/workers/myBusinesses.cfm
index 2a8845b..9e0c4ca 100644
--- a/api/workers/myBusinesses.cfm
+++ b/api/workers/myBusinesses.cfm
@@ -34,7 +34,7 @@
 </cfif>
 
 <cftry>
-  <cfset qBusinesses = queryExecute("
+  <cfset qBusinesses = queryTimed("
     SELECT
       MIN(e.ID) AS EmployeeID,
       e.BusinessID,
diff --git a/api/workers/onboardingLink.cfm b/api/workers/onboardingLink.cfm
index 77818bf..55d5146 100644
--- a/api/workers/onboardingLink.cfm
+++ b/api/workers/onboardingLink.cfm
@@ -24,7 +24,7 @@ try {
         abort;
     }
 
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT StripeConnectedAccountID FROM Users WHERE ID = :userID
     ", { userID: userID }, { datasource: "payfrit" });
 
diff --git a/api/workers/tierStatus.cfm b/api/workers/tierStatus.cfm
index 6756097..ba55869 100644
--- a/api/workers/tierStatus.cfm
+++ b/api/workers/tierStatus.cfm
@@ -27,7 +27,7 @@ try {
         abort;
     }
 
-    qUser = queryExecute("
+    qUser = queryTimed("
         SELECT StripeConnectedAccountID, StripePayoutsEnabled,
                ActivationBalanceCents, ActivationCapCents
         FROM Users WHERE ID = :userID
diff --git a/portal/index.html b/portal/index.html
index 1c62e92..2132b77 100644
--- a/portal/index.html
+++ b/portal/index.html
@@ -31,6 +31,15 @@
         </button>
       </div>
 
+      <!-- Business Card -->
+      <div class="business-info" style="padding: 12px 16px; border-bottom: 1px solid var(--gray-200);">
+        <div class="business-avatar" id="businessAvatar">B</div>
+        <div class="business-details">
+          <div class="business-name" id="businessName">Loading...</div>
+          <div class="business-status online">Online</div>
+        </div>
+      </div>
+
       <nav class="sidebar-nav">
         <a href="#dashboard" class="nav-item active" data-page="dashboard">
           <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
@@ -103,33 +112,7 @@
         </a>
       </nav>
 
-      <div class="sidebar-footer">
-        <div class="business-info">
-          <div class="business-avatar" id="businessAvatar">B</div>
-          <div class="business-details">
-            <div class="business-name" id="businessName">Loading...</div>
-            <div class="business-status online">Online</div>
-          </div>
-        </div>
-        <a href="#" class="nav-item" onclick="Portal.switchBusiness(); return false;">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M16 3h5v5M8 3H3v5M3 16v5h5M21 16v5h-5M7 12h10"/>
-          </svg>
-          <span>Switch Business</span>
-        </a>
-        <a href="#" class="nav-item" onclick="Portal.addNewBusiness(); return false;">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M12 5v14M5 12h14"/>
-          </svg>
-          <span>Add New Business</span>
-        </a>
-        <a href="#logout" class="nav-item logout" data-page="logout">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M9 21H5a2 2 0 01-2-2V5a2 2 0 012-2h4M16 17l5-5-5-5M21 12H9"/>
-          </svg>
-          <span>Logout</span>
-        </a>
-      </div>
+
     </aside>
 
     <!-- Main Content -->
@@ -145,10 +128,29 @@
               <path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/>
             </svg>
           </button>
-          <div class="user-menu">
-            <button class="user-btn" id="userBtn">
-              <span class="user-avatar" id="userAvatar">U</span>
+          <div class="user-menu" style="position: relative;">
+            <button class="user-btn" id="userBtn" onclick="document.getElementById('userDropdown').classList.toggle('show')">
+              <span class="user-avatar" id="userAvatar">B</span>
             </button>
+            <div class="user-dropdown" id="userDropdown" style="display:none; position:absolute; right:0; top:100%; margin-top:8px; background:var(--bg-card); border:1px solid var(--border-color); border-radius:8px; min-width:200px; box-shadow:0 4px 12px rgba(0,0,0,0.3); z-index:1000; overflow:hidden;">
+              <a href="#settings" class="nav-item" data-page="settings" onclick="document.getElementById('userDropdown').classList.remove('show'); Portal.navigate('settings');" style="display:flex; align-items:center; gap:10px; padding:12px 16px; color:var(--text-primary); text-decoration:none; transition:background 0.15s;" onmouseover="this.style.background='var(--bg-secondary)'" onmouseout="this.style.background=''">
+                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 010 2.83 2 2 0 01-2.83 0l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.6 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.6a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06a1.65 1.65 0 00-.33 1.82V9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z"/></svg>
+                Settings
+              </a>
+              <a href="#" onclick="Portal.switchBusiness(); document.getElementById('userDropdown').classList.remove('show'); return false;" style="display:flex; align-items:center; gap:10px; padding:12px 16px; color:var(--text-primary); text-decoration:none; transition:background 0.15s;" onmouseover="this.style.background='var(--bg-secondary)'" onmouseout="this.style.background=''">
+                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 3h5v5M8 3H3v5M3 16v5h5M21 16v5h-5M7 12h10"/></svg>
+                Switch Business
+              </a>
+              <a href="#" onclick="Portal.addNewBusiness(); document.getElementById('userDropdown').classList.remove('show'); return false;" style="display:flex; align-items:center; gap:10px; padding:12px 16px; color:var(--text-primary); text-decoration:none; transition:background 0.15s;" onmouseover="this.style.background='var(--bg-secondary)'" onmouseout="this.style.background=''">
+                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 5v14M5 12h14"/></svg>
+                Add New Business
+              </a>
+              <div style="border-top: 1px solid var(--border-color);"></div>
+              <a href="#" onclick="Portal.logout(); return false;" style="display:flex; align-items:center; gap:10px; padding:12px 16px; color:#ef4444; text-decoration:none; transition:background 0.15s;" onmouseover="this.style.background='var(--bg-secondary)'" onmouseout="this.style.background=''">
+                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M9 21H5a2 2 0 01-2-2V5a2 2 0 012-2h4M16 17l5-5-5-5M21 12H9"/></svg>
+                Logout
+              </a>
+            </div>
           </div>
         </div>
       </header>
@@ -748,5 +750,30 @@
   <div class="toast-container" id="toastContainer"></div>
 
   <script src="portal.js?v=9"></script>
+
+  <!-- Close dropdown when clicking outside -->
+  <script>
+    document.addEventListener('click', function(e) {
+      const dropdown = document.getElementById('userDropdown');
+      const userBtn = document.getElementById('userBtn');
+      if (dropdown && !dropdown.contains(e.target) && !userBtn.contains(e.target)) {
+        dropdown.classList.remove('show');
+        dropdown.style.display = 'none';
+      }
+    });
+    // Toggle show/hide
+    const origBtn = document.getElementById('userBtn');
+    if (origBtn) {
+      origBtn.addEventListener('click', function(e) {
+        e.stopPropagation();
+        const dd = document.getElementById('userDropdown');
+        if (dd.style.display === 'none' || dd.style.display === '') {
+          dd.style.display = 'block';
+        } else {
+          dd.style.display = 'none';
+        }
+      });
+    }
+  </script>
 </body>
 </html>
diff --git a/portal/login.html b/portal/login.html
index 94af0a2..68d3a84 100644
--- a/portal/login.html
+++ b/portal/login.html
@@ -1,775 +1,775 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Login - Payfrit Business Portal</title>
-  <link rel="stylesheet" href="portal.css">
-  <style>
-    body {
-      background: var(--bg-primary);
-      min-height: 100vh;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .login-container {
-      width: 100%;
-      max-width: 420px;
-      padding: 20px;
-    }
-
-    .login-card {
-      background: var(--bg-card);
-      border-radius: 16px;
-      padding: 40px;
-      box-shadow: 0 4px 24px rgba(0, 0, 0, 0.3);
-    }
-
-    .login-header {
-      text-align: center;
-      margin-bottom: 32px;
-    }
-
-    .login-logo {
-      width: 64px;
-      height: 64px;
-      background: var(--primary);
-      color: #000;
-      border-radius: 16px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 32px;
-      font-weight: 700;
-      margin: 0 auto 16px;
-    }
-
-    .login-header h1 {
-      font-size: 24px;
-      margin: 0 0 8px;
-      color: var(--text-primary);
-    }
-
-    .login-header p {
-      color: var(--text-muted);
-      margin: 0;
-      font-size: 14px;
-    }
-
-    .login-form {
-      display: flex;
-      flex-direction: column;
-      gap: 20px;
-    }
-
-    .form-group {
-      display: flex;
-      flex-direction: column;
-      gap: 8px;
-    }
-
-    .form-group label {
-      font-size: 14px;
-      font-weight: 500;
-      color: var(--text-secondary);
-    }
-
-    .form-group input {
-      padding: 14px 16px;
-      background: var(--bg-secondary);
-      border: 1px solid var(--border-color);
-      border-radius: 8px;
-      color: var(--text-primary);
-      font-size: 15px;
-      transition: all 0.2s;
-    }
-
-    .form-group input:focus {
-      outline: none;
-      border-color: var(--primary);
-      box-shadow: 0 0 0 3px rgba(0, 255, 136, 0.1);
-    }
-
-    .form-group input::placeholder {
-      color: var(--text-muted);
-    }
-
-    .login-btn {
-      padding: 14px 24px;
-      background: var(--primary);
-      color: #000;
-      border: none;
-      border-radius: 8px;
-      font-size: 16px;
-      font-weight: 600;
-      cursor: pointer;
-      transition: all 0.2s;
-      margin-top: 8px;
-    }
-
-    .login-btn:hover {
-      background: var(--primary-hover);
-      transform: translateY(-1px);
-    }
-
-    .login-btn:disabled {
-      opacity: 0.6;
-      cursor: not-allowed;
-      transform: none;
-    }
-
-    .login-error {
-      background: rgba(239, 68, 68, 0.1);
-      border: 1px solid rgba(239, 68, 68, 0.3);
-      color: #ef4444;
-      padding: 12px 16px;
-      border-radius: 8px;
-      font-size: 14px;
-      display: none;
-    }
-
-    .login-error.show {
-      display: block;
-    }
-
-    .login-success {
-      background: rgba(0, 255, 136, 0.1);
-      border: 1px solid rgba(0, 255, 136, 0.3);
-      color: var(--primary);
-      padding: 12px 16px;
-      border-radius: 8px;
-      font-size: 14px;
-      display: none;
-    }
-
-    .login-success.show {
-      display: block;
-    }
-
-    .login-footer {
-      text-align: center;
-      margin-top: 24px;
-      padding-top: 24px;
-      border-top: 1px solid var(--border-color);
-    }
-
-    .login-footer a {
-      color: var(--primary);
-      text-decoration: none;
-      font-size: 14px;
-    }
-
-    .login-footer a:hover {
-      text-decoration: underline;
-    }
-
-    .business-select {
-      padding: 14px 16px;
-      background: var(--bg-secondary);
-      border: 1px solid var(--border-color);
-      border-radius: 8px;
-      color: var(--text-primary);
-      font-size: 15px;
-      width: 100%;
-      cursor: pointer;
-    }
-
-    .business-select:focus {
-      outline: none;
-      border-color: var(--primary);
-    }
-
-    .login-card {
-      visibility: hidden;
-    }
-
-    .login-card.ready {
-      visibility: visible;
-    }
-
-    .step {
-      display: none;
-    }
-
-    .step.active {
-      display: block;
-    }
-
-    .otp-input {
-      text-align: center;
-      font-size: 24px;
-      font-weight: 600;
-      letter-spacing: 8px;
-      padding: 14px 16px;
-    }
-
-    .switch-link {
-      color: var(--text-muted);
-      text-decoration: none;
-      font-size: 13px;
-      cursor: pointer;
-    }
-
-    .switch-link:hover {
-      color: var(--primary);
-      text-decoration: underline;
-    }
-
-    .resend-link {
-      color: var(--text-muted);
-      font-size: 13px;
-      cursor: pointer;
-      background: none;
-      border: none;
-      padding: 0;
-      text-decoration: none;
-    }
-
-    .resend-link:hover {
-      color: var(--primary);
-      text-decoration: underline;
-    }
-
-    .resend-link:disabled {
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-  </style>
-</head>
-<body>
-  <div class="login-container">
-    <div class="login-card">
-      <div class="login-header">
-        <div class="login-logo">P</div>
-        <h1>Business Portal</h1>
-        <p id="loginSubtitle">Sign in with your email</p>
-      </div>
-
-      <!-- Step 1: OTP - Enter Email -->
-      <div class="step" id="step-otp-email">
-        <form class="login-form" id="otpEmailForm">
-          <div class="login-error" id="otpEmailError"></div>
-
-          <div class="form-group">
-            <label for="otpEmail">Email Address</label>
-            <input type="email" id="otpEmail" name="email" placeholder="Enter your email" required>
-          </div>
-
-          <button type="submit" class="login-btn" id="sendCodeBtn">Send Login Code</button>
-        </form>
-
-        <div class="login-footer">
-          <a href="#" class="switch-link" onclick="PortalLogin.showStep('password'); return false;">Sign in with password instead</a>
-        </div>
-      </div>
-
-      <!-- Step 2: OTP - Enter Code -->
-      <div class="step" id="step-otp-code">
-        <form class="login-form" id="otpCodeForm">
-          <div class="login-error" id="otpCodeError"></div>
-          <div class="login-success" id="otpCodeSuccess">A 6-digit code has been sent to your email.</div>
-
-          <div class="form-group">
-            <label for="otpCode">Enter 6-Digit Code</label>
-            <input type="text" id="otpCode" name="code" class="otp-input" placeholder="000000" maxlength="6" pattern="[0-9]{6}" inputmode="numeric" autocomplete="one-time-code" required>
-          </div>
-
-          <button type="submit" class="login-btn" id="verifyCodeBtn">Verify Code</button>
-        </form>
-
-        <div class="login-footer" style="display: flex; justify-content: space-between; align-items: center;">
-          <a href="#" class="switch-link" onclick="PortalLogin.showStep('otp-email'); return false;">Change email</a>
-          <button class="resend-link" id="resendBtn" onclick="PortalLogin.resendCode()">Resend code</button>
-        </div>
-      </div>
-
-      <!-- Step 3: Password Login (fallback) -->
-      <div class="step" id="step-password">
-        <form class="login-form" id="loginForm">
-          <div class="login-error" id="loginError"></div>
-
-          <div class="form-group">
-            <label for="username">Email or Phone</label>
-            <input type="text" id="username" name="username" placeholder="Enter your email or phone" required>
-          </div>
-
-          <div class="form-group">
-            <label for="password">Password</label>
-            <input type="password" id="password" name="password" placeholder="Enter your password" required>
-          </div>
-
-          <button type="submit" class="login-btn" id="loginBtn">Sign In</button>
-        </form>
-
-        <div class="login-footer">
-          <a href="#" class="switch-link" onclick="PortalLogin.showStep('otp-email'); return false;">Sign in with email code instead</a>
-        </div>
-      </div>
-
-      <!-- Step 4: Select Business -->
-      <div class="step" id="step-business">
-        <div class="login-form">
-          <div class="form-group">
-            <label for="businessSelect">Select Business</label>
-            <select id="businessSelect" class="business-select" onchange="PortalLogin.selectBusiness()">
-              <option value="">Choose a business...</option>
-            </select>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <script>
-    const BASE_PATH = (() => {
-      const path = window.location.pathname;
-      const portalIndex = path.indexOf('/portal/');
-      if (portalIndex > 0) {
-        return path.substring(0, portalIndex);
-      }
-      return '';
-    })();
-
-    const PortalLogin = {
-      userToken: null,
-      userId: null,
-      businesses: [],
-      otpEmail: null,
-      resendCooldown: false,
-
-      init() {
-        const card = document.querySelector('.login-card');
-        const savedToken = localStorage.getItem('payfrit_portal_token');
-        const savedBusiness = localStorage.getItem('payfrit_portal_business');
-        const savedUserId = localStorage.getItem('payfrit_portal_userid');
-
-        if (savedToken && savedBusiness) {
-          this.verifyAndRedirect(savedToken, savedBusiness);
-          return;
-        }
-
-        if (savedToken && savedUserId) {
-          this.userToken = savedToken;
-          this.userId = parseInt(savedUserId);
-          this.showStep('business');
-          card.classList.add('ready');
-          this.loadBusinessesAndShow();
-          return;
-        }
-
-        // Default: show OTP email step
-        this.showStep('otp-email');
-        card.classList.add('ready');
-
-        // OTP email form
-        document.getElementById('otpEmailForm').addEventListener('submit', (e) => {
-          e.preventDefault();
-          this.sendOTP();
-        });
-
-        // OTP code form
-        document.getElementById('otpCodeForm').addEventListener('submit', (e) => {
-          e.preventDefault();
-          this.verifyOTP();
-        });
-
-        // Password login form
-        document.getElementById('loginForm').addEventListener('submit', (e) => {
-          e.preventDefault();
-          this.login();
-        });
-      },
-
-      async loadBusinessesAndShow() {
-        await this.loadBusinesses();
-
-        if (this.businesses.length === 0) {
-          this.startNewRestaurant();
-        } else if (this.businesses.length === 1) {
-          this.selectBusinessById(this.businesses[0].BusinessID);
-        } else {
-          this.showStep('business');
-        }
-      },
-
-      async verifyAndRedirect(token, businessId) {
-        localStorage.setItem('payfrit_portal_business', businessId);
-        window.location.href = BASE_PATH + '/portal/index.html';
-      },
-
-      // --- OTP Flow ---
-
-      async sendOTP() {
-        const email = document.getElementById('otpEmail').value.trim();
-        const errorEl = document.getElementById('otpEmailError');
-        const btn = document.getElementById('sendCodeBtn');
-
-        if (!email) return;
-
-        errorEl.classList.remove('show');
-        btn.disabled = true;
-        btn.textContent = 'Sending...';
-
-        try {
-          const response = await fetch(BASE_PATH + '/api/auth/sendLoginOTP.cfm', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ Email: email })
-          });
-
-          const text = await response.text();
-          let data;
-          try {
-            data = JSON.parse(text);
-          } catch (parseErr) {
-            console.error('[OTP] JSON parse error:', parseErr);
-            errorEl.textContent = 'Server error. Please try again.';
-            errorEl.classList.add('show');
-            btn.disabled = false;
-            btn.textContent = 'Send Login Code';
-            return;
-          }
-
-          if (data.OK) {
-            this.otpEmail = email;
-
-            // On dev, show the code for testing
-            if (data.DEV_OTP) {
-              console.log('[OTP] Dev code:', data.DEV_OTP);
-              document.getElementById('otpCodeSuccess').textContent =
-                'Dev mode - your code is: ' + data.DEV_OTP;
-            } else {
-              document.getElementById('otpCodeSuccess').textContent =
-                'A 6-digit code has been sent to ' + email;
-            }
-
-            document.getElementById('otpCodeSuccess').classList.add('show');
-            this.showStep('otp-code');
-            document.getElementById('otpCode').focus();
-          } else {
-            errorEl.textContent = data.MESSAGE || data.ERROR || 'Could not send code. Please try again.';
-            errorEl.classList.add('show');
-          }
-        } catch (err) {
-          console.error('[OTP] Send error:', err);
-          errorEl.textContent = 'Connection error. Please try again.';
-          errorEl.classList.add('show');
-        }
-
-        btn.disabled = false;
-        btn.textContent = 'Send Login Code';
-      },
-
-      async verifyOTP() {
-        const code = document.getElementById('otpCode').value.trim();
-        const errorEl = document.getElementById('otpCodeError');
-        const btn = document.getElementById('verifyCodeBtn');
-
-        if (!code || code.length !== 6) {
-          errorEl.textContent = 'Please enter the 6-digit code.';
-          errorEl.classList.add('show');
-          return;
-        }
-
-        errorEl.classList.remove('show');
-        btn.disabled = true;
-        btn.textContent = 'Verifying...';
-
-        try {
-          const response = await fetch(BASE_PATH + '/api/auth/verifyEmailOTP.cfm', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ Email: this.otpEmail, Code: code })
-          });
-
-          const text = await response.text();
-          let data;
-          try {
-            data = JSON.parse(text);
-          } catch (parseErr) {
-            console.error('[OTP] Verify parse error:', parseErr);
-            errorEl.textContent = 'Server error. Please try again.';
-            errorEl.classList.add('show');
-            btn.disabled = false;
-            btn.textContent = 'Verify Code';
-            return;
-          }
-
-          if (data.OK && data.TOKEN) {
-            // Normalize key casing
-            const token = data.TOKEN || data.Token;
-            const userId = data.USERID || data.UserID;
-
-            this.userToken = token;
-            this.userId = userId;
-
-            localStorage.setItem('payfrit_portal_token', token);
-            localStorage.setItem('payfrit_portal_userid', userId);
-            const firstName = data.FIRSTNAME || data.FirstName || '';
-            if (firstName) localStorage.setItem('payfrit_portal_firstname', firstName);
-
-            await this.loadBusinesses();
-
-            const card = document.querySelector('.login-card');
-            if (this.businesses.length === 0) {
-              this.startNewRestaurant();
-            } else if (this.businesses.length === 1) {
-              this.selectBusinessById(this.businesses[0].BusinessID);
-            } else {
-              this.showStep('business');
-              card.classList.add('ready');
-            }
-          } else {
-            const friendlyErrors = {
-              'invalid_code': 'Invalid or expired code. Please try again.',
-              'expired': 'Code has expired. Please request a new one.',
-              'user_not_found': 'No account found with that email.'
-            };
-            errorEl.textContent = friendlyErrors[data.ERROR] || data.MESSAGE || 'Invalid code. Please try again.';
-            errorEl.classList.add('show');
-            document.getElementById('otpCode').value = '';
-            document.getElementById('otpCode').focus();
-          }
-        } catch (err) {
-          console.error('[OTP] Verify error:', err);
-          errorEl.textContent = 'Connection error. Please try again.';
-          errorEl.classList.add('show');
-        }
-
-        btn.disabled = false;
-        btn.textContent = 'Verify Code';
-      },
-
-      async resendCode() {
-        if (this.resendCooldown) return;
-
-        const btn = document.getElementById('resendBtn');
-        this.resendCooldown = true;
-        btn.disabled = true;
-
-        // Re-send OTP
-        try {
-          const response = await fetch(BASE_PATH + '/api/auth/sendLoginOTP.cfm', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ Email: this.otpEmail })
-          });
-
-          const text = await response.text();
-          let data;
-          try { data = JSON.parse(text); } catch (e) { data = {}; }
-
-          const successEl = document.getElementById('otpCodeSuccess');
-          if (data.OK) {
-            if (data.DEV_OTP) {
-              successEl.textContent = 'Dev mode - new code: ' + data.DEV_OTP;
-            } else {
-              successEl.textContent = 'A new code has been sent to ' + this.otpEmail;
-            }
-            successEl.classList.add('show');
-          }
-        } catch (err) {
-          console.error('[OTP] Resend error:', err);
-        }
-
-        // 30-second cooldown
-        let seconds = 30;
-        btn.textContent = 'Resend (' + seconds + 's)';
-        const interval = setInterval(() => {
-          seconds--;
-          if (seconds <= 0) {
-            clearInterval(interval);
-            btn.textContent = 'Resend code';
-            btn.disabled = false;
-            this.resendCooldown = false;
-          } else {
-            btn.textContent = 'Resend (' + seconds + 's)';
-          }
-        }, 1000);
-      },
-
-      // --- Password Login (fallback) ---
-
-      async login() {
-        const username = document.getElementById('username').value.trim();
-        const password = document.getElementById('password').value;
-        const errorEl = document.getElementById('loginError');
-        const btn = document.getElementById('loginBtn');
-
-        errorEl.classList.remove('show');
-        btn.disabled = true;
-        btn.textContent = 'Signing in...';
-
-        try {
-          const response = await fetch(BASE_PATH + '/api/auth/login.cfm', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ username, password })
-          });
-
-          const text = await response.text();
-          let data;
-          try {
-            data = JSON.parse(text);
-          } catch (parseErr) {
-            console.error("[Login] JSON parse error:", parseErr);
-            errorEl.textContent = "Server error - check browser console (F12)";
-            errorEl.classList.add("show");
-            btn.disabled = false;
-            btn.textContent = "Sign In";
-            return;
-          }
-
-          if (data.OK && (data.Token || data.TOKEN)) {
-            const token = data.Token || data.TOKEN;
-            const userId = data.UserID || data.USERID;
-
-            this.userToken = token;
-            this.userId = userId;
-
-            localStorage.setItem('payfrit_portal_token', token);
-            localStorage.setItem('payfrit_portal_userid', userId);
-            const firstName = data.FirstName || data.FIRSTNAME || '';
-            if (firstName) localStorage.setItem('payfrit_portal_firstname', firstName);
-
-            await this.loadBusinesses();
-
-            const card = document.querySelector('.login-card');
-            if (this.businesses.length === 0) {
-              this.startNewRestaurant();
-            } else if (this.businesses.length === 1) {
-              this.selectBusinessById(this.businesses[0].BusinessID);
-            } else {
-              this.showStep('business');
-              card.classList.add('ready');
-            }
-          } else {
-            const friendlyErrors = {
-              'bad_credentials': 'Incorrect email/phone or password. Please try again.',
-              'not_found': 'No account found with that email or phone number.',
-              'account_disabled': 'This account has been disabled. Please contact support.'
-            };
-            errorEl.textContent = friendlyErrors[data.ERROR] || data.MESSAGE || 'Invalid credentials';
-            errorEl.classList.add('show');
-          }
-        } catch (err) {
-          console.error('[Login] Error:', err);
-          errorEl.textContent = 'Connection error. Please try again.';
-          errorEl.classList.add('show');
-        }
-
-        btn.disabled = false;
-        btn.textContent = 'Sign In';
-      },
-
-      // --- Business Selection ---
-
-      async loadBusinesses() {
-        try {
-          console.log('[Login] Loading businesses for UserID:', this.userId);
-          const bizResponse = await fetch(BASE_PATH + '/api/portal/myBusinesses.cfm', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-              'X-User-Token': this.userToken
-            },
-            body: JSON.stringify({ UserID: this.userId })
-          });
-
-          const bizText = await bizResponse.text();
-          let bizData;
-          try {
-            bizData = JSON.parse(bizText);
-          } catch (parseErr) {
-            console.error("[Login] Businesses JSON parse error:", parseErr);
-            return;
-          }
-
-          if (bizData.OK && bizData.BUSINESSES) {
-            this.businesses = bizData.BUSINESSES;
-            console.log('[Login] Loaded', this.businesses.length, 'businesses');
-            this.populateBusinessSelect();
-          } else {
-            console.error('[Login] Businesses API error:', bizData.ERROR || bizData.MESSAGE);
-          }
-        } catch (err) {
-          console.error('[Login] Error loading businesses:', err);
-        }
-      },
-
-      populateBusinessSelect() {
-        const select = document.getElementById('businessSelect');
-
-        if (this.businesses.length === 0) {
-          select.innerHTML = '<option value="">No businesses yet</option>';
-          const wizardOption = document.createElement('option');
-          wizardOption.value = 'NEW_WIZARD';
-          wizardOption.textContent = 'Create New Business';
-          select.appendChild(wizardOption);
-        } else {
-          select.innerHTML = '<option value="">Choose a business...</option>';
-
-          this.businesses.forEach(biz => {
-            const option = document.createElement('option');
-            option.value = biz.BusinessID;
-            option.textContent = biz.Name;
-            select.appendChild(option);
-          });
-
-          const wizardOption = document.createElement('option');
-          wizardOption.value = 'NEW_WIZARD';
-          wizardOption.textContent = 'New Business Wizard';
-          select.appendChild(wizardOption);
-        }
-      },
-
-      showStep(step) {
-        document.querySelectorAll('.step').forEach(s => s.classList.remove('active'));
-        const el = document.getElementById('step-' + step);
-        if (el) el.classList.add('active');
-
-        // Update subtitle
-        const subtitle = document.getElementById('loginSubtitle');
-        if (step === 'otp-email') subtitle.textContent = 'Sign in with your email';
-        else if (step === 'otp-code') subtitle.textContent = 'Enter your verification code';
-        else if (step === 'password') subtitle.textContent = 'Sign in with your password';
-        else if (step === 'business') subtitle.textContent = 'Select your business';
-
-        // Clear errors when switching
-        document.querySelectorAll('.login-error').forEach(e => e.classList.remove('show'));
-      },
-
-      selectBusiness() {
-        const businessId = document.getElementById('businessSelect').value;
-        if (businessId === 'NEW_WIZARD') {
-          this.startNewRestaurant();
-        } else if (businessId) {
-          this.selectBusinessById(businessId);
-        }
-      },
-
-      selectBusinessById(businessId) {
-        localStorage.setItem('payfrit_portal_business', businessId);
-        window.location.href = BASE_PATH + '/portal/index.html';
-      },
-
-      startNewRestaurant() {
-        localStorage.removeItem('payfrit_portal_business');
-        window.location.href = BASE_PATH + '/portal/setup-wizard.html';
-      },
-
-      logout() {
-        localStorage.removeItem('payfrit_portal_token');
-        localStorage.removeItem('payfrit_portal_userid');
-        localStorage.removeItem('payfrit_portal_business');
-        localStorage.removeItem('payfrit_portal_firstname');
-        window.location.href = BASE_PATH + '/portal/login.html';
-      }
-    };
-
-    document.addEventListener('DOMContentLoaded', () => PortalLogin.init());
-  </script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Login - Payfrit Business Portal</title>
+  <link rel="stylesheet" href="portal.css">
+  <style>
+    body {
+      background: var(--bg-primary);
+      min-height: 100vh;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .login-container {
+      width: 100%;
+      max-width: 420px;
+      padding: 20px;
+    }
+
+    .login-card {
+      background: var(--bg-card);
+      border-radius: 16px;
+      padding: 40px;
+      box-shadow: 0 4px 24px rgba(0, 0, 0, 0.3);
+    }
+
+    .login-header {
+      text-align: center;
+      margin-bottom: 32px;
+    }
+
+    .login-logo {
+      width: 64px;
+      height: 64px;
+      background: var(--primary);
+      color: #000;
+      border-radius: 16px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 32px;
+      font-weight: 700;
+      margin: 0 auto 16px;
+    }
+
+    .login-header h1 {
+      font-size: 24px;
+      margin: 0 0 8px;
+      color: var(--text-primary);
+    }
+
+    .login-header p {
+      color: var(--text-muted);
+      margin: 0;
+      font-size: 14px;
+    }
+
+    .login-form {
+      display: flex;
+      flex-direction: column;
+      gap: 20px;
+    }
+
+    .form-group {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+    }
+
+    .form-group label {
+      font-size: 14px;
+      font-weight: 500;
+      color: var(--text-secondary);
+    }
+
+    .form-group input {
+      padding: 14px 16px;
+      background: var(--bg-secondary);
+      border: 1px solid var(--border-color);
+      border-radius: 8px;
+      color: var(--text-primary);
+      font-size: 15px;
+      transition: all 0.2s;
+    }
+
+    .form-group input:focus {
+      outline: none;
+      border-color: var(--primary);
+      box-shadow: 0 0 0 3px rgba(0, 255, 136, 0.1);
+    }
+
+    .form-group input::placeholder {
+      color: var(--text-muted);
+    }
+
+    .login-btn {
+      padding: 14px 24px;
+      background: var(--primary);
+      color: #000;
+      border: none;
+      border-radius: 8px;
+      font-size: 16px;
+      font-weight: 600;
+      cursor: pointer;
+      transition: all 0.2s;
+      margin-top: 8px;
+    }
+
+    .login-btn:hover {
+      background: var(--primary-hover);
+      transform: translateY(-1px);
+    }
+
+    .login-btn:disabled {
+      opacity: 0.6;
+      cursor: not-allowed;
+      transform: none;
+    }
+
+    .login-error {
+      background: rgba(239, 68, 68, 0.1);
+      border: 1px solid rgba(239, 68, 68, 0.3);
+      color: #ef4444;
+      padding: 12px 16px;
+      border-radius: 8px;
+      font-size: 14px;
+      display: none;
+    }
+
+    .login-error.show {
+      display: block;
+    }
+
+    .login-success {
+      background: rgba(0, 255, 136, 0.1);
+      border: 1px solid rgba(0, 255, 136, 0.3);
+      color: var(--primary);
+      padding: 12px 16px;
+      border-radius: 8px;
+      font-size: 14px;
+      display: none;
+    }
+
+    .login-success.show {
+      display: block;
+    }
+
+    .login-footer {
+      text-align: center;
+      margin-top: 24px;
+      padding-top: 24px;
+      border-top: 1px solid var(--border-color);
+    }
+
+    .login-footer a {
+      color: var(--primary);
+      text-decoration: none;
+      font-size: 14px;
+    }
+
+    .login-footer a:hover {
+      text-decoration: underline;
+    }
+
+    .business-select {
+      padding: 14px 16px;
+      background: var(--bg-secondary);
+      border: 1px solid var(--border-color);
+      border-radius: 8px;
+      color: var(--text-primary);
+      font-size: 15px;
+      width: 100%;
+      cursor: pointer;
+    }
+
+    .business-select:focus {
+      outline: none;
+      border-color: var(--primary);
+    }
+
+    .login-card {
+      visibility: hidden;
+    }
+
+    .login-card.ready {
+      visibility: visible;
+    }
+
+    .step {
+      display: none;
+    }
+
+    .step.active {
+      display: block;
+    }
+
+    .otp-input {
+      text-align: center;
+      font-size: 24px;
+      font-weight: 600;
+      letter-spacing: 8px;
+      padding: 14px 16px;
+    }
+
+    .switch-link {
+      color: var(--text-muted);
+      text-decoration: none;
+      font-size: 13px;
+      cursor: pointer;
+    }
+
+    .switch-link:hover {
+      color: var(--primary);
+      text-decoration: underline;
+    }
+
+    .resend-link {
+      color: var(--text-muted);
+      font-size: 13px;
+      cursor: pointer;
+      background: none;
+      border: none;
+      padding: 0;
+      text-decoration: none;
+    }
+
+    .resend-link:hover {
+      color: var(--primary);
+      text-decoration: underline;
+    }
+
+    .resend-link:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+  </style>
+</head>
+<body>
+  <div class="login-container">
+    <div class="login-card">
+      <div class="login-header">
+        <div class="login-logo">P</div>
+        <h1>Business Portal</h1>
+        <p id="loginSubtitle">Sign in with your email</p>
+      </div>
+
+      <!-- Step 1: OTP - Enter Email -->
+      <div class="step" id="step-otp-email">
+        <form class="login-form" id="otpEmailForm">
+          <div class="login-error" id="otpEmailError"></div>
+
+          <div class="form-group">
+            <label for="otpEmail">Email Address</label>
+            <input type="email" id="otpEmail" name="email" placeholder="Enter your email" required>
+          </div>
+
+          <button type="submit" class="login-btn" id="sendCodeBtn">Send Login Code</button>
+        </form>
+
+        <div class="login-footer">
+          <a href="#" class="switch-link" onclick="PortalLogin.showStep('password'); return false;">Sign in with password instead</a>
+        </div>
+      </div>
+
+      <!-- Step 2: OTP - Enter Code -->
+      <div class="step" id="step-otp-code">
+        <form class="login-form" id="otpCodeForm">
+          <div class="login-error" id="otpCodeError"></div>
+          <div class="login-success" id="otpCodeSuccess">A 6-digit code has been sent to your email.</div>
+
+          <div class="form-group">
+            <label for="otpCode">Enter 6-Digit Code</label>
+            <input type="text" id="otpCode" name="code" class="otp-input" placeholder="000000" maxlength="6" pattern="[0-9]{6}" inputmode="numeric" autocomplete="one-time-code" required>
+          </div>
+
+          <button type="submit" class="login-btn" id="verifyCodeBtn">Verify Code</button>
+        </form>
+
+        <div class="login-footer" style="display: flex; justify-content: space-between; align-items: center;">
+          <a href="#" class="switch-link" onclick="PortalLogin.showStep('otp-email'); return false;">Change email</a>
+          <button class="resend-link" id="resendBtn" onclick="PortalLogin.resendCode()">Resend code</button>
+        </div>
+      </div>
+
+      <!-- Step 3: Password Login (fallback) -->
+      <div class="step" id="step-password">
+        <form class="login-form" id="loginForm">
+          <div class="login-error" id="loginError"></div>
+
+          <div class="form-group">
+            <label for="username">Email or Phone</label>
+            <input type="text" id="username" name="username" placeholder="Enter your email or phone" required>
+          </div>
+
+          <div class="form-group">
+            <label for="password">Password</label>
+            <input type="password" id="password" name="password" placeholder="Enter your password" required>
+          </div>
+
+          <button type="submit" class="login-btn" id="loginBtn">Sign In</button>
+        </form>
+
+        <div class="login-footer">
+          <a href="#" class="switch-link" onclick="PortalLogin.showStep('otp-email'); return false;">Sign in with email code instead</a>
+        </div>
+      </div>
+
+      <!-- Step 4: Select Business -->
+      <div class="step" id="step-business">
+        <div class="login-form">
+          <div class="form-group">
+            <label for="businessSelect">Select Business</label>
+            <select id="businessSelect" class="business-select" onchange="PortalLogin.selectBusiness()">
+              <option value="">Choose a business...</option>
+            </select>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    const BASE_PATH = (() => {
+      const path = window.location.pathname;
+      const portalIndex = path.indexOf('/portal/');
+      if (portalIndex > 0) {
+        return path.substring(0, portalIndex);
+      }
+      return '';
+    })();
+
+    const PortalLogin = {
+      userToken: null,
+      userId: null,
+      businesses: [],
+      otpEmail: null,
+      resendCooldown: false,
+
+      init() {
+        const card = document.querySelector('.login-card');
+        const savedToken = localStorage.getItem('payfrit_portal_token');
+        const savedBusiness = localStorage.getItem('payfrit_portal_business');
+        const savedUserId = localStorage.getItem('payfrit_portal_userid');
+
+        if (savedToken && savedBusiness) {
+          this.verifyAndRedirect(savedToken, savedBusiness);
+          return;
+        }
+
+        if (savedToken && savedUserId) {
+          this.userToken = savedToken;
+          this.userId = parseInt(savedUserId);
+          this.showStep('business');
+          card.classList.add('ready');
+          this.loadBusinessesAndShow();
+          return;
+        }
+
+        // Default: show OTP email step
+        this.showStep('otp-email');
+        card.classList.add('ready');
+
+        // OTP email form
+        document.getElementById('otpEmailForm').addEventListener('submit', (e) => {
+          e.preventDefault();
+          this.sendOTP();
+        });
+
+        // OTP code form
+        document.getElementById('otpCodeForm').addEventListener('submit', (e) => {
+          e.preventDefault();
+          this.verifyOTP();
+        });
+
+        // Password login form
+        document.getElementById('loginForm').addEventListener('submit', (e) => {
+          e.preventDefault();
+          this.login();
+        });
+      },
+
+      async loadBusinessesAndShow() {
+        await this.loadBusinesses();
+
+        if (this.businesses.length === 0) {
+          this.startNewRestaurant();
+        } else if (this.businesses.length === 1) {
+          this.selectBusinessById(this.businesses[0].BusinessID);
+        } else {
+          this.showStep('business');
+        }
+      },
+
+      async verifyAndRedirect(token, businessId) {
+        localStorage.setItem('payfrit_portal_business', businessId);
+        window.location.href = BASE_PATH + '/portal/index.html';
+      },
+
+      // --- OTP Flow ---
+
+      async sendOTP() {
+        const email = document.getElementById('otpEmail').value.trim();
+        const errorEl = document.getElementById('otpEmailError');
+        const btn = document.getElementById('sendCodeBtn');
+
+        if (!email) return;
+
+        errorEl.classList.remove('show');
+        btn.disabled = true;
+        btn.textContent = 'Sending...';
+
+        try {
+          const response = await fetch(BASE_PATH + '/api/auth/sendLoginOTP.cfm', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ Email: email })
+          });
+
+          const text = await response.text();
+          let data;
+          try {
+            data = JSON.parse(text);
+          } catch (parseErr) {
+            console.error('[OTP] JSON parse error:', parseErr);
+            errorEl.textContent = 'Server error. Please try again.';
+            errorEl.classList.add('show');
+            btn.disabled = false;
+            btn.textContent = 'Send Login Code';
+            return;
+          }
+
+          if (data.OK) {
+            this.otpEmail = email;
+
+            // On dev, show the code for testing
+            if (data.DEV_OTP) {
+              console.log('[OTP] Dev code:', data.DEV_OTP);
+              document.getElementById('otpCodeSuccess').textContent =
+                'Dev mode - your code is: ' + data.DEV_OTP;
+            } else {
+              document.getElementById('otpCodeSuccess').textContent =
+                'A 6-digit code has been sent to ' + email;
+            }
+
+            document.getElementById('otpCodeSuccess').classList.add('show');
+            this.showStep('otp-code');
+            document.getElementById('otpCode').focus();
+          } else {
+            errorEl.textContent = data.MESSAGE || data.ERROR || 'Could not send code. Please try again.';
+            errorEl.classList.add('show');
+          }
+        } catch (err) {
+          console.error('[OTP] Send error:', err);
+          errorEl.textContent = 'Connection error. Please try again.';
+          errorEl.classList.add('show');
+        }
+
+        btn.disabled = false;
+        btn.textContent = 'Send Login Code';
+      },
+
+      async verifyOTP() {
+        const code = document.getElementById('otpCode').value.trim();
+        const errorEl = document.getElementById('otpCodeError');
+        const btn = document.getElementById('verifyCodeBtn');
+
+        if (!code || code.length !== 6) {
+          errorEl.textContent = 'Please enter the 6-digit code.';
+          errorEl.classList.add('show');
+          return;
+        }
+
+        errorEl.classList.remove('show');
+        btn.disabled = true;
+        btn.textContent = 'Verifying...';
+
+        try {
+          const response = await fetch(BASE_PATH + '/api/auth/verifyEmailOTP.cfm', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ Email: this.otpEmail, Code: code })
+          });
+
+          const text = await response.text();
+          let data;
+          try {
+            data = JSON.parse(text);
+          } catch (parseErr) {
+            console.error('[OTP] Verify parse error:', parseErr);
+            errorEl.textContent = 'Server error. Please try again.';
+            errorEl.classList.add('show');
+            btn.disabled = false;
+            btn.textContent = 'Verify Code';
+            return;
+          }
+
+          if (data.OK && data.TOKEN) {
+            // Normalize key casing
+            const token = data.TOKEN || data.Token;
+            const userId = data.USERID || data.UserID;
+
+            this.userToken = token;
+            this.userId = userId;
+
+            localStorage.setItem('payfrit_portal_token', token);
+            localStorage.setItem('payfrit_portal_userid', userId);
+            const firstName = data.FIRSTNAME || data.FirstName || '';
+            if (firstName) localStorage.setItem('payfrit_portal_firstname', firstName);
+
+            await this.loadBusinesses();
+
+            const card = document.querySelector('.login-card');
+            if (this.businesses.length === 0) {
+              this.startNewRestaurant();
+            } else if (this.businesses.length === 1) {
+              this.selectBusinessById(this.businesses[0].BusinessID);
+            } else {
+              this.showStep('business');
+              card.classList.add('ready');
+            }
+          } else {
+            const friendlyErrors = {
+              'invalid_code': 'Invalid or expired code. Please try again.',
+              'expired': 'Code has expired. Please request a new one.',
+              'user_not_found': 'No account found with that email.'
+            };
+            errorEl.textContent = friendlyErrors[data.ERROR] || data.MESSAGE || 'Invalid code. Please try again.';
+            errorEl.classList.add('show');
+            document.getElementById('otpCode').value = '';
+            document.getElementById('otpCode').focus();
+          }
+        } catch (err) {
+          console.error('[OTP] Verify error:', err);
+          errorEl.textContent = 'Connection error. Please try again.';
+          errorEl.classList.add('show');
+        }
+
+        btn.disabled = false;
+        btn.textContent = 'Verify Code';
+      },
+
+      async resendCode() {
+        if (this.resendCooldown) return;
+
+        const btn = document.getElementById('resendBtn');
+        this.resendCooldown = true;
+        btn.disabled = true;
+
+        // Re-send OTP
+        try {
+          const response = await fetch(BASE_PATH + '/api/auth/sendLoginOTP.cfm', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ Email: this.otpEmail })
+          });
+
+          const text = await response.text();
+          let data;
+          try { data = JSON.parse(text); } catch (e) { data = {}; }
+
+          const successEl = document.getElementById('otpCodeSuccess');
+          if (data.OK) {
+            if (data.DEV_OTP) {
+              successEl.textContent = 'Dev mode - new code: ' + data.DEV_OTP;
+            } else {
+              successEl.textContent = 'A new code has been sent to ' + this.otpEmail;
+            }
+            successEl.classList.add('show');
+          }
+        } catch (err) {
+          console.error('[OTP] Resend error:', err);
+        }
+
+        // 30-second cooldown
+        let seconds = 30;
+        btn.textContent = 'Resend (' + seconds + 's)';
+        const interval = setInterval(() => {
+          seconds--;
+          if (seconds <= 0) {
+            clearInterval(interval);
+            btn.textContent = 'Resend code';
+            btn.disabled = false;
+            this.resendCooldown = false;
+          } else {
+            btn.textContent = 'Resend (' + seconds + 's)';
+          }
+        }, 1000);
+      },
+
+      // --- Password Login (fallback) ---
+
+      async login() {
+        const username = document.getElementById('username').value.trim();
+        const password = document.getElementById('password').value;
+        const errorEl = document.getElementById('loginError');
+        const btn = document.getElementById('loginBtn');
+
+        errorEl.classList.remove('show');
+        btn.disabled = true;
+        btn.textContent = 'Signing in...';
+
+        try {
+          const response = await fetch(BASE_PATH + '/api/auth/login.cfm', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ username, password })
+          });
+
+          const text = await response.text();
+          let data;
+          try {
+            data = JSON.parse(text);
+          } catch (parseErr) {
+            console.error("[Login] JSON parse error:", parseErr);
+            errorEl.textContent = "Server error - check browser console (F12)";
+            errorEl.classList.add("show");
+            btn.disabled = false;
+            btn.textContent = "Sign In";
+            return;
+          }
+
+          if (data.OK && (data.Token || data.TOKEN)) {
+            const token = data.Token || data.TOKEN;
+            const userId = data.UserID || data.USERID;
+
+            this.userToken = token;
+            this.userId = userId;
+
+            localStorage.setItem('payfrit_portal_token', token);
+            localStorage.setItem('payfrit_portal_userid', userId);
+            const firstName = data.FirstName || data.FIRSTNAME || '';
+            if (firstName) localStorage.setItem('payfrit_portal_firstname', firstName);
+
+            await this.loadBusinesses();
+
+            const card = document.querySelector('.login-card');
+            if (this.businesses.length === 0) {
+              this.startNewRestaurant();
+            } else if (this.businesses.length === 1) {
+              this.selectBusinessById(this.businesses[0].BusinessID);
+            } else {
+              this.showStep('business');
+              card.classList.add('ready');
+            }
+          } else {
+            const friendlyErrors = {
+              'bad_credentials': 'Incorrect email/phone or password. Please try again.',
+              'not_found': 'No account found with that email or phone number.',
+              'account_disabled': 'This account has been disabled. Please contact support.'
+            };
+            errorEl.textContent = friendlyErrors[data.ERROR] || data.MESSAGE || 'Invalid credentials';
+            errorEl.classList.add('show');
+          }
+        } catch (err) {
+          console.error('[Login] Error:', err);
+          errorEl.textContent = 'Connection error. Please try again.';
+          errorEl.classList.add('show');
+        }
+
+        btn.disabled = false;
+        btn.textContent = 'Sign In';
+      },
+
+      // --- Business Selection ---
+
+      async loadBusinesses() {
+        try {
+          console.log('[Login] Loading businesses for UserID:', this.userId);
+          const bizResponse = await fetch(BASE_PATH + '/api/portal/myBusinesses.cfm', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              'X-User-Token': this.userToken
+            },
+            body: JSON.stringify({ UserID: this.userId })
+          });
+
+          const bizText = await bizResponse.text();
+          let bizData;
+          try {
+            bizData = JSON.parse(bizText);
+          } catch (parseErr) {
+            console.error("[Login] Businesses JSON parse error:", parseErr);
+            return;
+          }
+
+          if (bizData.OK && bizData.BUSINESSES) {
+            this.businesses = bizData.BUSINESSES;
+            console.log('[Login] Loaded', this.businesses.length, 'businesses');
+            this.populateBusinessSelect();
+          } else {
+            console.error('[Login] Businesses API error:', bizData.ERROR || bizData.MESSAGE);
+          }
+        } catch (err) {
+          console.error('[Login] Error loading businesses:', err);
+        }
+      },
+
+      populateBusinessSelect() {
+        const select = document.getElementById('businessSelect');
+
+        if (this.businesses.length === 0) {
+          select.innerHTML = '<option value="">No businesses yet</option>';
+          const wizardOption = document.createElement('option');
+          wizardOption.value = 'NEW_WIZARD';
+          wizardOption.textContent = 'Create New Business';
+          select.appendChild(wizardOption);
+        } else {
+          select.innerHTML = '<option value="">Choose a business...</option>';
+
+          this.businesses.forEach(biz => {
+            const option = document.createElement('option');
+            option.value = biz.BusinessID;
+            option.textContent = biz.Name;
+            select.appendChild(option);
+          });
+
+          const wizardOption = document.createElement('option');
+          wizardOption.value = 'NEW_WIZARD';
+          wizardOption.textContent = 'New Business Wizard';
+          select.appendChild(wizardOption);
+        }
+      },
+
+      showStep(step) {
+        document.querySelectorAll('.step').forEach(s => s.classList.remove('active'));
+        const el = document.getElementById('step-' + step);
+        if (el) el.classList.add('active');
+
+        // Update subtitle
+        const subtitle = document.getElementById('loginSubtitle');
+        if (step === 'otp-email') subtitle.textContent = 'Sign in with your email';
+        else if (step === 'otp-code') subtitle.textContent = 'Enter your verification code';
+        else if (step === 'password') subtitle.textContent = 'Sign in with your password';
+        else if (step === 'business') subtitle.textContent = 'Select your business';
+
+        // Clear errors when switching
+        document.querySelectorAll('.login-error').forEach(e => e.classList.remove('show'));
+      },
+
+      selectBusiness() {
+        const businessId = document.getElementById('businessSelect').value;
+        if (businessId === 'NEW_WIZARD') {
+          this.startNewRestaurant();
+        } else if (businessId) {
+          this.selectBusinessById(businessId);
+        }
+      },
+
+      selectBusinessById(businessId) {
+        localStorage.setItem('payfrit_portal_business', businessId);
+        window.location.href = BASE_PATH + '/portal/index.html';
+      },
+
+      startNewRestaurant() {
+        localStorage.removeItem('payfrit_portal_business');
+        window.location.href = BASE_PATH + '/portal/setup-wizard.html';
+      },
+
+      logout() {
+        localStorage.removeItem('payfrit_portal_token');
+        localStorage.removeItem('payfrit_portal_userid');
+        localStorage.removeItem('payfrit_portal_business');
+        localStorage.removeItem('payfrit_portal_firstname');
+        window.location.href = BASE_PATH + '/portal/login.html';
+      }
+    };
+
+    document.addEventListener('DOMContentLoaded', () => PortalLogin.init());
+  </script>
+</body>
+</html>
diff --git a/portal/menu-builder.html b/portal/menu-builder.html
index 716c456..636968a 100644
--- a/portal/menu-builder.html
+++ b/portal/menu-builder.html
@@ -1,4140 +1,4140 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Menu Builder - Payfrit</title>
-  <link rel="icon" type="image/svg+xml" href="favicon.svg">
-  <link rel="stylesheet" href="portal.css">
-  <style>
-    /* Menu Builder Specific Styles */
-    .builder-wrapper {
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-    }
-
-    .builder-container {
-      display: flex;
-      flex: 1;
-      gap: 16px;
-      padding: 16px;
-      overflow: hidden;
-    }
-
-    /* Sidebar Panel */
-    .builder-sidebar {
-      width: 280px;
-      background: #fff;
-      border-radius: var(--radius);
-      box-shadow: var(--shadow);
-      padding: 16px;
-      display: flex;
-      flex-direction: column;
-      gap: 16px;
-      overflow-y: auto;
-    }
-
-    .builder-sidebar h3 {
-      margin: 0;
-      font-size: 14px;
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-      color: var(--gray-500);
-    }
-
-    /* Palette Items */
-    .palette-section {
-      display: flex;
-      flex-direction: column;
-      gap: 8px;
-    }
-
-    .palette-item {
-      background: var(--gray-50);
-      border: 2px dashed var(--gray-200);
-      border-radius: 8px;
-      padding: 12px;
-      cursor: grab;
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      transition: all 0.2s;
-    }
-
-    .palette-item:hover {
-      border-color: var(--primary);
-      background: rgba(99, 102, 241, 0.05);
-    }
-
-    .palette-item:active {
-      cursor: grabbing;
-    }
-
-    .palette-item .icon {
-      width: 32px;
-      height: 32px;
-      background: #fff;
-      border-radius: 6px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 16px;
-    }
-
-    .palette-item .label {
-      font-weight: 500;
-      color: var(--gray-800);
-    }
-
-    .palette-item .hint {
-      font-size: 12px;
-      color: var(--gray-500);
-    }
-
-    /* Main Canvas */
-    .builder-canvas {
-      flex: 1;
-      background: #fff;
-      border-radius: var(--radius);
-      box-shadow: var(--shadow);
-      padding: 16px;
-      overflow-y: auto;
-    }
-
-    .canvas-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 16px;
-      padding-bottom: 16px;
-      border-bottom: 1px solid var(--gray-200);
-    }
-
-    .canvas-header h2 {
-      margin: 0;
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      color: var(--gray-900);
-    }
-
-    .canvas-actions {
-      display: flex;
-      gap: 8px;
-    }
-
-    /* Menu Structure */
-    .menu-structure {
-      display: flex;
-      flex-direction: column;
-      gap: 16px;
-      min-height: 400px;
-    }
-
-    .drop-zone {
-      border: 2px dashed var(--gray-200);
-      border-radius: 8px;
-      padding: 24px;
-      text-align: center;
-      color: var(--gray-500);
-      transition: all 0.2s;
-    }
-
-    .drop-zone.drag-over {
-      border-color: var(--primary);
-      background: rgba(99, 102, 241, 0.05);
-    }
-
-    .drop-zone.drag-over-error {
-      border-color: var(--danger);
-      background: rgba(239, 68, 68, 0.05);
-    }
-
-    /* Category Card */
-    .category-card {
-      background: var(--gray-50);
-      border-radius: 12px;
-      border: 2px solid var(--gray-200);
-      overflow: hidden;
-      transition: all 0.2s;
-    }
-
-    .category-card.dragging {
-      opacity: 0.5;
-      transform: scale(0.98);
-    }
-
-    .category-card.drag-over {
-      border-color: var(--primary);
-    }
-
-    .category-header {
-      display: flex;
-      align-items: center;
-      padding: 12px 16px;
-      background: #fff;
-      cursor: grab;
-      gap: 12px;
-    }
-
-    .category-header:active {
-      cursor: grabbing;
-    }
-
-    .drag-handle {
-      color: var(--gray-400);
-      display: flex;
-      align-items: center;
-    }
-
-    .category-info {
-      flex: 1;
-    }
-
-    .category-name {
-      font-weight: 600;
-      font-size: 16px;
-      color: var(--gray-900);
-    }
-
-    .category-count {
-      font-size: 12px;
-      color: var(--gray-500);
-    }
-
-    .category-actions {
-      display: flex;
-      gap: 4px;
-    }
-
-    .category-actions button {
-      background: transparent;
-      border: none;
-      color: var(--gray-400);
-      padding: 6px;
-      border-radius: 4px;
-      cursor: pointer;
-      transition: all 0.2s;
-    }
-
-    .category-actions button:hover {
-      background: var(--gray-100);
-      color: var(--gray-800);
-    }
-
-    .category-actions button.danger:hover {
-      color: var(--danger);
-    }
-
-    /* Items List */
-    .items-list {
-      padding: 12px;
-      display: flex;
-      flex-direction: column;
-      gap: 8px;
-      min-height: 60px;
-      overflow: hidden;
-      transition: max-height 0.3s ease, padding 0.3s ease, opacity 0.3s ease;
-    }
-
-    .items-list.collapsed {
-      max-height: 0;
-      padding: 0 12px;
-      opacity: 0;
-      min-height: 0;
-    }
-
-    /* Chevron toggle */
-    .category-toggle {
-      width: 24px;
-      height: 24px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      transition: transform 0.3s ease;
-      color: var(--gray-400);
-    }
-
-    .category-toggle:hover {
-      color: var(--gray-800);
-    }
-
-    .category-toggle.expanded {
-      transform: rotate(90deg);
-    }
-
-    /* Item Toggle (for expanding modifiers) */
-    .item-toggle {
-      width: 20px;
-      height: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      transition: transform 0.3s ease;
-      color: var(--gray-400);
-      flex-shrink: 0;
-    }
-
-    .item-toggle:hover {
-      color: var(--gray-800);
-    }
-
-    .item-toggle.expanded {
-      transform: rotate(90deg);
-    }
-
-    .items-list.drag-over {
-      background: rgba(99, 102, 241, 0.02);
-    }
-
-    .item-drop-zone {
-      border: 2px dashed var(--gray-200);
-      border-radius: 6px;
-      padding: 16px;
-      text-align: center;
-      font-size: 13px;
-      color: var(--gray-500);
-    }
-
-    /* Item Card */
-    .item-card {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      padding: 10px 12px;
-      background: #fff;
-      border-radius: 8px;
-      border: 1px solid var(--gray-200);
-      cursor: grab;
-      transition: all 0.2s;
-    }
-
-    .item-card:active {
-      cursor: grabbing;
-    }
-
-    .item-card.dragging {
-      opacity: 0.5;
-    }
-
-    .item-card.drag-over {
-      border-color: var(--primary);
-      transform: translateY(2px);
-    }
-
-    /* Drop indicators for reordering */
-    .item-card.drop-before,
-    .category-card.drop-before {
-      position: relative;
-    }
-
-    .item-card.drop-before::before,
-    .category-card.drop-before::before {
-      content: '';
-      position: absolute;
-      top: -4px;
-      left: 0;
-      right: 0;
-      height: 4px;
-      background: var(--primary);
-      border-radius: 2px;
-    }
-
-    .item-card.drop-after,
-    .category-card.drop-after {
-      position: relative;
-    }
-
-    .item-card.drop-after::after,
-    .category-card.drop-after::after {
-      content: '';
-      position: absolute;
-      bottom: -4px;
-      left: 0;
-      right: 0;
-      height: 4px;
-      background: var(--primary);
-      border-radius: 2px;
-    }
-
-    .item-card.modifier {
-      margin-left: 24px;
-      background: var(--gray-50);
-      border-style: dashed;
-    }
-
-    .item-card.modifier .item-type-badge {
-      background: var(--warning);
-      color: #000;
-    }
-
-    .item-image {
-      width: 48px;
-      height: 48px;
-      background: var(--gray-100);
-      border-radius: 6px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 24px;
-      overflow: hidden;
-      position: relative;
-    }
-
-    .item-image img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    .item-image .photo-badge {
-      position: absolute;
-      bottom: 2px;
-      right: 2px;
-      width: 16px;
-      height: 16px;
-      background: var(--primary);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .item-image .photo-badge.missing {
-      background: var(--warning);
-    }
-
-    .item-info {
-      flex: 1;
-      min-width: 0;
-    }
-
-    .item-name {
-      font-weight: 500;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      color: var(--gray-800);
-    }
-
-    .item-meta {
-      display: flex;
-      gap: 8px;
-      font-size: 12px;
-      color: var(--gray-500);
-    }
-
-    .item-price {
-      color: var(--primary);
-      font-weight: 600;
-    }
-
-    .item-type-badge {
-      font-size: 10px;
-      padding: 2px 6px;
-      border-radius: 4px;
-      background: var(--gray-100);
-      text-transform: uppercase;
-      color: var(--gray-600);
-    }
-
-    .item-actions {
-      display: flex;
-      gap: 2px;
-    }
-
-    .item-actions button {
-      background: transparent;
-      border: none;
-      color: var(--gray-400);
-      padding: 4px;
-      border-radius: 4px;
-      cursor: pointer;
-      transition: all 0.2s;
-    }
-
-    .item-actions button:hover {
-      background: var(--gray-100);
-      color: var(--gray-800);
-    }
-
-    .item-actions button.danger:hover {
-      color: var(--danger);
-    }
-
-    /* Properties Panel */
-    .builder-properties {
-      width: 320px;
-      background: #fff;
-      border-radius: var(--radius);
-      box-shadow: var(--shadow);
-      padding: 16px;
-      display: flex;
-      flex-direction: column;
-      gap: 16px;
-      overflow-y: auto;
-    }
-
-    .properties-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-
-    .properties-header h3 {
-      margin: 0;
-      font-size: 14px;
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-      color: var(--gray-500);
-    }
-
-    .property-group {
-      display: flex;
-      flex-direction: column;
-      gap: 12px;
-    }
-
-    .property-group label {
-      font-size: 12px;
-      font-weight: 500;
-      color: var(--gray-500);
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-    }
-
-    .property-group input,
-    .property-group textarea,
-    .property-group select {
-      background: var(--gray-50);
-      border: 1px solid var(--gray-300);
-      border-radius: 6px;
-      padding: 10px 12px;
-      color: var(--gray-800);
-      font-size: 14px;
-    }
-
-    .property-group input:focus,
-    .property-group textarea:focus,
-    .property-group select:focus {
-      outline: none;
-      border-color: var(--primary);
-      box-shadow: 0 0 0 3px rgba(99, 102, 241, 0.1);
-    }
-
-    .property-row {
-      display: flex;
-      gap: 12px;
-    }
-
-    .property-row .property-group {
-      flex: 1;
-    }
-
-    /* Photo Task Section */
-    .photo-task-section {
-      background: var(--gray-50);
-      border-radius: 8px;
-      padding: 12px;
-    }
-
-    .photo-task-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 12px;
-    }
-
-    .photo-task-header h4 {
-      margin: 0;
-      font-size: 13px;
-      font-weight: 600;
-      color: var(--gray-800);
-    }
-
-    .photo-preview {
-      width: 100%;
-      aspect-ratio: 4/3;
-      background: #fff;
-      border-radius: 6px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: var(--gray-400);
-      margin-bottom: 12px;
-      overflow: hidden;
-      border: 1px solid var(--gray-200);
-    }
-
-    .photo-preview img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    .photo-actions {
-      display: flex;
-      gap: 8px;
-    }
-
-    .photo-actions button {
-      flex: 1;
-    }
-
-    /* Task Badge */
-    .task-badge {
-      display: inline-flex;
-      align-items: center;
-      gap: 4px;
-      font-size: 11px;
-      padding: 3px 8px;
-      border-radius: 12px;
-      background: var(--warning);
-      color: #000;
-    }
-
-    .task-badge.completed {
-      background: var(--success);
-    }
-
-    /* Empty State */
-    .empty-canvas {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      padding: 60px 20px;
-      color: var(--gray-500);
-      text-align: center;
-    }
-
-    .empty-canvas svg {
-      width: 64px;
-      height: 64px;
-      margin-bottom: 16px;
-      opacity: 0.5;
-      color: var(--gray-400);
-    }
-
-    .empty-canvas h3 {
-      margin: 0 0 8px 0;
-      color: var(--gray-800);
-    }
-
-    .empty-canvas p {
-      margin: 0;
-      max-width: 300px;
-      color: var(--gray-500);
-    }
-
-    /* Toolbar */
-    .builder-toolbar {
-      display: flex;
-      gap: 8px;
-      padding: 12px 24px;
-      background: #fff;
-      border-bottom: 1px solid var(--gray-200);
-    }
-
-    .toolbar-group {
-      display: flex;
-      gap: 4px;
-      padding-right: 12px;
-      border-right: 1px solid var(--gray-200);
-    }
-
-    .toolbar-group:last-child {
-      border-right: none;
-    }
-
-    .toolbar-btn {
-      display: flex;
-      align-items: center;
-      gap: 6px;
-      padding: 8px 12px;
-      background: var(--gray-50);
-      border: 1px solid var(--gray-200);
-      border-radius: var(--radius);
-      color: var(--gray-700);
-      font-size: 13px;
-      cursor: pointer;
-      transition: all 0.2s;
-    }
-
-    .toolbar-btn:hover {
-      background: #fff;
-      border-color: var(--primary);
-      color: var(--gray-900);
-    }
-
-    .toolbar-btn.primary {
-      background: var(--primary);
-      border-color: var(--primary);
-      color: #fff;
-    }
-
-    .toolbar-btn.primary:hover {
-      background: var(--primary-dark);
-    }
-
-    .toolbar-btn.primary:active {
-      background: var(--primary-dark);
-      transform: scale(0.98);
-    }
-
-    .toolbar-btn svg {
-      width: 16px;
-      height: 16px;
-    }
-
-    /* Import/Export Modal */
-    .import-export-area {
-      width: 100%;
-      min-height: 300px;
-      font-family: monospace;
-      font-size: 12px;
-      resize: vertical;
-    }
-
-    /* Selection highlight */
-    .category-card.selected,
-    .item-card.selected {
-      border-color: var(--primary);
-      box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.2);
-    }
-
-    /* Context Menu */
-    .context-menu {
-      position: fixed;
-      background: #fff;
-      border: 1px solid var(--gray-200);
-      border-radius: var(--radius);
-      padding: 8px 0;
-      min-width: 180px;
-      box-shadow: var(--shadow-lg);
-      z-index: 1000;
-      display: none;
-    }
-
-    .context-menu.visible {
-      display: block;
-    }
-
-    .context-menu-item {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      padding: 8px 16px;
-      cursor: pointer;
-      transition: background 0.15s;
-      color: var(--gray-700);
-    }
-
-    .context-menu-item:hover {
-      background: var(--gray-50);
-    }
-
-    .context-menu-item.danger {
-      color: var(--danger);
-    }
-
-    .context-menu-item svg {
-      width: 16px;
-      height: 16px;
-    }
-
-    .context-menu-divider {
-      height: 1px;
-      background: var(--gray-200);
-      margin: 8px 0;
-    }
-
-    /* Keyboard shortcuts hint */
-    .shortcut-hint {
-      font-size: 11px;
-      color: var(--gray-400);
-      margin-left: auto;
-      font-family: monospace;
-    }
-  </style>
-</head>
-<body>
-  <div class="app">
-    <!-- Sidebar (same as portal) -->
-    <aside class="sidebar" id="sidebar">
-      <div class="sidebar-header">
-        <div class="logo">
-          <span class="logo-icon">P</span>
-          <span class="logo-text">Payfrit</span>
-        </div>
-        <button class="sidebar-toggle" id="sidebarToggle">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M3 12h18M3 6h18M3 18h18"/>
-          </svg>
-        </button>
-      </div>
-
-      <div class="business-info" style="padding: 12px 16px; border-bottom: 1px solid var(--gray-200);">
-        <div class="business-avatar" id="businessAvatar">B</div>
-        <div class="business-details">
-          <div class="business-name" id="businessName">Loading...</div>
-          <div class="business-status online">Online</div>
-        </div>
-      </div>
-
-      <nav class="sidebar-nav">
-        <a href="index.html#dashboard" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/>
-            <rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/>
-          </svg>
-          <span>Dashboard</span>
-        </a>
-        <a href="index.html#orders" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2"/>
-            <rect x="9" y="3" width="6" height="4" rx="1"/>
-            <path d="M9 12h6M9 16h6"/>
-          </svg>
-          <span>Orders</span>
-        </a>
-        <a href="#" class="nav-item active">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M3 6h18M3 12h18M3 18h18"/>
-          </svg>
-          <span>Menu</span>
-        </a>
-        <a href="index.html#reports" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M18 20V10M12 20V4M6 20v-6"/>
-          </svg>
-          <span>Reports</span>
-        </a>
-        <a href="index.html#team" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/>
-            <circle cx="9" cy="7" r="4"/>
-            <path d="M23 21v-2a4 4 0 00-3-3.87M16 3.13a4 4 0 010 7.75"/>
-          </svg>
-          <span>Team</span>
-        </a>
-        <a href="index.html#beacons" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <circle cx="12" cy="12" r="3"/>
-            <path d="M12 2v4M12 18v4M2 12h4M18 12h4"/>
-            <path d="M4.93 4.93l2.83 2.83M16.24 16.24l2.83 2.83M4.93 19.07l2.83-2.83M16.24 7.76l2.83-2.83"/>
-          </svg>
-          <span>Beacons</span>
-        </a>
-        <a href="index.html#services" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M18 8A6 6 0 006 8c0 7-3 9-3 9h18s-3-2-3-9"/>
-            <path d="M13.73 21a2 2 0 01-3.46 0"/>
-          </svg>
-          <span>Services</span>
-        </a>
-        <a href="index.html#admin-tasks" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <path d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>
-          </svg>
-          <span>Task Admin</span>
-        </a>
-        <a href="index.html#settings" class="nav-item">
-          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-            <circle cx="12" cy="12" r="3"/>
-            <path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 010 2.83 2 2 0 01-2.83 0l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-2 2 2 2 0 01-2-2v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83 0 2 2 0 010-2.83l.06-.06a1.65 1.65 0 00.33-1.82 1.65 1.65 0 00-1.51-1H3a2 2 0 01-2-2 2 2 0 012-2h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 010-2.83 2 2 0 012.83 0l.06.06a1.65 1.65 0 001.82.33H9a1.65 1.65 0 001-1.51V3a2 2 0 012-2 2 2 0 012 2v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 0 2 2 0 010 2.83l-.06.06a1.65 1.65 0 00-.33 1.82V9a1.65 1.65 0 001.51 1H21a2 2 0 012 2 2 2 0 01-2 2h-.09a1.65 1.65 0 00-1.51 1z"/>
-          </svg>
-          <span>Settings</span>
-        </a>
-      </nav>
-    </aside>
-
-    <!-- Main Content -->
-    <main class="main-content">
-      <div class="builder-wrapper">
-        <!-- Toolbar -->
-        <div class="builder-toolbar">
-          <div class="toolbar-group">
-            <button class="toolbar-btn" onclick="MenuBuilder.undo()" title="Undo (Ctrl+Z)">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M3 7v6h6M3 13a9 9 0 103-7.5"/>
-              </svg>
-              Undo
-            </button>
-            <button class="toolbar-btn" onclick="MenuBuilder.redo()" title="Redo (Ctrl+Y)">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M21 7v6h-6M21 13a9 9 0 10-3-7.5"/>
-              </svg>
-              Redo
-            </button>
-          </div>
-          <div class="toolbar-group">
-            <button class="toolbar-btn" onclick="MenuBuilder.addCategory()" title="Add Category">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M12 5v14M5 12h14"/>
-              </svg>
-              Category
-            </button>
-            <button class="toolbar-btn" onclick="MenuBuilder.addItem()" title="Add Item">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M12 5v14M5 12h14"/>
-              </svg>
-              Item
-            </button>
-          </div>
-          <div class="toolbar-group">
-            <button class="toolbar-btn" onclick="MenuBuilder.cloneSelected()" title="Clone (Ctrl+D)">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <rect x="9" y="9" width="13" height="13" rx="2"/>
-                <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/>
-              </svg>
-              Clone
-            </button>
-            <button class="toolbar-btn" onclick="MenuBuilder.deleteSelected()" title="Delete (Del)">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/>
-              </svg>
-              Delete
-            </button>
-          </div>
-          <div class="toolbar-group">
-            <button class="toolbar-btn" onclick="MenuBuilder.showOutlineModal()" title="View Full Menu Outline">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M4 6h16M4 12h16M4 18h12"/>
-              </svg>
-              Outline
-            </button>
-          </div>
-          <div class="toolbar-group" style="margin-left: auto;">
-            <button class="toolbar-btn" onclick="MenuBuilder.showMenuManager()" title="Manage Menus" style="font-weight: 600;">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/>
-              </svg>
-              Manage Menus
-            </button>
-            <button class="toolbar-btn primary" onclick="MenuBuilder.saveMenu()">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/>
-                <path d="M17 21v-8H7v8M7 3v5h8"/>
-              </svg>
-              Save Menu
-            </button>
-          </div>
-        </div>
-
-    <!-- Main Builder -->
-    <div class="builder-container">
-      <!-- Left Sidebar - Palette -->
-      <div class="builder-sidebar">
-        <h3>Components</h3>
-        <div class="palette-section">
-          <div class="palette-item" draggable="true" data-type="category">
-            <div class="icon">📁</div>
-            <div>
-              <div class="label">Category</div>
-              <div class="hint">Group of menu items</div>
-            </div>
-          </div>
-          <div class="palette-item" draggable="true" data-type="item">
-            <div class="icon">🍽️</div>
-            <div>
-              <div class="label">Menu Item</div>
-              <div class="hint">Orderable product</div>
-            </div>
-          </div>
-          <div class="palette-item" draggable="true" data-type="modifier">
-            <div class="icon">⚙️</div>
-            <div>
-              <div class="label">Modifier</div>
-              <div class="hint">Add-on or option</div>
-            </div>
-          </div>
-          <div class="palette-item" draggable="true" data-type="modifier-group">
-            <div class="icon">📋</div>
-            <div>
-              <div class="label">Modifier Group</div>
-              <div class="hint">Group of options</div>
-            </div>
-          </div>
-        </div>
-
-        <h3>Modifier Templates</h3>
-        <div class="palette-section" id="templateLibrary">
-          <div style="color: var(--gray-500); font-size: 13px; padding: 8px;">Loading templates...</div>
-        </div>
-
-        <h3>Quick Stats</h3>
-        <div style="font-size: 13px; color: var(--text-muted);">
-          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
-            <span>Categories:</span>
-            <strong id="statCategories">0</strong>
-          </div>
-          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
-            <span>Items:</span>
-            <strong id="statItems">0</strong>
-          </div>
-          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
-            <span>Templates:</span>
-            <strong id="statTemplates">0</strong>
-          </div>
-          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
-            <span>Photos Missing:</span>
-            <strong id="statPhotosMissing" style="color: var(--warning);">0</strong>
-          </div>
-        </div>
-
-        <h3>Branding</h3>
-        <div style="display: flex; flex-direction: column; gap: 8px;">
-          <button class="btn btn-secondary" onclick="MenuBuilder.uploadHeader()" style="width: 100%; display: flex; align-items: center; gap: 8px; justify-content: center;">
-            <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2">
-              <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
-              <circle cx="8.5" cy="8.5" r="1.5"/>
-              <polyline points="21 15 16 10 5 21"/>
-            </svg>
-            Upload Header
-          </button>
-          <button class="btn btn-secondary" onclick="MenuBuilder.showBrandColorPicker()" style="width: 100%; display: flex; align-items: center; gap: 8px; justify-content: center;">
-            <span id="brandColorSwatch" style="width: 16px; height: 16px; border-radius: 3px; background: #1B4D3E; border: 1px solid rgba(0,0,0,0.2);"></span>
-            Brand Color
-          </button>
-          <p style="font-size: 11px; color: var(--gray-500); margin: 0;">
-            Header: 1200x400px recommended<br>
-            Color: Used for category bars in the app
-          </p>
-        </div>
-      </div>
-
-      <!-- Main Canvas -->
-      <div class="builder-canvas">
-        <div class="canvas-header">
-          <h2>
-            <span id="menuName">Menu Builder</span>
-            <span style="font-size: 13px; color: var(--gray-500); font-weight: normal;" id="businessLabel"></span>
-          </h2>
-          <div class="canvas-actions" style="display: flex; gap: 8px; align-items: center;">
-            <select id="menuSelector" onchange="MenuBuilder.onMenuSelect(this.value)" style="padding: 8px 12px; border: 1px solid var(--gray-300); border-radius: 6px; background: #fff; font-size: 14px; cursor: pointer;">
-              <option value="0">All Categories</option>
-            </select>
-          </div>
-        </div>
-
-        <div class="menu-structure" id="menuStructure">
-          <div class="empty-canvas" id="emptyCanvas">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
-              <path d="M3 6h18M3 12h18M3 18h18"/>
-            </svg>
-            <h3>Start Building Your Menu</h3>
-            <p>Drag categories and items from the left panel, or click the buttons above to add them.</p>
-          </div>
-        </div>
-      </div>
-
-      <!-- Right Sidebar - Properties -->
-      <div class="builder-properties" id="propertiesPanel">
-        <div class="properties-header">
-          <h3>Properties</h3>
-        </div>
-
-        <div id="propertiesContent">
-          <p style="color: var(--gray-500); text-align: center; padding: 20px;">
-            Select an item to edit its properties
-          </p>
-        </div>
-      </div>
-    </div>
-      </div> <!-- end builder-wrapper -->
-    </main>
-  </div>
-
-  <!-- Context Menu -->
-  <div class="context-menu" id="contextMenu">
-    <div class="context-menu-item" onclick="MenuBuilder.editSelected()">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-        <path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/>
-        <path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/>
-      </svg>
-      Edit
-      <span class="shortcut-hint">Enter</span>
-    </div>
-    <div class="context-menu-item" onclick="MenuBuilder.cloneSelected()">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-        <rect x="9" y="9" width="13" height="13" rx="2"/>
-        <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/>
-      </svg>
-      Clone
-      <span class="shortcut-hint">Ctrl+D</span>
-    </div>
-    <div class="context-menu-item" onclick="MenuBuilder.createPhotoTask()">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-        <rect x="3" y="3" width="18" height="18" rx="2"/>
-        <circle cx="8.5" cy="8.5" r="1.5"/>
-        <path d="M21 15l-5-5L5 21"/>
-      </svg>
-      Create Photo Task
-    </div>
-    <div class="context-menu-divider"></div>
-    <div class="context-menu-item" onclick="MenuBuilder.moveUp()">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-        <path d="M12 19V5M5 12l7-7 7 7"/>
-      </svg>
-      Move Up
-      <span class="shortcut-hint">Alt+Up</span>
-    </div>
-    <div class="context-menu-item" onclick="MenuBuilder.moveDown()">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-        <path d="M12 5v14M19 12l-7 7-7-7"/>
-      </svg>
-      Move Down
-      <span class="shortcut-hint">Alt+Down</span>
-    </div>
-    <div class="context-menu-divider"></div>
-    <div class="context-menu-item danger" onclick="MenuBuilder.deleteSelected()">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-        <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/>
-      </svg>
-      Delete
-      <span class="shortcut-hint">Del</span>
-    </div>
-  </div>
-
-  <!-- Modal -->
-  <div class="modal-overlay" id="modalOverlay">
-    <div class="modal" id="modal" style="max-width: 600px;">
-      <div class="modal-header">
-        <h3 id="modalTitle">Modal</h3>
-        <button class="modal-close" onclick="MenuBuilder.closeModal()">&times;</button>
-      </div>
-      <div class="modal-body" id="modalBody"></div>
-    </div>
-  </div>
-
-  <!-- Toast Container -->
-  <div class="toast-container" id="toastContainer"></div>
-
-  <script>
-    // Detect base path for API calls (handles local dev at /biz.payfrit.com/)
-    const BASE_PATH = (() => {
-      const path = window.location.pathname;
-      const portalIndex = path.indexOf('/portal/');
-      if (portalIndex > 0) {
-        return path.substring(0, portalIndex);
-      }
-      return '';
-    })();
-
-    /**
-     * Payfrit Menu Builder
-     * Drag-and-drop menu creation with photo tasks
-     */
-    const MenuBuilder = {
-      // Config
-      config: {
-        apiBaseUrl: BASE_PATH + '/api',
-        businessId: null,
-      },
-
-      // State
-      menu: {
-        categories: []
-      },
-      menus: [],           // List of all menus for this business
-      selectedMenuId: 0,   // Currently selected menu ID (0 = all/default)
-      templates: [],
-      stations: [],
-      selectedElement: null,
-      selectedData: null,
-      undoStack: [],
-      redoStack: [],
-      idCounter: 1,
-      expandedCategoryId: null, // For accordion - only one category expanded at a time
-      expandedItemId: null, // For item accordion - only one item expanded at a time
-      expandedModifierIds: new Set(), // Track which modifiers are expanded
-
-      // Initialize
-      async init() {
-        console.log('[MenuBuilder] Initializing...');
-
-        // Check authentication
-        const token = localStorage.getItem('payfrit_portal_token');
-        const savedBusiness = localStorage.getItem('payfrit_portal_business');
-
-        if (!token || !savedBusiness) {
-          window.location.href = BASE_PATH + '/portal/login.html';
-          return;
-        }
-
-        // Get business ID from localStorage
-        this.config.businessId = parseInt(savedBusiness) || null;
-        this.config.token = token;
-
-        // Setup sidebar toggle
-        this.setupSidebar();
-
-        // Load business info
-        await this.loadBusinessInfo();
-
-        // Setup drag and drop
-        this.setupDragAndDrop();
-
-        // Setup keyboard shortcuts
-        this.setupKeyboardShortcuts();
-
-        // Setup context menu
-        this.setupContextMenu();
-
-        // Load existing menu if any
-        await this.loadMenu();
-
-        console.log('[MenuBuilder] Ready');
-      },
-
-      // Setup sidebar toggle
-      setupSidebar() {
-        const sidebar = document.getElementById('sidebar');
-        const toggle = document.getElementById('sidebarToggle');
-        if (toggle && sidebar) {
-          toggle.addEventListener('click', () => {
-            sidebar.classList.toggle('collapsed');
-          });
-        }
-      },
-
-      // Logout
-      logout() {
-        localStorage.removeItem('payfrit_portal_token');
-        localStorage.removeItem('payfrit_portal_business');
-        window.location.href = BASE_PATH + '/portal/login.html';
-      },
-
-      // Load business info
-      async loadBusinessInfo() {
-        try {
-          const response = await fetch(`${this.config.apiBaseUrl}/businesses/get.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ BusinessID: this.config.businessId })
-          });
-          const data = await response.json();
-          if (data.OK && data.BUSINESS) {
-            const biz = data.BUSINESS;
-            document.getElementById('businessLabel').textContent = `- ${biz.BusinessName}`;
-            // Update sidebar business info
-            const businessName = document.getElementById('businessName');
-            const businessAvatar = document.getElementById('businessAvatar');
-            if (businessName) businessName.textContent = biz.BusinessName;
-            if (businessAvatar) businessAvatar.textContent = biz.BusinessName ? biz.BusinessName.charAt(0).toUpperCase() : 'B';
-          }
-        } catch (err) {
-          console.error('[MenuBuilder] Error loading business:', err);
-        }
-      },
-
-      // Setup drag and drop
-      setupDragAndDrop() {
-        // Palette items
-        document.querySelectorAll('.palette-item').forEach(item => {
-          item.addEventListener('dragstart', (e) => {
-            e.dataTransfer.setData('type', item.dataset.type);
-            e.dataTransfer.setData('source', 'palette');
-          });
-        });
-
-        // Canvas drop zone
-        const structure = document.getElementById('menuStructure');
-        structure.addEventListener('dragover', (e) => {
-          e.preventDefault();
-          e.dataTransfer.dropEffect = 'copy';
-        });
-
-        structure.addEventListener('drop', (e) => {
-          e.preventDefault();
-          const type = e.dataTransfer.getData('type');
-          const source = e.dataTransfer.getData('source');
-
-          if (source === 'palette') {
-            this.handlePaletteDrop(type, e.target);
-          }
-        });
-      },
-
-      // Handle palette drop
-      handlePaletteDrop(type, target) {
-        switch (type) {
-          case 'category':
-            this.addCategory();
-            break;
-          case 'item':
-            this.addItem(this.findCategoryFromTarget(target));
-            break;
-          case 'modifier':
-            this.addModifier(this.findItemFromTarget(target));
-            break;
-          case 'modifier-group':
-            this.addModifierGroup(this.findItemFromTarget(target));
-            break;
-          case 'template-size':
-            this.addSizeTemplate(this.findItemFromTarget(target));
-            break;
-          case 'template-protein':
-            this.addProteinTemplate(this.findItemFromTarget(target));
-            break;
-          case 'template-temp':
-            this.addTempTemplate(this.findItemFromTarget(target));
-            break;
-        }
-      },
-
-      // Find category from drop target
-      findCategoryFromTarget(target) {
-        const card = target.closest('.category-card');
-        if (card) {
-          return parseInt(card.dataset.categoryId);
-        }
-        return this.menu.categories.length > 0 ? this.menu.categories[0].id : null;
-      },
-
-      // Find item from drop target
-      findItemFromTarget(target) {
-        const card = target.closest('.item-card');
-        if (card) {
-          return parseInt(card.dataset.itemId);
-        }
-        return null;
-      },
-
-      // Setup keyboard shortcuts
-      setupKeyboardShortcuts() {
-        document.addEventListener('keydown', (e) => {
-          // Delete
-          if (e.key === 'Delete' && this.selectedElement) {
-            e.preventDefault();
-            this.deleteSelected();
-          }
-
-          // Clone (Ctrl+D)
-          if (e.key === 'd' && e.ctrlKey && this.selectedElement) {
-            e.preventDefault();
-            this.cloneSelected();
-          }
-
-          // Undo (Ctrl+Z)
-          if (e.key === 'z' && e.ctrlKey && !e.shiftKey) {
-            e.preventDefault();
-            this.undo();
-          }
-
-          // Redo (Ctrl+Y or Ctrl+Shift+Z)
-          if ((e.key === 'y' && e.ctrlKey) || (e.key === 'z' && e.ctrlKey && e.shiftKey)) {
-            e.preventDefault();
-            this.redo();
-          }
-
-          // Move up (Alt+Up)
-          if (e.key === 'ArrowUp' && e.altKey && this.selectedElement) {
-            e.preventDefault();
-            this.moveUp();
-          }
-
-          // Move down (Alt+Down)
-          if (e.key === 'ArrowDown' && e.altKey && this.selectedElement) {
-            e.preventDefault();
-            this.moveDown();
-          }
-
-          // Edit (Enter)
-          if (e.key === 'Enter' && this.selectedElement) {
-            e.preventDefault();
-            this.editSelected();
-          }
-
-          // Escape - deselect
-          if (e.key === 'Escape') {
-            this.clearSelection();
-            this.hideContextMenu();
-          }
-        });
-      },
-
-      // Setup context menu
-      setupContextMenu() {
-        document.addEventListener('contextmenu', (e) => {
-          const element = e.target.closest('.category-card, .item-card');
-          if (element) {
-            e.preventDefault();
-            this.selectElement(element);
-            this.showContextMenu(e.clientX, e.clientY);
-          }
-        });
-
-        document.addEventListener('click', () => {
-          this.hideContextMenu();
-        });
-      },
-
-      // Show context menu
-      showContextMenu(x, y) {
-        const menu = document.getElementById('contextMenu');
-        menu.style.left = x + 'px';
-        menu.style.top = y + 'px';
-        menu.classList.add('visible');
-      },
-
-      // Hide context menu
-      hideContextMenu() {
-        document.getElementById('contextMenu').classList.remove('visible');
-      },
-
-      // Generate unique ID
-      generateId() {
-        return `temp_${Date.now()}_${this.idCounter++}`;
-      },
-
-      // Save state for undo
-      saveState() {
-        this.undoStack.push(JSON.stringify(this.menu));
-        this.redoStack = [];
-        if (this.undoStack.length > 50) {
-          this.undoStack.shift();
-        }
-      },
-
-      // Undo
-      undo() {
-        if (this.undoStack.length === 0) return;
-        this.redoStack.push(JSON.stringify(this.menu));
-        this.menu = JSON.parse(this.undoStack.pop());
-        this.render();
-        this.toast('Undo', 'info');
-      },
-
-      // Redo
-      redo() {
-        if (this.redoStack.length === 0) return;
-        this.undoStack.push(JSON.stringify(this.menu));
-        this.menu = JSON.parse(this.redoStack.pop());
-        this.render();
-        this.toast('Redo', 'info');
-      },
-
-      // Add category
-      addCategory(name = null) {
-        this.saveState();
-
-        const category = {
-          id: this.generateId(),
-          name: name || `New Category ${this.menu.categories.length + 1}`,
-          description: '',
-          sortOrder: this.menu.categories.length,
-          items: []
-        };
-
-        this.menu.categories.push(category);
-        this.render();
-        this.selectElementById('category', category.id);
-        this.showPropertiesForCategory(category);
-      },
-
-      // Add item
-      addItem(categoryId = null) {
-        this.saveState();
-
-        // Find category
-        let category = null;
-        if (categoryId) {
-          category = this.menu.categories.find(c => c.id === categoryId);
-        } else if (this.menu.categories.length > 0) {
-          category = this.menu.categories[0];
-        } else {
-          this.toast('Create a category first', 'error');
-          return;
-        }
-
-        const item = {
-          id: this.generateId(),
-          name: 'New Item',
-          description: '',
-          price: 0,
-          imageUrl: null,
-          photoTaskId: null,
-          modifiers: [],
-          sortOrder: category.items.length
-        };
-
-        category.items.push(item);
-        this.render();
-        this.selectElementById('item', item.id);
-        this.showPropertiesForItem(item, category);
-      },
-
-      // Add modifier
-      addModifier(itemId) {
-        if (!itemId) {
-          this.toast('Select an item first', 'error');
-          return;
-        }
-
-        this.saveState();
-
-        // Find item
-        let item = null;
-        let parentCategory = null;
-        for (const cat of this.menu.categories) {
-          const found = cat.items.find(i => i.id === itemId);
-          if (found) {
-            item = found;
-            parentCategory = cat;
-            break;
-          }
-        }
-
-        if (!item) return;
-
-        const modifier = {
-          id: this.generateId(),
-          name: 'New Modifier',
-          price: 0,
-          isDefault: false,
-          sortOrder: item.modifiers.length
-        };
-
-        item.modifiers.push(modifier);
-        this.render();
-      },
-
-      // Add modifier group
-      addModifierGroup(itemId) {
-        if (!itemId) {
-          this.toast('Select an item first', 'error');
-          return;
-        }
-        // For now, just add a modifier with a group indicator
-        this.addModifier(itemId);
-      },
-
-      // Add size template
-      addSizeTemplate(itemId) {
-        if (!itemId) {
-          this.toast('Select an item first', 'error');
-          return;
-        }
-
-        this.saveState();
-
-        let item = null;
-        for (const cat of this.menu.categories) {
-          const found = cat.items.find(i => i.id === itemId);
-          if (found) {
-            item = found;
-            break;
-          }
-        }
-
-        if (!item) return;
-
-        const sizes = [
-          { name: 'Small', price: 0, isDefault: true },
-          { name: 'Medium', price: 1.00, isDefault: false },
-          { name: 'Large', price: 2.00, isDefault: false }
-        ];
-
-        sizes.forEach((s, i) => {
-          item.modifiers.push({
-            id: this.generateId(),
-            name: s.name,
-            price: s.price,
-            isDefault: s.isDefault,
-            group: 'Size',
-            sortOrder: item.modifiers.length + i
-          });
-        });
-
-        this.render();
-        this.toast('Size options added', 'success');
-      },
-
-      // Add protein template
-      addProteinTemplate(itemId) {
-        if (!itemId) {
-          this.toast('Select an item first', 'error');
-          return;
-        }
-
-        this.saveState();
-
-        let item = null;
-        for (const cat of this.menu.categories) {
-          const found = cat.items.find(i => i.id === itemId);
-          if (found) {
-            item = found;
-            break;
-          }
-        }
-
-        if (!item) return;
-
-        const proteins = [
-          { name: 'Chicken', price: 0, isDefault: true },
-          { name: 'Beef', price: 2.00, isDefault: false },
-          { name: 'Lamb', price: 3.00, isDefault: false },
-          { name: 'Falafel (V)', price: 0, isDefault: false }
-        ];
-
-        proteins.forEach((p, i) => {
-          item.modifiers.push({
-            id: this.generateId(),
-            name: p.name,
-            price: p.price,
-            isDefault: p.isDefault,
-            group: 'Protein',
-            sortOrder: item.modifiers.length + i
-          });
-        });
-
-        this.render();
-        this.toast('Protein options added', 'success');
-      },
-
-      // Add temperature template
-      addTempTemplate(itemId) {
-        if (!itemId) {
-          this.toast('Select an item first', 'error');
-          return;
-        }
-
-        this.saveState();
-
-        let item = null;
-        for (const cat of this.menu.categories) {
-          const found = cat.items.find(i => i.id === itemId);
-          if (found) {
-            item = found;
-            break;
-          }
-        }
-
-        if (!item) return;
-
-        const temps = [
-          { name: 'Hot', price: 0, isDefault: true },
-          { name: 'Iced', price: 0.50, isDefault: false },
-          { name: 'Blended', price: 1.00, isDefault: false }
-        ];
-
-        temps.forEach((t, i) => {
-          item.modifiers.push({
-            id: this.generateId(),
-            name: t.name,
-            price: t.price,
-            isDefault: t.isDefault,
-            group: 'Temperature',
-            sortOrder: item.modifiers.length + i
-          });
-        });
-
-        this.render();
-        this.toast('Temperature options added', 'success');
-      },
-
-      // Select element
-      selectElement(element) {
-        this.clearSelection();
-        this.selectedElement = element;
-        element.classList.add('selected');
-
-        // Get data
-        if (element.classList.contains('category-card')) {
-          const catId = element.dataset.categoryId;
-          const category = this.menu.categories.find(c => c.id === catId);
-          this.selectedData = { type: 'category', data: category };
-          this.showPropertiesForCategory(category);
-        } else if (element.classList.contains('item-card')) {
-          const itemId = element.dataset.itemId;
-          for (const cat of this.menu.categories) {
-            const item = cat.items.find(i => i.id === itemId);
-            if (item) {
-              this.selectedData = { type: 'item', data: item, category: cat };
-              this.showPropertiesForItem(item, cat);
-              break;
-            }
-          }
-        }
-      },
-
-      // Select element by ID
-      selectElementById(type, id) {
-        const selector = type === 'category'
-          ? `.category-card[data-category-id="${id}"]`
-          : `.item-card[data-item-id="${id}"]`;
-        const element = document.querySelector(selector);
-        if (element) {
-          this.selectElement(element);
-        }
-      },
-
-      // Select item by ID (shortcut for use in onclick handlers)
-      selectItem(itemId) {
-        this.selectElementById('item', itemId);
-      },
-
-      // Clear selection
-      clearSelection() {
-        if (this.selectedElement) {
-          this.selectedElement.classList.remove('selected');
-        }
-        this.selectedElement = null;
-        this.selectedData = null;
-        document.getElementById('propertiesContent').innerHTML = `
-          <p style="color: var(--gray-500); text-align: center; padding: 20px;">
-            Select an item to edit its properties
-          </p>
-        `;
-      },
-
-      // Show properties for category
-      showPropertiesForCategory(category) {
-        const menuOptions = this.menus.map(m =>
-          `<option value="${m.MenuID}" ${category.menuId === m.MenuID ? 'selected' : ''}>${this.escapeHtml(m.MenuName)}</option>`
-        ).join('');
-
-        document.getElementById('propertiesContent').innerHTML = `
-          <div class="property-group">
-            <label>Category Name</label>
-            <input type="text" id="propCatName" value="${this.escapeHtml(category.name)}"
-              onchange="MenuBuilder.updateCategory('${category.id}', 'name', this.value)">
-          </div>
-          <div class="property-group">
-            <label>Description</label>
-            <textarea id="propCatDesc" rows="3"
-              onchange="MenuBuilder.updateCategory('${category.id}', 'description', this.value)">${this.escapeHtml(category.description || '')}</textarea>
-          </div>
-          ${this.menus.length > 0 ? `
-          <div class="property-group">
-            <label>Assign to Menu</label>
-            <select onchange="MenuBuilder.updateCategory('${category.id}', 'menuId', parseInt(this.value))">
-              <option value="0" ${!category.menuId ? 'selected' : ''}>No Menu (Always Show)</option>
-              ${menuOptions}
-            </select>
-          </div>
-          ` : ''}
-          <div class="property-group">
-            <label>Sort Order</label>
-            <input type="number" id="propCatSort" value="${category.sortOrder}"
-              onchange="MenuBuilder.updateCategory('${category.id}', 'sortOrder', parseInt(this.value))">
-          </div>
-          <div class="property-group" style="margin-top: 16px;">
-            <button class="btn btn-danger" onclick="MenuBuilder.deleteCategory('${category.id}')">
-              Delete Category
-            </button>
-          </div>
-        `;
-      },
-
-      // Show properties for item
-      showPropertiesForItem(item, category) {
-        document.getElementById('propertiesContent').innerHTML = `
-          <div class="property-group">
-            <label>Item Name</label>
-            <input type="text" id="propItemName" value="${this.escapeHtml(item.name)}"
-              onchange="MenuBuilder.updateItem('${category.id}', '${item.id}', 'name', this.value)">
-          </div>
-          <div class="property-group">
-            <label>Description</label>
-            <textarea id="propItemDesc" rows="3"
-              onchange="MenuBuilder.updateItem('${category.id}', '${item.id}', 'description', this.value)">${this.escapeHtml(item.description || '')}</textarea>
-          </div>
-          <div class="property-row">
-            <div class="property-group">
-              <label>Price ($)</label>
-              <input type="number" step="0.01" id="propItemPrice" value="${item.price || 0}"
-                onchange="MenuBuilder.updateItem('${category.id}', '${item.id}', 'price', parseFloat(this.value))">
-            </div>
-            <div class="property-group">
-              <label>Category</label>
-              <select onchange="MenuBuilder.moveItemToCategory('${item.id}', this.value)">
-                ${this.menu.categories.map(c =>
-                  `<option value="${c.id}" ${c.id === category.id ? 'selected' : ''}>${this.escapeHtml(c.name)}</option>`
-                ).join('')}
-              </select>
-            </div>
-          </div>
-
-          <div class="photo-task-section">
-            <div class="photo-task-header">
-              <h4>Item Photo</h4>
-              ${item.photoTaskId ?
-                `<span class="task-badge ${item.imageUrl ? 'completed' : ''}">
-                  ${item.imageUrl ? 'Photo Added' : 'Task Pending'}
-                </span>` : ''}
-            </div>
-            <div class="photo-preview">
-              ${item.imageUrl ?
-                `<img src="${item.imageUrl}" alt="${this.escapeHtml(item.name)}">` :
-                `<span>No photo yet</span>`}
-            </div>
-            <div class="photo-actions">
-              <button class="btn btn-secondary" onclick="MenuBuilder.uploadPhoto('${item.id}')">
-                Upload
-              </button>
-              <button class="btn btn-secondary" onclick="MenuBuilder.createPhotoTask('${item.id}')">
-                Create Task
-              </button>
-            </div>
-          </div>
-
-          <div class="property-group" style="margin-top: 16px;">
-            <label>Modifiers (${item.modifiers.length})</label>
-            <button class="btn btn-secondary" onclick="MenuBuilder.addModifier('${item.id}')" style="margin-top: 8px;">
-              + Add Modifier
-            </button>
-          </div>
-
-          <div class="property-group" style="margin-top: 16px;">
-            <button class="btn btn-danger" onclick="MenuBuilder.deleteItem('${category.id}', '${item.id}')">
-              Delete Item
-            </button>
-          </div>
-        `;
-      },
-
-      // Select modifier and show its properties
-      selectModifier(itemId, modifierId) {
-        this.clearSelection();
-
-        // Find the modifier element and highlight it
-        const element = document.querySelector(`.item-card.modifier[data-modifier-id="${modifierId}"]`);
-        if (element) {
-          this.selectedElement = element;
-          element.classList.add('selected');
-        }
-
-        // Find the modifier data
-        for (const cat of this.menu.categories) {
-          const item = cat.items.find(i => i.id === itemId);
-          if (item) {
-            const modifier = item.modifiers.find(m => m.id === modifierId);
-            if (modifier) {
-              this.selectedData = { type: 'modifier', data: modifier, item: item, category: cat };
-              this.showPropertiesForModifier(modifier, item, cat);
-              break;
-            }
-          }
-        }
-      },
-
-      // Show properties for modifier
-      showPropertiesForModifier(modifier, item, category) {
-        document.getElementById('propertiesContent').innerHTML = `
-          <div class="property-group">
-            <label>Modifier Name</label>
-            <input type="text" id="propModName" value="${this.escapeHtml(modifier.name)}"
-              onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'name', this.value)">
-          </div>
-          <div class="property-row">
-            <div class="property-group">
-              <label>Extra Price ($)</label>
-              <input type="number" step="0.01" id="propModPrice" value="${modifier.price || 0}"
-                onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'price', parseFloat(this.value))">
-            </div>
-            <div class="property-group">
-              <label>Default</label>
-              <select id="propModDefault"
-                onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'isDefault', this.value === 'true')">
-                <option value="false" ${!modifier.isDefault ? 'selected' : ''}>No</option>
-                <option value="true" ${modifier.isDefault ? 'selected' : ''}>Yes</option>
-              </select>
-            </div>
-          </div>
-          <div class="property-group">
-            <label>Group Name (optional)</label>
-            <input type="text" id="propModGroup" value="${this.escapeHtml(modifier.group || '')}"
-              placeholder="e.g., Size, Protein, Temperature"
-              onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'group', this.value)">
-            <small style="color: var(--gray-500); font-size: 11px;">
-              Modifiers with the same group name are shown together
-            </small>
-          </div>
-          <div class="property-group">
-            <label>Sort Order</label>
-            <input type="number" id="propModSort" value="${modifier.sortOrder || 0}"
-              onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'sortOrder', parseInt(this.value))">
-          </div>
-          <div style="margin-top: 16px; padding-top: 16px; border-top: 1px solid var(--border-color);">
-            <p style="color: var(--gray-500); font-size: 12px; margin: 0 0 8px;">
-              Parent Item: <strong>${this.escapeHtml(item.name)}</strong>
-            </p>
-          </div>
-          <div class="property-group" style="margin-top: 16px;">
-            <button class="btn btn-danger" onclick="MenuBuilder.deleteModifier('${item.id}', '${modifier.id}')">
-              Delete Modifier
-            </button>
-          </div>
-        `;
-      },
-
-      // Update modifier
-      updateModifier(itemId, modifierId, field, value) {
-        this.saveState();
-        for (const cat of this.menu.categories) {
-          const item = cat.items.find(i => i.id === itemId);
-          if (item) {
-            const modifier = item.modifiers.find(m => m.id === modifierId);
-            if (modifier) {
-              modifier[field] = value;
-              this.render();
-              // Re-select the modifier to keep properties panel open
-              this.selectModifier(itemId, modifierId);
-              break;
-            }
-          }
-        }
-      },
-
-      // Delete modifier
-      deleteModifier(itemId, modifierId) {
-        if (!confirm('Delete this modifier?')) return;
-        this.saveState();
-        for (const cat of this.menu.categories) {
-          const item = cat.items.find(i => i.id === itemId);
-          if (item) {
-            item.modifiers = item.modifiers.filter(m => m.id !== modifierId);
-            break;
-          }
-        }
-        this.clearSelection();
-        this.render();
-        this.toast('Modifier deleted', 'success');
-      },
-
-      // Helper: Find an option recursively in the menu tree
-      findOptionRecursive(options, optionId) {
-        for (const opt of options) {
-          if (opt.id === optionId) return opt;
-          if (opt.options && opt.options.length > 0) {
-            const found = this.findOptionRecursive(opt.options, optionId);
-            if (found) return found;
-          }
-        }
-        return null;
-      },
-
-      // Helper: Find parent info for an option
-      findOptionWithParent(parentId, optionId) {
-        // First check if parent is a top-level item
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            if (item.id === parentId) {
-              const opt = item.modifiers.find(m => m.id === optionId);
-              // rootItem is the item itself when parent is the item
-              if (opt) return { option: opt, parent: item, parentType: 'item', category: cat, rootItem: item };
-            }
-            // Check nested modifiers
-            const result = this.findInModifiers(item.modifiers, parentId, optionId);
-            if (result) return { ...result, rootItem: item, category: cat };
-          }
-        }
-        return null;
-      },
-
-      findInModifiers(modifiers, parentId, optionId) {
-        for (const mod of modifiers) {
-          if (mod.id === parentId) {
-            const opt = (mod.options || []).find(o => o.id === optionId);
-            if (opt) return { option: opt, parent: mod, parentType: 'modifier' };
-          }
-          if (mod.options && mod.options.length > 0) {
-            const result = this.findInModifiers(mod.options, parentId, optionId);
-            if (result) return result;
-          }
-        }
-        return null;
-      },
-
-      // Select option at any depth
-      selectOption(parentId, optionId, depth) {
-        this.clearSelection();
-
-        const element = document.querySelector(`.item-card.modifier[data-modifier-id="${optionId}"]`);
-        if (element) {
-          this.selectedElement = element;
-          element.classList.add('selected');
-        }
-
-        const result = this.findOptionWithParent(parentId, optionId);
-        if (result) {
-          // Store rootItem for detach functionality
-          this.selectedData = {
-            type: 'option',
-            data: result.option,
-            parent: result.parent,
-            depth: depth,
-            rootItem: result.rootItem || result.category?.items?.find(i => i.id === parentId)
-          };
-          this.showPropertiesForOption(result.option, result.parent, depth, result.rootItem);
-        }
-      },
-
-      // Show properties for option at any depth
-      showPropertiesForOption(option, parent, depth, rootItem) {
-        const hasOptions = option.options && option.options.length > 0;
-        const levelName = depth === 1 ? 'Modifier Group' : (depth === 2 ? 'Option' : `Level ${depth} Option`);
-        const isModifierGroup = depth === 1 && hasOptions;
-
-        // Check if this is a shared template (only for depth 1 modifiers)
-        const isShared = depth === 1 && option.dbId && this.isSharedTemplate(option.dbId);
-        const sharedItems = isShared ? this.getItemsSharingTemplate(option.dbId) : [];
-
-        document.getElementById('propertiesContent').innerHTML = `
-          ${isShared ? `
-          <div style="background: rgba(255, 193, 7, 0.1); border: 1px solid var(--warning); border-radius: 8px; padding: 12px; margin-bottom: 16px;">
-            <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 8px;">
-              <span style="font-size: 16px;">🔗</span>
-              <strong style="color: var(--warning);">Shared Template</strong>
-            </div>
-            <p style="color: var(--gray-500); font-size: 12px; margin: 0 0 8px;">
-              Changes will apply to all ${sharedItems.length} items using this modifier:
-            </p>
-            <p style="color: var(--text-secondary); font-size: 11px; margin: 0; max-height: 60px; overflow-y: auto;">
-              ${sharedItems.map(n => this.escapeHtml(n)).join(', ')}
-            </p>
-            ${rootItem ? `
-            <button class="btn btn-secondary" style="margin-top: 12px; font-size: 12px;"
-              onclick="MenuBuilder.detachFromTemplate('${rootItem.id}', '${option.id}')">
-              ✂️ Detach for This Item Only
-            </button>
-            ` : ''}
-          </div>
-          ` : ''}
-          <div class="property-group">
-            <label>${levelName} Name</label>
-            <input type="text" value="${this.escapeHtml(option.name)}"
-              onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'name', this.value)">
-          </div>
-          <div class="property-row">
-            <div class="property-group">
-              <label>Extra Price ($)</label>
-              <input type="number" step="0.01" value="${option.price || 0}"
-                onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'price', parseFloat(this.value))">
-            </div>
-            <div class="property-group">
-              <label>Default</label>
-              <select onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'isDefault', this.value === 'true')">
-                <option value="false" ${!option.isDefault ? 'selected' : ''}>No</option>
-                <option value="true" ${option.isDefault ? 'selected' : ''}>Yes</option>
-              </select>
-            </div>
-          </div>
-          ${isModifierGroup ? `
-          <div style="margin-top: 16px; padding-top: 16px; border-top: 1px solid var(--border-color);">
-            <h4 style="margin: 0 0 12px; font-size: 13px; color: var(--text-muted);">Selection Rules</h4>
-            <div class="property-row">
-              <div class="property-group">
-                <label>Required</label>
-                <select onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'requiresSelection', this.value === 'true')">
-                  <option value="false" ${!option.requiresSelection ? 'selected' : ''}>No</option>
-                  <option value="true" ${option.requiresSelection ? 'selected' : ''}>Yes</option>
-                </select>
-              </div>
-              <div class="property-group">
-                <label>Max Selections</label>
-                <input type="number" min="0" value="${option.maxSelections || 0}"
-                  onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'maxSelections', parseInt(this.value))"
-                  title="0 = unlimited">
-              </div>
-            </div>
-            <p style="color: var(--gray-500); font-size: 11px; margin: 4px 0 0;">
-              Required = customer must select at least one option. Max 0 = unlimited.
-            </p>
-          </div>
-          ` : ''}
-          <div class="property-group">
-            <label>Sort Order</label>
-            <input type="number" value="${option.sortOrder || 0}"
-              onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'sortOrder', parseInt(this.value))">
-          </div>
-
-          <div style="margin-top: 16px; padding-top: 16px; border-top: 1px solid var(--border-color);">
-            <p style="color: var(--gray-500); font-size: 12px; margin: 0 0 8px;">
-              Parent: <strong>${this.escapeHtml(parent.name)}</strong>
-            </p>
-            <p style="color: var(--gray-500); font-size: 12px; margin: 0;">
-              Sub-options: <strong>${hasOptions ? option.options.length : 0}</strong>
-            </p>
-          </div>
-
-          <div class="property-group" style="margin-top: 16px;">
-            <button class="btn btn-secondary" onclick="MenuBuilder.addSubOption('${option.id}')">
-              + Add Sub-Option
-            </button>
-          </div>
-
-          <div class="property-group" style="margin-top: 8px;">
-            <button class="btn btn-danger" onclick="MenuBuilder.deleteOption('${parent.id}', '${option.id}', ${depth})">
-              Delete ${levelName}
-            </button>
-          </div>
-        `;
-      },
-
-      // Update option at any depth
-      // IMPORTANT: Templates are shared across multiple items, so we need to update ALL copies
-      updateOption(parentId, optionId, field, value) {
-        console.log('[MenuBuilder] updateOption called:', { parentId, optionId, field, value });
-        this.saveState();
-
-        // Get the dbId of the option being updated (to find all copies)
-        const result = this.findOptionWithParent(parentId, optionId);
-        if (!result || !result.option) {
-          console.error('[MenuBuilder] Could not find option to update!', { parentId, optionId });
-          return;
-        }
-
-        const optionDbId = result.option.dbId;
-        const parentDbId = result.parent.dbId;
-        const isTopLevelModifier = result.parentType === 'item'; // parent is the menu item itself
-        console.log('[MenuBuilder] Updating option dbId:', optionDbId, 'in parent dbId:', parentDbId, 'isTopLevel:', isTopLevelModifier);
-
-        // Update ALL instances of this option across all items (templates are duplicated)
-        let updateCount = 0;
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            for (const mod of (item.modifiers || [])) {
-              // If editing a top-level modifier group, match by the modifier's dbId directly
-              if (isTopLevelModifier && mod.dbId === optionDbId) {
-                mod[field] = value;
-                updateCount++;
-                console.log('[MenuBuilder] Updated top-level modifier in item:', item.name);
-              }
-              // If editing a nested option, find within the modifier's options
-              else if (!isTopLevelModifier && mod.dbId === parentDbId) {
-                // Find the option within this modifier
-                const opt = (mod.options || []).find(o => o.dbId === optionDbId);
-                if (opt) {
-                  opt[field] = value;
-                  updateCount++;
-                  console.log('[MenuBuilder] Updated nested option in item:', item.name);
-                }
-              }
-              // Also check nested options recursively for deeper levels
-              this.updateOptionInModifiers(mod.options || [], parentDbId, optionDbId, field, value);
-            }
-          }
-        }
-        console.log('[MenuBuilder] Total copies updated:', updateCount);
-
-        this.render();
-        this.selectOption(parentId, optionId, this.selectedData?.depth || 1);
-      },
-
-      // Helper to recursively update option in nested modifiers
-      updateOptionInModifiers(options, parentDbId, optionDbId, field, value) {
-        for (const opt of options) {
-          if (opt.dbId === parentDbId) {
-            const child = (opt.options || []).find(o => o.dbId === optionDbId);
-            if (child) {
-              child[field] = value;
-            }
-          }
-          if (opt.options && opt.options.length > 0) {
-            this.updateOptionInModifiers(opt.options, parentDbId, optionDbId, field, value);
-          }
-        }
-      },
-
-      // Check if a modifier (by dbId) is shared across multiple items
-      isSharedTemplate(modifierDbId) {
-        if (!modifierDbId) return false;
-
-        let count = 0;
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            for (const mod of (item.modifiers || [])) {
-              if (mod.dbId === modifierDbId) {
-                count++;
-                if (count > 1) return true;
-              }
-            }
-          }
-        }
-        return false;
-      },
-
-      // Get list of items that share a template
-      getItemsSharingTemplate(modifierDbId) {
-        if (!modifierDbId) return [];
-
-        const items = [];
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            for (const mod of (item.modifiers || [])) {
-              if (mod.dbId === modifierDbId) {
-                items.push(item.name);
-              }
-            }
-          }
-        }
-        return items;
-      },
-
-      // Detach a modifier from its template - creates a local copy for this item only
-      detachFromTemplate(itemId, modifierId) {
-        this.saveState();
-
-        // Find the item and modifier
-        for (const cat of this.menu.categories) {
-          const item = cat.items.find(i => i.id === itemId);
-          if (item) {
-            const modIndex = item.modifiers.findIndex(m => m.id === modifierId);
-            if (modIndex !== -1) {
-              const mod = item.modifiers[modIndex];
-
-              // Create a deep copy with new IDs (null dbId means it will be created as new)
-              const detachedCopy = this.deepCopyWithNewIds(mod);
-              detachedCopy.name = mod.name + ' (Custom)';
-
-              // Replace the original with the detached copy
-              item.modifiers[modIndex] = detachedCopy;
-
-              this.render();
-              this.toast('Modifier detached - this item now has its own copy', 'success');
-
-              // Select the new detached modifier
-              this.selectOption(itemId, detachedCopy.id, 1);
-              return;
-            }
-          }
-        }
-
-        this.toast('Could not find modifier to detach', 'error');
-      },
-
-      // Create a deep copy of a modifier/option tree with new IDs
-      deepCopyWithNewIds(obj) {
-        const newObj = {
-          id: 'mod_new_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-          dbId: null, // null = will be created as new in database
-          name: obj.name,
-          price: obj.price || 0,
-          isDefault: obj.isDefault || false,
-          sortOrder: obj.sortOrder || 0,
-          requiresSelection: obj.requiresSelection || false,
-          maxSelections: obj.maxSelections || 0,
-          options: []
-        };
-
-        // Recursively copy options
-        if (obj.options && obj.options.length > 0) {
-          newObj.options = obj.options.map(opt => this.deepCopyWithNewIds(opt));
-        }
-
-        return newObj;
-      },
-
-      // Delete option at any depth
-      deleteOption(parentId, optionId, depth) {
-        if (!confirm('Delete this option and all its sub-options?')) return;
-        this.saveState();
-
-        // Find and remove from parent's options array
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            // Check if parent is the item itself
-            if (item.id === parentId) {
-              item.modifiers = item.modifiers.filter(m => m.id !== optionId);
-              this.clearSelection();
-              this.render();
-              this.toast('Option deleted', 'success');
-              return;
-            }
-            // Check nested
-            if (this.deleteFromModifiers(item.modifiers, parentId, optionId)) {
-              this.clearSelection();
-              this.render();
-              this.toast('Option deleted', 'success');
-              return;
-            }
-          }
-        }
-      },
-
-      deleteFromModifiers(modifiers, parentId, optionId) {
-        for (const mod of modifiers) {
-          if (mod.id === parentId && mod.options) {
-            const idx = mod.options.findIndex(o => o.id === optionId);
-            if (idx !== -1) {
-              mod.options.splice(idx, 1);
-              return true;
-            }
-          }
-          if (mod.options && mod.options.length > 0) {
-            if (this.deleteFromModifiers(mod.options, parentId, optionId)) return true;
-          }
-        }
-        return false;
-      },
-
-      // Add sub-option to any option
-      addSubOption(parentOptionId) {
-        this.saveState();
-
-        const newOption = {
-          id: 'opt_new_' + Date.now(),
-          dbId: null,
-          name: 'New Option',
-          price: 0,
-          isDefault: false,
-          sortOrder: 0,
-          options: []
-        };
-
-        // Find the parent option and add to its options array
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            const found = this.findOptionRecursive(item.modifiers, parentOptionId);
-            if (found) {
-              if (!found.options) found.options = [];
-              found.options.push(newOption);
-              this.render();
-              this.toast('Sub-option added', 'success');
-              return;
-            }
-          }
-        }
-      },
-
-      // Find modifier/option and its parent array
-      findModifierWithParent(modifierId) {
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            // Check if it's a top-level modifier
-            const idx = item.modifiers.findIndex(m => m.id === modifierId);
-            if (idx !== -1) {
-              return { array: item.modifiers, index: idx, parentId: item.id, isItem: true };
-            }
-            // Check nested
-            const nested = this.findNestedModifierWithParent(item.modifiers, modifierId);
-            if (nested) return nested;
-          }
-        }
-        return null;
-      },
-
-      findNestedModifierWithParent(modifiers, modifierId) {
-        for (const mod of modifiers) {
-          if (mod.options && mod.options.length > 0) {
-            const idx = mod.options.findIndex(o => o.id === modifierId);
-            if (idx !== -1) {
-              return { array: mod.options, index: idx, parentId: mod.id, isItem: false };
-            }
-            const nested = this.findNestedModifierWithParent(mod.options, modifierId);
-            if (nested) return nested;
-          }
-        }
-        return null;
-      },
-
-      // Get the parent array for a parentId (item or modifier)
-      getParentModifiersArray(parentId) {
-        for (const cat of this.menu.categories) {
-          for (const item of cat.items) {
-            if (item.id === parentId) {
-              return item.modifiers;
-            }
-            const found = this.findOptionRecursive(item.modifiers, parentId);
-            if (found) {
-              if (!found.options) found.options = [];
-              return found.options;
-            }
-          }
-        }
-        return null;
-      },
-
-      // Deep clone a modifier with new IDs
-      cloneModifierDeep(mod) {
-        const clone = JSON.parse(JSON.stringify(mod));
-        clone.id = this.generateId();
-        clone.dbId = null; // Will get new dbId on save
-        if (clone.options && clone.options.length > 0) {
-          clone.options = clone.options.map(opt => this.cloneModifierDeep(opt));
-        }
-        return clone;
-      },
-
-      // Reorder modifier within same parent
-      reorderModifier(draggedId, targetId, parentId, position) {
-        this.saveState();
-        const parentArray = this.getParentModifiersArray(parentId);
-        if (!parentArray) return;
-
-        const draggedIdx = parentArray.findIndex(m => m.id === draggedId);
-        const targetIdx = parentArray.findIndex(m => m.id === targetId);
-        if (draggedIdx === -1 || targetIdx === -1) return;
-
-        // Remove dragged
-        const [dragged] = parentArray.splice(draggedIdx, 1);
-
-        // Find new target index (may have shifted)
-        let newTargetIdx = parentArray.findIndex(m => m.id === targetId);
-        if (position === 'after') newTargetIdx++;
-
-        // Insert at new position
-        parentArray.splice(newTargetIdx, 0, dragged);
-
-        // Update sort orders
-        parentArray.forEach((m, i) => m.sortOrder = i);
-
-        this.render();
-        this.toast('Modifier reordered', 'success');
-      },
-
-      // Move modifier from one parent to another
-      moveModifier(draggedId, fromParentId, targetModId, toParentId, position) {
-        this.saveState();
-        const fromArray = this.getParentModifiersArray(fromParentId);
-        const toArray = this.getParentModifiersArray(toParentId);
-        if (!fromArray || !toArray) return;
-
-        const draggedIdx = fromArray.findIndex(m => m.id === draggedId);
-        if (draggedIdx === -1) return;
-
-        // Remove from source
-        const [dragged] = fromArray.splice(draggedIdx, 1);
-
-        // Find target position in destination
-        const targetIdx = toArray.findIndex(m => m.id === targetModId);
-        let insertIdx = targetIdx === -1 ? toArray.length : targetIdx;
-        if (position === 'after') insertIdx++;
-
-        // Insert at new position
-        toArray.splice(insertIdx, 0, dragged);
-
-        // Update sort orders in both arrays
-        fromArray.forEach((m, i) => m.sortOrder = i);
-        toArray.forEach((m, i) => m.sortOrder = i);
-
-        this.render();
-        this.toast('Modifier moved', 'success');
-      },
-
-      // Copy modifier to position relative to another modifier
-      copyModifier(draggedId, fromParentId, targetModId, toParentId, position) {
-        this.saveState();
-        const fromArray = this.getParentModifiersArray(fromParentId);
-        const toArray = this.getParentModifiersArray(toParentId);
-        if (!fromArray || !toArray) return;
-
-        const dragged = fromArray.find(m => m.id === draggedId);
-        if (!dragged) return;
-
-        // Clone with new IDs
-        const clone = this.cloneModifierDeep(dragged);
-
-        // Find target position
-        const targetIdx = toArray.findIndex(m => m.id === targetModId);
-        let insertIdx = targetIdx === -1 ? toArray.length : targetIdx;
-        if (position === 'after') insertIdx++;
-
-        // Insert clone
-        toArray.splice(insertIdx, 0, clone);
-
-        // Update sort orders
-        toArray.forEach((m, i) => m.sortOrder = i);
-
-        this.render();
-        this.toast('Modifier copied', 'success');
-      },
-
-      // Move modifier to an item (as top-level modifier)
-      moveModifierToItem(draggedId, fromParentId, toItemId) {
-        this.saveState();
-        const fromArray = this.getParentModifiersArray(fromParentId);
-        if (!fromArray) return;
-
-        // Find target item
-        let targetItem = null;
-        for (const cat of this.menu.categories) {
-          targetItem = cat.items.find(i => i.id === toItemId);
-          if (targetItem) break;
-        }
-        if (!targetItem) return;
-
-        const draggedIdx = fromArray.findIndex(m => m.id === draggedId);
-        if (draggedIdx === -1) return;
-
-        // Remove from source
-        const [dragged] = fromArray.splice(draggedIdx, 1);
-
-        // Add to target item's modifiers
-        dragged.sortOrder = targetItem.modifiers.length;
-        targetItem.modifiers.push(dragged);
-
-        // Update sort orders
-        fromArray.forEach((m, i) => m.sortOrder = i);
-
-        this.render();
-        this.toast('Modifier moved to item', 'success');
-      },
-
-      // Copy modifier to an item (as top-level modifier)
-      copyModifierToItem(draggedId, fromParentId, toItemId) {
-        this.saveState();
-        const fromArray = this.getParentModifiersArray(fromParentId);
-        if (!fromArray) return;
-
-        // Find target item
-        let targetItem = null;
-        for (const cat of this.menu.categories) {
-          targetItem = cat.items.find(i => i.id === toItemId);
-          if (targetItem) break;
-        }
-        if (!targetItem) return;
-
-        const dragged = fromArray.find(m => m.id === draggedId);
-        if (!dragged) return;
-
-        // Clone with new IDs
-        const clone = this.cloneModifierDeep(dragged);
-        clone.sortOrder = targetItem.modifiers.length;
-
-        // Add to target item
-        targetItem.modifiers.push(clone);
-
-        this.render();
-        this.toast('Modifier copied to item', 'success');
-      },
-
-      // Update category
-      // Update category
-      updateCategory(categoryId, field, value) {
-        this.saveState();
-        const category = this.menu.categories.find(c => c.id === categoryId);
-        if (category) {
-          category[field] = value;
-          this.render();
-        }
-      },
-
-      // Update item
-      updateItem(categoryId, itemId, field, value) {
-        this.saveState();
-        const category = this.menu.categories.find(c => c.id === categoryId);
-        if (category) {
-          const item = category.items.find(i => i.id === itemId);
-          if (item) {
-            item[field] = value;
-            this.render();
-          }
-        }
-      },
-
-      // Move item to category
-      moveItemToCategory(itemId, newCategoryId) {
-        this.saveState();
-
-        // Find and remove item from current category
-        let item = null;
-        for (const cat of this.menu.categories) {
-          const idx = cat.items.findIndex(i => i.id === itemId);
-          if (idx !== -1) {
-            item = cat.items.splice(idx, 1)[0];
-            break;
-          }
-        }
-
-        // Add to new category
-        if (item) {
-          const newCat = this.menu.categories.find(c => c.id === newCategoryId);
-          if (newCat) {
-            item.sortOrder = newCat.items.length;
-            newCat.items.push(item);
-          }
-        }
-
-        this.render();
-      },
-
-      // Reorder item within same category (drag and drop)
-      reorderItemInCategory(draggedItemId, targetItemId, position = 'before') {
-        // Find the category containing these items
-        for (const cat of this.menu.categories) {
-          const draggedIdx = cat.items.findIndex(i => i.id === draggedItemId);
-          const targetIdx = cat.items.findIndex(i => i.id === targetItemId);
-          
-          if (draggedIdx !== -1 && targetIdx !== -1 && draggedIdx !== targetIdx) {
-            this.saveState();
-            // Remove dragged item
-            const [draggedItem] = cat.items.splice(draggedIdx, 1);
-            // Find new target index (it may have shifted)
-            const newTargetIdx = cat.items.findIndex(i => i.id === targetItemId);
-            // Insert at new position
-            const insertIdx = position === 'before' ? newTargetIdx : newTargetIdx + 1;
-            cat.items.splice(insertIdx, 0, draggedItem);
-            // Update sortOrder for all items
-            cat.items.forEach((item, idx) => item.sortOrder = idx);
-            this.render();
-            return;
-          }
-        }
-      },
-
-      // Reorder category (drag and drop)
-      reorderCategory(draggedCatId, targetCatId, position = 'before') {
-        const draggedIdx = this.menu.categories.findIndex(c => c.id === draggedCatId);
-        const targetIdx = this.menu.categories.findIndex(c => c.id === targetCatId);
-        
-        if (draggedIdx !== -1 && targetIdx !== -1 && draggedIdx !== targetIdx) {
-          this.saveState();
-          const [draggedCat] = this.menu.categories.splice(draggedIdx, 1);
-          const newTargetIdx = this.menu.categories.findIndex(c => c.id === targetCatId);
-          const insertIdx = position === 'before' ? newTargetIdx : newTargetIdx + 1;
-          this.menu.categories.splice(insertIdx, 0, draggedCat);
-          this.render();
-        }
-      },
-
-      // Delete category
-      deleteCategory(categoryId) {
-        if (!confirm('Delete this category and all its items?')) return;
-        this.saveState();
-        this.menu.categories = this.menu.categories.filter(c => c.id !== categoryId);
-        this.clearSelection();
-        this.render();
-        this.toast('Category deleted', 'success');
-      },
-
-      // Delete item
-      deleteItem(categoryId, itemId) {
-        if (!confirm('Delete this item?')) return;
-        this.saveState();
-        const category = this.menu.categories.find(c => c.id === categoryId);
-        if (category) {
-          category.items = category.items.filter(i => i.id !== itemId);
-        }
-        this.clearSelection();
-        this.render();
-        this.toast('Item deleted', 'success');
-      },
-
-      // Clone selected
-      cloneSelected() {
-        if (!this.selectedData) return;
-        this.saveState();
-
-        if (this.selectedData.type === 'category') {
-          const original = this.selectedData.data;
-          const clone = JSON.parse(JSON.stringify(original));
-          clone.id = this.generateId();
-          clone.name = original.name + ' (Copy)';
-          clone.items.forEach(item => {
-            item.id = this.generateId();
-            item.modifiers.forEach(mod => mod.id = this.generateId());
-          });
-          this.menu.categories.push(clone);
-        } else if (this.selectedData.type === 'item') {
-          const original = this.selectedData.data;
-          const category = this.selectedData.category;
-          const clone = JSON.parse(JSON.stringify(original));
-          clone.id = this.generateId();
-          clone.name = original.name + ' (Copy)';
-          clone.modifiers.forEach(mod => mod.id = this.generateId());
-          category.items.push(clone);
-        }
-
-        this.render();
-        this.toast('Cloned', 'success');
-      },
-
-      // Delete selected
-      deleteSelected() {
-        if (!this.selectedData) return;
-
-        if (this.selectedData.type === 'category') {
-          this.deleteCategory(this.selectedData.data.id);
-        } else if (this.selectedData.type === 'item') {
-          this.deleteItem(this.selectedData.category.id, this.selectedData.data.id);
-        }
-      },
-
-      // Edit selected
-      editSelected() {
-        if (!this.selectedElement) return;
-        // Focus on the name input in properties panel
-        const nameInput = document.getElementById('propCatName') || document.getElementById('propItemName');
-        if (nameInput) {
-          nameInput.focus();
-          nameInput.select();
-        }
-      },
-
-      // Move up
-      moveUp() {
-        if (!this.selectedData) return;
-        this.saveState();
-
-        if (this.selectedData.type === 'category') {
-          const idx = this.menu.categories.findIndex(c => c.id === this.selectedData.data.id);
-          if (idx > 0) {
-            [this.menu.categories[idx - 1], this.menu.categories[idx]] =
-            [this.menu.categories[idx], this.menu.categories[idx - 1]];
-          }
-        } else if (this.selectedData.type === 'item') {
-          const items = this.selectedData.category.items;
-          const idx = items.findIndex(i => i.id === this.selectedData.data.id);
-          if (idx > 0) {
-            [items[idx - 1], items[idx]] = [items[idx], items[idx - 1]];
-          }
-        }
-
-        this.render();
-        this.selectElementById(this.selectedData.type, this.selectedData.data.id);
-      },
-
-      // Move down
-      moveDown() {
-        if (!this.selectedData) return;
-        this.saveState();
-
-        if (this.selectedData.type === 'category') {
-          const idx = this.menu.categories.findIndex(c => c.id === this.selectedData.data.id);
-          if (idx < this.menu.categories.length - 1) {
-            [this.menu.categories[idx], this.menu.categories[idx + 1]] =
-            [this.menu.categories[idx + 1], this.menu.categories[idx]];
-          }
-        } else if (this.selectedData.type === 'item') {
-          const items = this.selectedData.category.items;
-          const idx = items.findIndex(i => i.id === this.selectedData.data.id);
-          if (idx < items.length - 1) {
-            [items[idx], items[idx + 1]] = [items[idx + 1], items[idx]];
-          }
-        }
-
-        this.render();
-        this.selectElementById(this.selectedData.type, this.selectedData.data.id);
-      },
-
-      // Create photo task
-      createPhotoTask(itemId = null) {
-        const id = itemId || (this.selectedData?.type === 'item' ? this.selectedData.data.id : null);
-        if (!id) {
-          this.toast('Select an item first', 'error');
-          return;
-        }
-
-        // Find item
-        let item = null;
-        for (const cat of this.menu.categories) {
-          const found = cat.items.find(i => i.id === id);
-          if (found) {
-            item = found;
-            break;
-          }
-        }
-
-        if (!item) return;
-
-        document.getElementById('modalTitle').textContent = 'Create Photo Task';
-        document.getElementById('modalBody').innerHTML = `
-          <form id="photoTaskForm" class="form">
-            <div class="form-group">
-              <label>Item</label>
-              <input type="text" class="form-input" value="${this.escapeHtml(item.name)}" disabled>
-            </div>
-            <div class="form-group">
-              <label>Task Type</label>
-              <select id="taskType" class="form-select">
-                <option value="employee">Employee Task</option>
-                <option value="user">User Participation (earn PYT)</option>
-              </select>
-            </div>
-            <div class="form-group" id="pytRewardGroup" style="display: none;">
-              <label>PYT Reward</label>
-              <input type="number" id="pytReward" class="form-input" value="10" min="1" max="100">
-              <small style="color: var(--gray-500);">Tokens rewarded for approved photo</small>
-            </div>
-            <div class="form-group">
-              <label>Instructions (optional)</label>
-              <textarea id="taskInstructions" class="form-textarea" rows="3"
-                placeholder="e.g., Photo should show the full plate with garnish visible"></textarea>
-            </div>
-            <button type="submit" class="btn btn-primary">Create Task</button>
-          </form>
-        `;
-        this.showModal();
-
-        document.getElementById('taskType').addEventListener('change', (e) => {
-          document.getElementById('pytRewardGroup').style.display =
-            e.target.value === 'user' ? 'block' : 'none';
-        });
-
-        document.getElementById('photoTaskForm').addEventListener('submit', async (e) => {
-          e.preventDefault();
-          await this.submitPhotoTask(item.id);
-        });
-      },
-
-      // Submit photo task
-      async submitPhotoTask(itemId) {
-        const taskType = document.getElementById('taskType').value;
-        const instructions = document.getElementById('taskInstructions').value;
-        const pytReward = taskType === 'user' ? parseInt(document.getElementById('pytReward').value) : 0;
-
-        try {
-          const response = await fetch(`${this.config.apiBaseUrl}/tasks/create.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              BusinessID: this.config.businessId,
-              ItemID: itemId,
-              TaskType: taskType === 'user' ? 'user_photo' : 'employee_photo',
-              Instructions: instructions,
-              PYTReward: pytReward
-            })
-          });
-
-          const data = await response.json();
-          if (data.OK) {
-            // Update item with task ID
-            for (const cat of this.menu.categories) {
-              const item = cat.items.find(i => i.id === itemId);
-              if (item) {
-                item.photoTaskId = data.TASK_ID;
-                break;
-              }
-            }
-            this.closeModal();
-            this.render();
-            this.toast('Photo task created!', 'success');
-          } else {
-            this.toast(data.ERROR || 'Failed to create task', 'error');
-          }
-        } catch (err) {
-          console.error('[MenuBuilder] Error creating task:', err);
-          // For demo, just mark as having a task
-          for (const cat of this.menu.categories) {
-            const item = cat.items.find(i => i.id === itemId);
-            if (item) {
-              item.photoTaskId = 'pending_' + Date.now();
-              break;
-            }
-          }
-          this.closeModal();
-          this.render();
-          this.toast('Photo task created (demo)', 'success');
-        }
-      },
-
-      // Upload photo
-      uploadPhoto(itemId) {
-        // Find the item and check it has a database ID
-        let targetItem = null;
-        for (const cat of this.menu.categories) {
-          const item = cat.items.find(i => i.id === itemId);
-          if (item) { targetItem = item; break; }
-        }
-        if (!targetItem || !targetItem.dbId) {
-          this.toast('Please save the menu first before uploading photos', 'error');
-          return;
-        }
-
-        const input = document.createElement('input');
-        input.type = 'file';
-        input.accept = 'image/jpeg,image/png,image/gif,image/webp';
-        input.onchange = async (e) => {
-          const file = e.target.files[0];
-          if (!file) return;
-
-          const validTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
-          if (!validTypes.includes(file.type)) {
-            this.toast('Please select a valid image (JPG, PNG, GIF, or WebP)', 'error');
-            return;
-          }
-          if (file.size > 5 * 1024 * 1024) {
-            this.toast('Image must be under 5MB', 'error');
-            return;
-          }
-
-          this.toast('Uploading photo...', 'info');
-
-          try {
-            const formData = new FormData();
-            formData.append('photo', file);
-            formData.append('ItemID', targetItem.dbId);
-
-            const response = await fetch(`${this.config.apiBaseUrl}/menu/uploadItemPhoto.cfm`, {
-              method: 'POST',
-              body: formData,
-              credentials: 'include'
-            });
-
-            const data = await response.json();
-            if (data.OK) {
-              targetItem.imageUrl = data.IMAGEURL + '?t=' + Date.now();
-              this.render();
-              this.toast('Photo uploaded!', 'success');
-            } else {
-              this.toast(data.MESSAGE || 'Failed to upload photo', 'error');
-            }
-          } catch (err) {
-            console.error('Photo upload error:', err);
-            this.toast('Failed to upload photo', 'error');
-          }
-        };
-        input.click();
-      },
-
-      // Show import modal
-      showImportModal() {
-        document.getElementById('modalTitle').textContent = 'Import Menu JSON';
-        document.getElementById('modalBody').innerHTML = `
-          <form id="importForm" class="form">
-            <div class="form-group">
-              <label>Paste JSON data</label>
-              <textarea id="importData" class="form-textarea import-export-area"
-                placeholder='{"categories": [{"name": "...", "items": [...]}]}'></textarea>
-            </div>
-            <div style="display: flex; gap: 8px;">
-              <button type="button" class="btn btn-secondary" onclick="MenuBuilder.loadSampleMenu()">
-                Load Sample
-              </button>
-              <button type="submit" class="btn btn-primary">Import</button>
-            </div>
-          </form>
-        `;
-        this.showModal();
-
-        document.getElementById('importForm').addEventListener('submit', (e) => {
-          e.preventDefault();
-          this.importMenu();
-        });
-      },
-
-      // Import menu
-      importMenu() {
-        try {
-          const data = JSON.parse(document.getElementById('importData').value);
-          this.saveState();
-
-          // Handle different JSON formats
-          if (data.categories) {
-            this.menu = data;
-          } else if (Array.isArray(data)) {
-            // Array of categories
-            this.menu.categories = data.map((cat, i) => ({
-              id: this.generateId(),
-              name: cat.name || cat.category || `Category ${i + 1}`,
-              description: cat.description || '',
-              sortOrder: i,
-              items: (cat.items || cat.children || []).map((item, j) => ({
-                id: this.generateId(),
-                name: item.name || item.title || 'Item',
-                description: item.description || '',
-                price: parseFloat(item.price) || 0,
-                imageUrl: item.imageUrl || item.image || null,
-                photoTaskId: null,
-                modifiers: (item.modifiers || item.children || []).map((mod, k) => ({
-                  id: this.generateId(),
-                  name: mod.name || 'Modifier',
-                  price: parseFloat(mod.price) || 0,
-                  isDefault: mod.isDefault || mod.checked || false,
-                  sortOrder: k
-                })),
-                sortOrder: j
-              }))
-            }));
-          }
-
-          // Ensure all IDs are unique
-          this.menu.categories.forEach(cat => {
-            if (!cat.id || typeof cat.id === 'number') cat.id = this.generateId();
-            cat.items.forEach(item => {
-              if (!item.id || typeof item.id === 'number') item.id = this.generateId();
-              if (item.modifiers) {
-                item.modifiers.forEach(mod => {
-                  if (!mod.id || typeof mod.id === 'number') mod.id = this.generateId();
-                });
-              }
-            });
-          });
-
-          this.closeModal();
-          this.render();
-          this.toast(`Imported ${this.menu.categories.length} categories`, 'success');
-        } catch (err) {
-          console.error('[MenuBuilder] Import error:', err);
-          this.toast('Invalid JSON format', 'error');
-        }
-      },
-
-      // Load sample menu
-      loadSampleMenu() {
-        const sample = {
-          categories: [
-            {
-              name: "Appetizers",
-              description: "Start your meal right",
-              items: [
-                { name: "Hummus", description: "Classic chickpea dip with olive oil", price: 8.99 },
-                { name: "Falafel", description: "Crispy fried chickpea balls", price: 7.99 },
-                { name: "Baba Ganoush", description: "Smoky eggplant dip", price: 9.99 }
-              ]
-            },
-            {
-              name: "Entrees",
-              description: "Main dishes",
-              items: [
-                { name: "Chicken Shawarma", description: "Slow-roasted chicken with garlic sauce", price: 14.99 },
-                { name: "Lamb Kebab", description: "Grilled lamb skewers", price: 16.99 },
-                { name: "Mixed Grill", description: "Assortment of grilled meats", price: 22.99 }
-              ]
-            },
-            {
-              name: "Beverages",
-              description: "Drinks",
-              items: [
-                { name: "Mint Lemonade", description: "Fresh squeezed with mint", price: 4.99 },
-                { name: "Turkish Coffee", description: "Traditional preparation", price: 3.99 }
-              ]
-            }
-          ]
-        };
-        document.getElementById('importData').value = JSON.stringify(sample, null, 2);
-      },
-
-      // Show export modal
-      showExportModal() {
-        document.getElementById('modalTitle').textContent = 'Export Menu JSON';
-        document.getElementById('modalBody').innerHTML = `
-          <div class="form-group">
-            <label>Menu Data</label>
-            <textarea id="exportData" class="form-textarea import-export-area" readonly>${JSON.stringify(this.menu, null, 2)}</textarea>
-          </div>
-          <div style="display: flex; gap: 8px;">
-            <button class="btn btn-secondary" onclick="MenuBuilder.copyExport()">
-              Copy to Clipboard
-            </button>
-            <button class="btn btn-primary" onclick="MenuBuilder.downloadExport()">
-              Download JSON
-            </button>
-          </div>
-        `;
-        this.showModal();
-      },
-
-      // Copy export
-      copyExport() {
-        const textarea = document.getElementById('exportData');
-        textarea.select();
-        document.execCommand('copy');
-        this.toast('Copied to clipboard', 'success');
-      },
-
-      // Download export
-      downloadExport() {
-        const data = document.getElementById('exportData').value;
-        const blob = new Blob([data], { type: 'application/json' });
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = 'menu-export.json';
-        a.click();
-        URL.revokeObjectURL(url);
-      },
-
-      // Show outline modal - full menu in hierarchical text format
-      showOutlineModal() {
-        document.getElementById('modalTitle').textContent = 'Menu Outline';
-
-        let outline = '';
-        const categories = this.menu.categories || [];
-
-        if (categories.length === 0) {
-          outline = '<div style="color: var(--gray-500); text-align: center; padding: 40px;">No menu items yet</div>';
-        } else {
-          outline = '<div class="menu-outline">';
-
-          for (const cat of categories) {
-            outline += `<div class="outline-category">${this.escapeHtml(cat.name)}</div>`;
-
-            const items = cat.items || [];
-            for (const item of items) {
-              const itemPrice = item.price ? `$${parseFloat(item.price).toFixed(2)}` : '';
-              outline += `<div class="outline-item">${this.escapeHtml(item.name)}${itemPrice ? ' <span class="outline-price">' + itemPrice + '</span>' : ''}</div>`;
-
-              // Render modifiers recursively
-              outline += this.renderOutlineModifiers(item.modifiers || [], 2);
-            }
-          }
-
-          outline += '</div>';
-        }
-
-        document.getElementById('modalBody').innerHTML = `
-          <style>
-            .menu-outline {
-              font-family: monospace;
-              font-size: 13px;
-              line-height: 1.6;
-              max-height: 60vh;
-              overflow-y: auto;
-              padding: 16px;
-              background: var(--bg-secondary);
-              border-radius: 8px;
-            }
-            .outline-category {
-              font-weight: bold;
-              font-size: 15px;
-              color: var(--primary);
-              margin-top: 16px;
-              margin-bottom: 4px;
-              text-transform: uppercase;
-            }
-            .outline-category:first-child {
-              margin-top: 0;
-            }
-            .outline-item {
-              padding-left: 20px;
-              color: var(--text-primary);
-            }
-            .outline-modifier {
-              color: var(--text-muted);
-            }
-            .outline-price {
-              color: var(--success);
-            }
-            .outline-modifier .outline-price {
-              color: var(--warning);
-            }
-          </style>
-          ${outline}
-        `;
-        this.showModal();
-      },
-
-      // Helper to render modifiers recursively for outline
-      renderOutlineModifiers(modifiers, depth) {
-        if (!modifiers || modifiers.length === 0) return '';
-
-        let html = '';
-        const indent = '\u00A0\u00A0\u00A0\u00A0'.repeat(depth); // non-breaking spaces for indent
-
-        for (const mod of modifiers) {
-          const modPrice = mod.price ? `+$${parseFloat(mod.price).toFixed(2)}` : '';
-          html += `<div class="outline-modifier" style="padding-left: ${depth * 20}px;">${indent.substring(0, 4)}${this.escapeHtml(mod.name)}${modPrice ? ' <span class="outline-price">' + modPrice + '</span>' : ''}</div>`;
-
-          // Recurse into nested options
-          if (mod.options && mod.options.length > 0) {
-            html += this.renderOutlineModifiers(mod.options, depth + 1);
-          }
-        }
-
-        return html;
-      },
-
-      // Upload header image (1200x400)
-      uploadHeader() {
-        const input = document.createElement('input');
-        input.type = 'file';
-        input.accept = 'image/jpeg,image/png,image/gif,image/webp';
-        input.onchange = async (e) => {
-          const file = e.target.files[0];
-          if (!file) return;
-
-          // Validate file type
-          const validTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
-          if (!validTypes.includes(file.type)) {
-            this.toast('Please select a valid image (JPG, PNG, GIF, or WebP)', 'error');
-            return;
-          }
-
-          // Validate file size (max 5MB)
-          if (file.size > 5 * 1024 * 1024) {
-            this.toast('Image must be under 5MB', 'error');
-            return;
-          }
-
-          // Show loading toast
-          this.toast('Uploading header...', 'info');
-
-          try {
-            const formData = new FormData();
-            formData.append('header', file);
-            formData.append('BusinessID', this.config.businessId);
-
-            const response = await fetch(`${this.config.apiBaseUrl}/menu/uploadHeader.cfm`, {
-              method: 'POST',
-              body: formData,
-              credentials: 'include'
-            });
-
-            const data = await response.json();
-            if (data.OK) {
-              this.toast('Header uploaded successfully! Recommended size: 600x200 JPG', 'success');
-            } else {
-              this.toast(data.MESSAGE || 'Failed to upload header', 'error');
-            }
-          } catch (err) {
-            console.error('Header upload error:', err);
-            this.toast('Failed to upload header', 'error');
-          }
-        };
-        input.click();
-      },
-
-      // Show brand color picker modal
-      showBrandColorPicker() {
-        const currentColor = this.brandColor || '#1B4D3E';
-        document.getElementById('modalTitle').textContent = 'Brand Color';
-        document.getElementById('modalBody').innerHTML = `
-          <p style="margin-bottom: 16px; color: var(--text-muted);">
-            This color is used for the category bar gradients in the customer app.
-          </p>
-          <div style="display: flex; align-items: center; gap: 16px; margin-bottom: 16px;">
-            <input type="color" id="brandColorInput" value="${currentColor}"
-              style="width: 60px; height: 40px; border: none; cursor: pointer; border-radius: 4px;">
-            <input type="text" id="brandColorHex" value="${currentColor}"
-              style="width: 100px; padding: 8px; border: 1px solid var(--border); border-radius: 4px; font-family: monospace;"
-              pattern="^#[0-9A-Fa-f]{6}$" maxlength="7">
-            <div id="brandColorPreview" style="flex: 1; height: 40px; border-radius: 4px; background: linear-gradient(to bottom, ${currentColor}44, ${currentColor}00, ${currentColor}66);"></div>
-          </div>
-          <div style="display: flex; gap: 8px; flex-wrap: wrap; margin-bottom: 16px;">
-            <button type="button" class="color-preset" data-color="#1B4D3E" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #1B4D3E;" title="Forest Green (Default)"></button>
-            <button type="button" class="color-preset" data-color="#2C3E50" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #2C3E50;" title="Midnight Blue"></button>
-            <button type="button" class="color-preset" data-color="#8B4513" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #8B4513;" title="Saddle Brown"></button>
-            <button type="button" class="color-preset" data-color="#800020" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #800020;" title="Burgundy"></button>
-            <button type="button" class="color-preset" data-color="#1A1A2E" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #1A1A2E;" title="Dark Navy"></button>
-            <button type="button" class="color-preset" data-color="#4A0E4E" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #4A0E4E;" title="Deep Purple"></button>
-            <button type="button" class="color-preset" data-color="#CC5500" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #CC5500;" title="Burnt Orange"></button>
-            <button type="button" class="color-preset" data-color="#355E3B" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #355E3B;" title="Hunter Green"></button>
-          </div>
-          <div style="display: flex; gap: 8px; justify-content: flex-end;">
-            <button type="button" class="btn btn-secondary" onclick="MenuBuilder.closeModal()">Cancel</button>
-            <button type="button" class="btn btn-primary" onclick="MenuBuilder.saveBrandColor()">Save Color</button>
-          </div>
-        `;
-        this.showModal();
-
-        // Wire up color picker sync
-        const colorInput = document.getElementById('brandColorInput');
-        const hexInput = document.getElementById('brandColorHex');
-        const preview = document.getElementById('brandColorPreview');
-
-        const updatePreview = (color) => {
-          preview.style.background = `linear-gradient(to bottom, ${color}44, ${color}00, ${color}66)`;
-        };
-
-        colorInput.addEventListener('input', (e) => {
-          hexInput.value = e.target.value.toUpperCase();
-          updatePreview(e.target.value);
-        });
-
-        hexInput.addEventListener('input', (e) => {
-          let val = e.target.value;
-          if (!val.startsWith('#')) val = '#' + val;
-          if (/^#[0-9A-Fa-f]{6}$/.test(val)) {
-            colorInput.value = val;
-            updatePreview(val);
-          }
-        });
-
-        // Preset buttons
-        document.querySelectorAll('.color-preset').forEach(btn => {
-          btn.addEventListener('click', () => {
-            const color = btn.dataset.color;
-            colorInput.value = color;
-            hexInput.value = color;
-            updatePreview(color);
-          });
-        });
-      },
-
-      // Save brand color
-      async saveBrandColor() {
-        const color = document.getElementById('brandColorHex').value.toUpperCase();
-        if (!/^#[0-9A-Fa-f]{6}$/.test(color)) {
-          this.toast('Invalid color format. Use #RRGGBB', 'error');
-          return;
-        }
-
-        try {
-          const response = await fetch(`${this.config.apiBaseUrl}/businesses/saveBrandColor.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ BusinessID: this.config.businessId, BrandColor: color })
-          });
-          const data = await response.json();
-          if (data.OK) {
-            this.brandColor = color;
-            document.getElementById('brandColorSwatch').style.background = color;
-            this.closeModal();
-            this.toast('Brand color saved!', 'success');
-          } else {
-            this.toast(data.MESSAGE || 'Failed to save color', 'error');
-          }
-        } catch (err) {
-          console.error('Save brand color error:', err);
-          this.toast('Failed to save color', 'error');
-        }
-      },
-
-      // Load menu from API
-      async loadMenu(menuId = null) {
-        try {
-          // Use provided menuId or current selected
-          const loadMenuId = menuId !== null ? menuId : this.selectedMenuId;
-          console.log('[MenuBuilder] Loading menu for BusinessID:', this.config.businessId, 'MenuID:', loadMenuId);
-
-          const payload = { BusinessID: this.config.businessId };
-          if (loadMenuId > 0) {
-            payload.MenuID = loadMenuId;
-          }
-
-          const response = await fetch(`${this.config.apiBaseUrl}/menu/getForBuilder.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(payload)
-          });
-          console.log('[MenuBuilder] Response status:', response.status);
-          const data = await response.json();
-          console.log('[MenuBuilder] Response data:', data);
-          console.log('[MenuBuilder] CATEGORY_COUNT:', data.CATEGORY_COUNT);
-          console.log('[MenuBuilder] ITEM_COUNT:', data.ITEM_COUNT);
-          if (data.OK && data.MENU) {
-            this.menu = data.MENU;
-            console.log('[MenuBuilder] Menu categories:', this.menu.categories?.length || 0);
-
-            // Store menus list and update selector
-            this.menus = data.MENUS || [];
-            this.selectedMenuId = data.SELECTED_MENU_ID || 0;
-            this.updateMenuSelector();
-
-            // Store templates from API (default to empty array if not provided)
-            this.templates = data.TEMPLATES || [];
-            // Load brand color if set
-            if (data.BRANDCOLOR && data.BRANDCOLOR.length > 0) {
-              this.brandColor = data.BRANDCOLOR;
-              const swatch = document.getElementById('brandColorSwatch');
-              if (swatch) swatch.style.background = data.BRANDCOLOR;
-            }
-            this.renderTemplateLibrary();
-            this.render();
-          } else {
-            console.log('[MenuBuilder] No MENU in response or OK=false');
-            // Still clear the loading message
-            this.templates = [];
-            this.menus = data.MENUS || [];
-            this.updateMenuSelector();
-            this.renderTemplateLibrary();
-          }
-        } catch (err) {
-          console.error('[MenuBuilder] Error loading menu:', err);
-          // Clear loading message on error
-          this.templates = [];
-          this.renderTemplateLibrary();
-        }
-      },
-
-      // Update menu selector dropdown
-      updateMenuSelector() {
-        const selector = document.getElementById('menuSelector');
-        if (!selector) return;
-
-        let options = '<option value="0">All Menus</option>';
-        for (const menu of this.menus) {
-          const selected = menu.MenuID === this.selectedMenuId ? 'selected' : '';
-          options += `<option value="${menu.MenuID}" ${selected}>${this.escapeHtml(menu.MenuName)}</option>`;
-        }
-        selector.innerHTML = options;
-      },
-
-      // Handle menu selection change
-      async onMenuSelect(menuId) {
-        this.selectedMenuId = parseInt(menuId) || 0;
-        await this.loadMenu(this.selectedMenuId);
-      },
-
-      // Show menu manager modal
-      showMenuManager() {
-        const content = `
-          <div style="display: flex; flex-direction: column; gap: 16px;">
-            <div style="display: flex; justify-content: space-between; align-items: center;">
-              <h4 style="margin: 0;">Your Menus</h4>
-              <button class="btn btn-sm btn-primary" onclick="MenuBuilder.showCreateMenuForm()">+ Add Menu</button>
-            </div>
-            <div id="menuManagerList" style="display: flex; flex-direction: column; gap: 8px;">
-              ${this.menus.length === 0 ? '<p style="color: var(--gray-500); text-align: center;">No menus created yet. Click "Add Menu" to create one.</p>' : ''}
-              ${this.menus.map(menu => `
-                <div style="display: flex; align-items: center; gap: 12px; padding: 12px; background: var(--gray-50); border-radius: 8px;">
-                  <div style="flex: 1;">
-                    <div style="font-weight: 600;">${this.escapeHtml(menu.MenuName)}</div>
-                    <div style="font-size: 12px; color: var(--gray-500);">
-                      ${menu.MenuStartTime && menu.MenuEndTime ? `${menu.MenuStartTime} - ${menu.MenuEndTime}` : 'All day'}
-                      · ${this.formatDaysActive(menu.MenuDaysActive)}
-                    </div>
-                  </div>
-                  <button class="btn btn-sm btn-secondary" onclick="MenuBuilder.editMenu(${menu.MenuID})">Edit</button>
-                  <button class="btn btn-sm btn-danger" onclick="MenuBuilder.deleteMenu(${menu.MenuID})">Delete</button>
-                </div>
-              `).join('')}
-            </div>
-            <div id="menuFormContainer" style="display: none; padding: 16px; background: var(--gray-50); border-radius: 8px;">
-              <h4 id="menuFormTitle" style="margin: 0 0 16px 0;">Create Menu</h4>
-              <input type="hidden" id="editMenuId" value="0">
-              <div class="property-field">
-                <label>Menu Name</label>
-                <input type="text" id="menuNameInput" placeholder="e.g., Lunch Menu, Happy Hour">
-              </div>
-              <div class="property-field">
-                <label>Description (optional)</label>
-                <input type="text" id="menuDescInput" placeholder="Brief description">
-              </div>
-              <div style="display: flex; gap: 12px;">
-                <div class="property-field" style="flex: 1;">
-                  <label>Start Time</label>
-                  <input type="time" id="menuStartInput">
-                </div>
-                <div class="property-field" style="flex: 1;">
-                  <label>End Time</label>
-                  <input type="time" id="menuEndInput">
-                </div>
-              </div>
-              <div class="property-field">
-                <label>Active Days</label>
-                <div style="display: flex; flex-wrap: wrap; gap: 8px;">
-                  ${['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'].map((day, i) => `
-                    <label style="display: flex; align-items: center; gap: 4px; cursor: pointer;">
-                      <input type="checkbox" class="menuDayCheck" data-day="${1 << i}" checked>
-                      ${day}
-                    </label>
-                  `).join('')}
-                </div>
-              </div>
-              <div style="display: flex; gap: 8px; margin-top: 16px;">
-                <button class="btn btn-primary" onclick="MenuBuilder.saveMenuForm()">Save</button>
-                <button class="btn btn-secondary" onclick="MenuBuilder.cancelMenuForm()">Cancel</button>
-              </div>
-            </div>
-          </div>
-        `;
-        document.getElementById('modalTitle').textContent = 'Manage Menus';
-        document.getElementById('modalBody').innerHTML = content;
-        this.showModal();
-      },
-
-      // Format days active bitmask to readable string
-      formatDaysActive(bitmask) {
-        if (bitmask === 127) return 'Every day';
-        const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-        const active = [];
-        for (let i = 0; i < 7; i++) {
-          if (bitmask & (1 << i)) active.push(days[i]);
-        }
-        return active.join(', ') || 'No days';
-      },
-
-      showCreateMenuForm() {
-        document.getElementById('menuFormContainer').style.display = 'block';
-        document.getElementById('menuFormTitle').textContent = 'Create Menu';
-        document.getElementById('editMenuId').value = '0';
-        document.getElementById('menuNameInput').value = '';
-        document.getElementById('menuDescInput').value = '';
-        document.getElementById('menuStartInput').value = '';
-        document.getElementById('menuEndInput').value = '';
-        document.querySelectorAll('.menuDayCheck').forEach(cb => cb.checked = true);
-      },
-
-      cancelMenuForm() {
-        document.getElementById('menuFormContainer').style.display = 'none';
-      },
-
-      async editMenu(menuId) {
-        const menu = this.menus.find(m => m.MenuID === menuId);
-        if (!menu) return;
-
-        document.getElementById('menuFormContainer').style.display = 'block';
-        document.getElementById('menuFormTitle').textContent = 'Edit Menu';
-        document.getElementById('editMenuId').value = menuId;
-        document.getElementById('menuNameInput').value = menu.MenuName;
-        document.getElementById('menuDescInput').value = menu.MenuDescription || '';
-        document.getElementById('menuStartInput').value = menu.MenuStartTime || '';
-        document.getElementById('menuEndInput').value = menu.MenuEndTime || '';
-
-        document.querySelectorAll('.menuDayCheck').forEach(cb => {
-          const day = parseInt(cb.dataset.day);
-          cb.checked = (menu.MenuDaysActive & day) !== 0;
-        });
-      },
-
-      async saveMenuForm() {
-        const menuId = parseInt(document.getElementById('editMenuId').value) || 0;
-        const menuName = document.getElementById('menuNameInput').value.trim();
-        const menuDesc = document.getElementById('menuDescInput').value.trim();
-        const menuStart = document.getElementById('menuStartInput').value;
-        const menuEnd = document.getElementById('menuEndInput').value;
-
-        let daysActive = 0;
-        document.querySelectorAll('.menuDayCheck').forEach(cb => {
-          if (cb.checked) daysActive |= parseInt(cb.dataset.day);
-        });
-
-        if (!menuName) {
-          this.toast('Menu name is required', 'error');
-          return;
-        }
-
-        try {
-          const response = await fetch(`${this.config.apiBaseUrl}/menu/menus.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              BusinessID: this.config.businessId,
-              action: 'save',
-              MenuID: menuId,
-              MenuName: menuName,
-              MenuDescription: menuDesc,
-              MenuStartTime: menuStart,
-              MenuEndTime: menuEnd,
-              MenuDaysActive: daysActive
-            })
-          });
-          const data = await response.json();
-          if (data.OK) {
-            if (data.ACTION === 'created') {
-              // New menu — store context and redirect to wizard to populate it
-              sessionStorage.setItem('payfrit_wizard_menu', JSON.stringify({
-                businessId: this.config.businessId,
-                menuId: data.MenuID,
-                menuName: menuName
-              }));
-              window.location.href = `${BASE_PATH}/portal/setup-wizard.html`;
-              return;
-            }
-            this.toast(`Menu ${data.ACTION}!`, 'success');
-            this.closeModal();
-            await this.loadMenu();
-          } else {
-            this.toast(data.MESSAGE || 'Failed to save menu', 'error');
-          }
-        } catch (err) {
-          this.toast('Error saving menu', 'error');
-        }
-      },
-
-      async deleteMenu(menuId) {
-        if (!confirm('Are you sure you want to delete this menu? Categories in this menu will become unassigned.')) {
-          return;
-        }
-
-        try {
-          const response = await fetch(`${this.config.apiBaseUrl}/menu/menus.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              BusinessID: this.config.businessId,
-              action: 'delete',
-              MenuID: menuId
-            })
-          });
-          const data = await response.json();
-          if (data.OK) {
-            this.toast('Menu deleted', 'success');
-            this.closeModal();
-            await this.loadMenu();
-          } else {
-            this.toast(data.MESSAGE || 'Failed to delete menu', 'error');
-          }
-        } catch (err) {
-          this.toast('Error deleting menu', 'error');
-        }
-      },
-
-      // Render template library in sidebar
-      renderTemplateLibrary() {
-        const container = document.getElementById('templateLibrary');
-        if (!container || !this.templates) return;
-
-        if (this.templates.length === 0) {
-          container.innerHTML = '<div style="color: var(--gray-500); font-size: 13px; padding: 8px;">No templates yet</div>';
-          return;
-        }
-
-        container.innerHTML = this.templates.map(tmpl => `
-          <div class="palette-item template-item" draggable="true" data-type="template" data-template-id="${tmpl.dbId}">
-            <div class="icon">📋</div>
-            <div>
-              <div class="label">${this.escapeHtml(tmpl.name)}</div>
-              <div class="hint">${tmpl.options ? tmpl.options.length : 0} options</div>
-            </div>
-          </div>
-        `).join('');
-
-        // Update template count stat
-        const statEl = document.getElementById('statTemplates');
-        if (statEl) statEl.textContent = this.templates.length;
-      },
-
-      // Save menu to API
-      async saveMenu() {
-        try {
-          console.log('[MenuBuilder] Saving menu...');
-          console.log('[MenuBuilder] BusinessID:', this.config.businessId);
-
-          // Debug: Find and log the specific option we're testing
-          for (const cat of this.menu.categories) {
-            for (const item of cat.items) {
-              for (const mod of (item.modifiers || [])) {
-                if (mod.name === 'Select Drink') {
-                  console.log('[MenuBuilder] Select Drink modifier at save time:', JSON.stringify(mod, null, 2));
-                }
-              }
-            }
-          }
-          console.log('[MenuBuilder] Menu data:', JSON.stringify(this.menu, null, 2));
-
-          // Deep clone menu and strip base64 data URLs to avoid huge payloads
-          const menuClone = JSON.parse(JSON.stringify(this.menu));
-          for (const cat of menuClone.categories) {
-            for (const item of (cat.items || [])) {
-              if (item.imageUrl && item.imageUrl.startsWith('data:')) {
-                item.imageUrl = null;
-              }
-            }
-          }
-
-          const payload = {
-            BusinessID: this.config.businessId,
-            Menu: menuClone
-          };
-          console.log('[MenuBuilder] Full payload:', JSON.stringify(payload, null, 2));
-
-          const response = await fetch(`${this.config.apiBaseUrl}/menu/saveFromBuilder.cfm`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(payload)
-          });
-
-          console.log('[MenuBuilder] Response status:', response.status);
-          const responseText = await response.text();
-          console.log('[MenuBuilder] Raw response:', responseText);
-
-          let data;
-          try {
-            data = JSON.parse(responseText);
-          } catch (parseErr) {
-            console.error('[MenuBuilder] Failed to parse response as JSON:', parseErr);
-            this.toast('Server returned invalid response', 'error');
-            return;
-          }
-
-          console.log('[MenuBuilder] Parsed response:', data);
-
-          if (data.OK) {
-            this.toast('Menu saved successfully!', 'success');
-            // Reload menu to get updated dbIds
-            await this.loadMenu();
-          } else {
-            console.error('[MenuBuilder] Save failed:', data.ERROR, data.DETAIL);
-            this.toast(data.ERROR || 'Failed to save', 'error');
-          }
-        } catch (err) {
-          console.error('[MenuBuilder] Save error:', err);
-          this.toast('Error saving menu: ' + err.message, 'error');
-        }
-      },
-
-      // Recursive function to render modifiers/options at any depth
-      renderModifiers(modifiers, parentItemId, depth) {
-        if (!modifiers || modifiers.length === 0) return '';
-
-        const indent = 16 + (depth * 16); // Progressive indentation
-        const iconSize = Math.max(24, 32 - (depth * 4)); // Smaller icons for deeper levels
-        const icons = ['⚙️', '🔘', '◉', '•']; // Different icons for different levels
-        const icon = icons[Math.min(depth - 1, icons.length - 1)];
-
-        return modifiers.map(mod => {
-          const hasOptions = mod.options && mod.options.length > 0;
-          const modExpanded = this.expandedModifierIds.has(mod.id);
-          return `
-            <div class="item-card modifier depth-${depth} ${modExpanded ? 'expanded' : ''}"
-              data-modifier-id="${mod.id}" data-parent-id="${parentItemId}" data-depth="${depth}"
-              draggable="true"
-              style="margin-left: ${indent}px;"
-              onclick="event.stopPropagation(); MenuBuilder.selectOption('${parentItemId}', '${mod.id}', ${depth})">
-              ${hasOptions ? `
-              <div class="item-toggle ${modExpanded ? 'expanded' : ''}" onclick="event.stopPropagation(); MenuBuilder.toggleModifier('${mod.id}')">
-                <svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                  <path d="M9 18l6-6-6-6"/>
-                </svg>
-              </div>
-              ` : ''}
-              <div class="drag-handle">
-                <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
-                  <circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/>
-                  <circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/>
-                  <circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/>
-                </svg>
-              </div>
-              <div class="item-image" style="width: ${iconSize}px; height: ${iconSize}px; font-size: ${iconSize/2}px;">${icon}</div>
-              <div class="item-info" onclick="event.stopPropagation(); ${hasOptions ? `MenuBuilder.toggleModifier('${mod.id}')` : `MenuBuilder.selectOption('${parentItemId}', '${mod.id}', ${depth})`}" style="cursor: pointer;">
-                <div class="item-name">${this.escapeHtml(mod.name)}</div>
-                <div class="item-meta">
-                  ${mod.price > 0 ? `<span>+$${mod.price.toFixed(2)}</span>` : ''}
-                  ${mod.isDefault ? '<span class="item-type-badge">Default</span>' : ''}
-                  ${mod.requiresSelection ? '<span class="item-type-badge" style="background: #dc3545; color: white;">Required</span>' : ''}
-                  ${mod.maxSelections > 0 ? `<span class="item-type-badge">Max ${mod.maxSelections}</span>` : ''}
-                  ${hasOptions ? `<span class="item-type-badge">${mod.options.length} options</span>` : ''}
-                </div>
-              </div>
-              <div class="item-actions">
-                <button onclick="event.stopPropagation(); MenuBuilder.deleteOption('${parentItemId}', '${mod.id}', ${depth})" title="Delete">
-                  <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                    <path d="M18 6L6 18M6 6l12 12"/>
-                  </svg>
-                </button>
-              </div>
-            </div>
-            ${hasOptions && modExpanded ? this.renderModifiers(mod.options, mod.id, depth + 1) : ''}
-          `;
-        }).join('');
-      },
-
-      // Render menu structure
-      // Render menu structure
-      render() {
-        const container = document.getElementById('menuStructure');
-
-        if (this.menu.categories.length === 0) {
-          container.innerHTML = `
-            <div class="empty-canvas" id="emptyCanvas">
-              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
-                <path d="M3 6h18M3 12h18M3 18h18"/>
-              </svg>
-              <h3>Start Building Your Menu</h3>
-              <p>Drag categories and items from the left panel, or click the buttons above to add them.</p>
-            </div>
-          `;
-          return;
-        }
-
-        container.innerHTML = this.menu.categories.map(category => {
-          const isExpanded = this.expandedCategoryId === category.id;
-          return `
-          <div class="category-card" data-category-id="${category.id}" draggable="true"
-            onclick="MenuBuilder.selectElement(this)">
-            <div class="category-header">
-              <div class="category-toggle ${isExpanded ? 'expanded' : ''}" onclick="event.stopPropagation(); MenuBuilder.toggleCategory('${category.id}')">
-                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                  <path d="M9 18l6-6-6-6"/>
-                </svg>
-              </div>
-              <div class="drag-handle">
-                <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
-                  <circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/>
-                  <circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/>
-                  <circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/>
-                </svg>
-              </div>
-              <div class="category-info" onclick="event.stopPropagation(); MenuBuilder.toggleCategory('${category.id}')" style="cursor: pointer;">
-                <div class="category-name">${this.escapeHtml(category.name)}</div>
-                <div class="category-count">${category.items.length} items</div>
-              </div>
-              <div class="category-actions">
-                <button onclick="event.stopPropagation(); MenuBuilder.addItem('${category.id}')" title="Add Item">
-                  <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                    <path d="M12 5v14M5 12h14"/>
-                  </svg>
-                </button>
-                <button class="danger" onclick="event.stopPropagation(); MenuBuilder.deleteCategory('${category.id}')" title="Delete">
-                  <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                    <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/>
-                  </svg>
-                </button>
-              </div>
-            </div>
-            <div class="items-list ${isExpanded ? '' : 'collapsed'}">
-              ${category.items.length === 0 ? `
-                <div class="item-drop-zone">Drag items here or click + to add</div>
-` : category.items.map(item => {
-                const itemExpanded = this.expandedItemId === item.id;
-                const hasModifiers = item.modifiers && item.modifiers.length > 0;
-                return `
-                <div class="item-card ${itemExpanded ? 'expanded' : ''}" data-item-id="${item.id}" draggable="true"
-                  onclick="event.stopPropagation(); MenuBuilder.selectElement(this)">
-                  ${hasModifiers ? `
-                  <div class="item-toggle ${itemExpanded ? 'expanded' : ''}" onclick="event.stopPropagation(); MenuBuilder.toggleItem('${item.id}')">
-                    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                      <path d="M9 18l6-6-6-6"/>
-                    </svg>
-                  </div>
-                  ` : ''}
-                  <div class="drag-handle">
-                    <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
-                      <circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/>
-                      <circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/>
-                      <circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/>
-                    </svg>
-                  </div>
-                  <div class="item-image">
-                    ${item.imageUrl ? `<img src="${item.imageUrl}" alt="">` : '🍽️'}
-                    ${item.photoTaskId ? `
-                      <div class="photo-badge ${item.imageUrl ? '' : 'missing'}" title="${item.imageUrl ? 'Has photo' : 'Photo task pending'}">
-                        <svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                          <rect x="3" y="3" width="18" height="18" rx="2"/>
-                          <circle cx="8.5" cy="8.5" r="1.5"/>
-                          <path d="M21 15l-5-5L5 21"/>
-                        </svg>
-                      </div>
-                    ` : ''}
-                  </div>
-                  <div class="item-info" onclick="event.stopPropagation(); ${hasModifiers ? `MenuBuilder.toggleItem('${item.id}')` : `MenuBuilder.selectItem('${item.id}')`}" style="cursor: pointer;">
-                    <div class="item-name">${this.escapeHtml(item.name)}</div>
-                    <div class="item-meta">
-                      <span class="item-price">$${(item.price || 0).toFixed(2)}</span>
-                      ${hasModifiers ? `<span>${item.modifiers.length} modifiers</span>` : ''}
-                    </div>
-                  </div>
-                  <div class="item-actions">
-                    <button onclick="event.stopPropagation(); MenuBuilder.cloneItem('${category.id}', '${item.id}')" title="Clone">
-                      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                        <rect x="9" y="9" width="13" height="13" rx="2"/>
-                        <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/>
-                      </svg>
-                    </button>
-                    <button class="danger" onclick="event.stopPropagation(); MenuBuilder.deleteItem('${category.id}', '${item.id}')" title="Delete">
-                      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                        <path d="M18 6L6 18M6 6l12 12"/>
-                      </svg>
-                    </button>
-                  </div>
-                </div>
-                ${itemExpanded ? this.renderModifiers(item.modifiers, item.id, 1) : ''}
-              `}).join('')}
-            </div>
-          </div>
-        `}).join('');
-
-        // Update stats
-        let totalItems = 0;
-        let missingPhotos = 0;
-        this.menu.categories.forEach(cat => {
-          totalItems += cat.items.length;
-          cat.items.forEach(item => {
-            if (!item.imageUrl) missingPhotos++;
-          });
-        });
-
-        document.getElementById('statCategories').textContent = this.menu.categories.length;
-        document.getElementById('statItems').textContent = totalItems;
-        document.getElementById('statPhotosMissing').textContent = missingPhotos;
-
-        // Re-setup drag handlers for new elements
-        this.setupItemDragHandlers();
-      },
-
-      // Setup drag handlers for items
-      setupItemDragHandlers() {
-        document.querySelectorAll('.category-card').forEach(card => {
-          card.addEventListener('dragstart', (e) => {
-            e.dataTransfer.setData('categoryId', card.dataset.categoryId);
-            e.dataTransfer.setData('source', 'canvas');
-            card.classList.add('dragging');
-          });
-
-          card.addEventListener('dragend', () => {
-            card.classList.remove('dragging');
-            document.querySelectorAll('.drop-before, .drop-after').forEach(el => {
-              el.classList.remove('drop-before', 'drop-after');
-            });
-          });
-
-          card.addEventListener('dragover', (e) => {
-            e.preventDefault();
-            const isDraggingCategory = e.dataTransfer.types.includes('categoryid');
-            const isDraggingItem = e.dataTransfer.types.includes('itemid');
-            
-            if (isDraggingItem) {
-              card.classList.add('drag-over');
-            } else if (isDraggingCategory && !card.classList.contains('dragging')) {
-              // Category reordering - show drop indicator
-              const rect = card.getBoundingClientRect();
-              const midpoint = rect.top + rect.height / 2;
-              card.classList.remove('drop-before', 'drop-after', 'drag-over');
-              if (e.clientY < midpoint) {
-                card.classList.add('drop-before');
-              } else {
-                card.classList.add('drop-after');
-              }
-            }
-          });
-
-          card.addEventListener('dragleave', () => {
-            card.classList.remove('drag-over', 'drop-before', 'drop-after');
-          });
-
-          card.addEventListener('drop', (e) => {
-            e.preventDefault();
-            card.classList.remove('drag-over', 'drop-before', 'drop-after');
-            
-            const itemId = e.dataTransfer.getData('itemId');
-            const draggedCategoryId = e.dataTransfer.getData('categoryId');
-            const targetCategoryId = card.dataset.categoryId;
-            
-            if (itemId) {
-              // Moving item to category
-              this.moveItemToCategory(itemId, targetCategoryId);
-            } else if (draggedCategoryId && draggedCategoryId !== targetCategoryId) {
-              // Reordering categories
-              const rect = card.getBoundingClientRect();
-              const midpoint = rect.top + rect.height / 2;
-              const position = e.clientY < midpoint ? 'before' : 'after';
-              this.reorderCategory(draggedCategoryId, targetCategoryId, position);
-            }
-          });
-        });
-
-        document.querySelectorAll('.item-card:not(.modifier)').forEach(card => {
-          card.addEventListener('dragstart', (e) => {
-            e.stopPropagation();
-            e.dataTransfer.setData('itemId', card.dataset.itemId);
-            e.dataTransfer.setData('source', 'canvas');
-            card.classList.add('dragging');
-          });
-
-          card.addEventListener('dragend', () => {
-            card.classList.remove('dragging');
-            // Remove all drop indicators
-            document.querySelectorAll('.drop-before, .drop-after').forEach(el => {
-              el.classList.remove('drop-before', 'drop-after');
-            });
-          });
-
-          card.addEventListener('dragover', (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            const draggedItemId = e.dataTransfer.types.includes('itemid');
-            if (draggedItemId && !card.classList.contains('dragging')) {
-              // Determine if dropping above or below based on mouse position
-              const rect = card.getBoundingClientRect();
-              const midpoint = rect.top + rect.height / 2;
-              card.classList.remove('drop-before', 'drop-after');
-              if (e.clientY < midpoint) {
-                card.classList.add('drop-before');
-              } else {
-                card.classList.add('drop-after');
-              }
-            }
-          });
-
-          card.addEventListener('dragleave', () => {
-            card.classList.remove('drop-before', 'drop-after');
-          });
-
-          card.addEventListener('drop', (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            const draggedItemId = e.dataTransfer.getData('itemId');
-            const targetItemId = card.dataset.itemId;
-            if (draggedItemId && targetItemId && draggedItemId !== targetItemId) {
-              const position = card.classList.contains('drop-before') ? 'before' : 'after';
-              this.reorderItemInCategory(draggedItemId, targetItemId, position);
-            }
-            card.classList.remove('drop-before', 'drop-after');
-          });
-        });
-
-        // Modifier drag handlers
-        document.querySelectorAll('.item-card.modifier').forEach(card => {
-          card.addEventListener('dragstart', (e) => {
-            e.stopPropagation();
-            e.dataTransfer.setData('modifierId', card.dataset.modifierId);
-            e.dataTransfer.setData('parentId', card.dataset.parentId);
-            e.dataTransfer.setData('depth', card.dataset.depth);
-            e.dataTransfer.setData('source', 'modifier');
-            // Default is copy, hold Shift for move
-            const isMove = e.shiftKey;
-            e.dataTransfer.setData('isMove', isMove ? 'true' : 'false');
-            e.dataTransfer.effectAllowed = isMove ? 'move' : 'copy';
-            card.classList.add('dragging');
-          });
-
-          card.addEventListener('dragend', () => {
-            card.classList.remove('dragging');
-            document.querySelectorAll('.drop-before, .drop-after, .drag-over').forEach(el => {
-              el.classList.remove('drop-before', 'drop-after', 'drag-over');
-            });
-          });
-
-          card.addEventListener('dragover', (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            const isDraggingModifier = e.dataTransfer.types.includes('modifierid');
-            if (isDraggingModifier && !card.classList.contains('dragging')) {
-              const rect = card.getBoundingClientRect();
-              const midpoint = rect.top + rect.height / 2;
-              card.classList.remove('drop-before', 'drop-after');
-              if (e.clientY < midpoint) {
-                card.classList.add('drop-before');
-              } else {
-                card.classList.add('drop-after');
-              }
-            }
-          });
-
-          card.addEventListener('dragleave', (e) => {
-            card.classList.remove('drop-before', 'drop-after');
-          });
-
-          card.addEventListener('drop', (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            const draggedModId = e.dataTransfer.getData('modifierId');
-            const draggedParentId = e.dataTransfer.getData('parentId');
-            const targetModId = card.dataset.modifierId;
-            const targetParentId = card.dataset.parentId;
-            const isMove = e.dataTransfer.getData('isMove') === 'true';
-
-            if (draggedModId && targetModId && draggedModId !== targetModId) {
-              const position = card.classList.contains('drop-before') ? 'before' : 'after';
-
-              if (isMove && draggedParentId === targetParentId) {
-                // Same parent + move = reorder
-                this.reorderModifier(draggedModId, targetModId, targetParentId, position);
-              } else if (isMove) {
-                // Different parent + move = move modifier
-                this.moveModifier(draggedModId, draggedParentId, targetModId, targetParentId, position);
-              } else {
-                // Copy (default)
-                this.copyModifier(draggedModId, draggedParentId, targetModId, targetParentId, position);
-              }
-            }
-            card.classList.remove('drop-before', 'drop-after');
-          });
-        });
-
-        // Allow dropping modifiers onto items (to add as top-level modifier)
-        document.querySelectorAll('.item-card:not(.modifier)').forEach(card => {
-          card.addEventListener('dragover', (e) => {
-            const isDraggingModifier = e.dataTransfer.types.includes('modifierid');
-            if (isDraggingModifier) {
-              e.preventDefault();
-              e.stopPropagation();
-              card.classList.add('drag-over');
-            }
-          });
-
-          card.addEventListener('dragleave', (e) => {
-            if (e.dataTransfer.types.includes('modifierid')) {
-              card.classList.remove('drag-over');
-            }
-          });
-
-          card.addEventListener('drop', (e) => {
-            const isDraggingModifier = e.dataTransfer.types.includes('modifierid');
-            if (isDraggingModifier) {
-              e.preventDefault();
-              e.stopPropagation();
-              const draggedModId = e.dataTransfer.getData('modifierId');
-              const draggedParentId = e.dataTransfer.getData('parentId');
-              const targetItemId = card.dataset.itemId;
-              const isMove = e.dataTransfer.getData('isMove') === 'true';
-
-              if (draggedModId && targetItemId) {
-                if (isMove) {
-                  this.moveModifierToItem(draggedModId, draggedParentId, targetItemId);
-                } else {
-                  this.copyModifierToItem(draggedModId, draggedParentId, targetItemId);
-                }
-              }
-              card.classList.remove('drag-over');
-            }
-          });
-        });
-      },
-
-      // Toggle category expanded/collapsed (accordion behavior)
-      toggleCategory(categoryId) {
-        if (this.expandedCategoryId === categoryId) {
-          this.expandedCategoryId = null;
-        } else {
-          this.expandedCategoryId = categoryId;
-          this.expandedItemId = null;
-          this.expandedModifierIds.clear();
-        }
-        this.render();
-      },
-
-      // Toggle item expanded/collapsed
-      toggleItem(itemId) {
-        if (this.expandedItemId === itemId) {
-          this.expandedItemId = null;
-        } else {
-          this.expandedItemId = itemId;
-          this.expandedModifierIds.clear();
-        }
-        this.render();
-      },
-
-      // Toggle modifier expanded/collapsed
-      toggleModifier(modifierId) {
-        if (this.expandedModifierIds.has(modifierId)) {
-          this.expandedModifierIds.delete(modifierId);
-        } else {
-          this.expandedModifierIds.add(modifierId);
-        }
-        this.render();
-      },
-
-      // Clone item
-      cloneItem(categoryId, itemId) {
-        this.saveState();
-        const category = this.menu.categories.find(c => c.id === categoryId);
-        if (category) {
-          const item = category.items.find(i => i.id === itemId);
-          if (item) {
-            const clone = JSON.parse(JSON.stringify(item));
-            clone.id = this.generateId();
-            clone.name = item.name + ' (Copy)';
-            clone.modifiers.forEach(mod => mod.id = this.generateId());
-            category.items.push(clone);
-            this.render();
-            this.toast('Item cloned', 'success');
-          }
-        }
-      },
-
-      // Show modal
-      showModal() {
-        document.getElementById('modalOverlay').classList.add('visible');
-      },
-
-      // Close modal
-      closeModal() {
-        document.getElementById('modalOverlay').classList.remove('visible');
-      },
-
-      // Toast
-      toast(message, type = 'info') {
-        const container = document.getElementById('toastContainer');
-        const toast = document.createElement('div');
-        toast.className = `toast ${type}`;
-        toast.textContent = message;
-        container.appendChild(toast);
-        setTimeout(() => toast.remove(), 3000);
-      },
-
-      // Escape HTML
-      escapeHtml(str) {
-        if (!str) return '';
-        return str.replace(/[&<>"']/g, (m) => ({
-          '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;'
-        })[m]);
-      }
-    };
-
-    // Initialize
-    document.addEventListener('DOMContentLoaded', () => MenuBuilder.init());
-  </script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Menu Builder - Payfrit</title>
+  <link rel="icon" type="image/svg+xml" href="favicon.svg">
+  <link rel="stylesheet" href="portal.css">
+  <style>
+    /* Menu Builder Specific Styles */
+    .builder-wrapper {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+    }
+
+    .builder-container {
+      display: flex;
+      flex: 1;
+      gap: 16px;
+      padding: 16px;
+      overflow: hidden;
+    }
+
+    /* Sidebar Panel */
+    .builder-sidebar {
+      width: 280px;
+      background: #fff;
+      border-radius: var(--radius);
+      box-shadow: var(--shadow);
+      padding: 16px;
+      display: flex;
+      flex-direction: column;
+      gap: 16px;
+      overflow-y: auto;
+    }
+
+    .builder-sidebar h3 {
+      margin: 0;
+      font-size: 14px;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      color: var(--gray-500);
+    }
+
+    /* Palette Items */
+    .palette-section {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+    }
+
+    .palette-item {
+      background: var(--gray-50);
+      border: 2px dashed var(--gray-200);
+      border-radius: 8px;
+      padding: 12px;
+      cursor: grab;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      transition: all 0.2s;
+    }
+
+    .palette-item:hover {
+      border-color: var(--primary);
+      background: rgba(99, 102, 241, 0.05);
+    }
+
+    .palette-item:active {
+      cursor: grabbing;
+    }
+
+    .palette-item .icon {
+      width: 32px;
+      height: 32px;
+      background: #fff;
+      border-radius: 6px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 16px;
+    }
+
+    .palette-item .label {
+      font-weight: 500;
+      color: var(--gray-800);
+    }
+
+    .palette-item .hint {
+      font-size: 12px;
+      color: var(--gray-500);
+    }
+
+    /* Main Canvas */
+    .builder-canvas {
+      flex: 1;
+      background: #fff;
+      border-radius: var(--radius);
+      box-shadow: var(--shadow);
+      padding: 16px;
+      overflow-y: auto;
+    }
+
+    .canvas-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16px;
+      padding-bottom: 16px;
+      border-bottom: 1px solid var(--gray-200);
+    }
+
+    .canvas-header h2 {
+      margin: 0;
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      color: var(--gray-900);
+    }
+
+    .canvas-actions {
+      display: flex;
+      gap: 8px;
+    }
+
+    /* Menu Structure */
+    .menu-structure {
+      display: flex;
+      flex-direction: column;
+      gap: 16px;
+      min-height: 400px;
+    }
+
+    .drop-zone {
+      border: 2px dashed var(--gray-200);
+      border-radius: 8px;
+      padding: 24px;
+      text-align: center;
+      color: var(--gray-500);
+      transition: all 0.2s;
+    }
+
+    .drop-zone.drag-over {
+      border-color: var(--primary);
+      background: rgba(99, 102, 241, 0.05);
+    }
+
+    .drop-zone.drag-over-error {
+      border-color: var(--danger);
+      background: rgba(239, 68, 68, 0.05);
+    }
+
+    /* Category Card */
+    .category-card {
+      background: var(--gray-50);
+      border-radius: 12px;
+      border: 2px solid var(--gray-200);
+      overflow: hidden;
+      transition: all 0.2s;
+    }
+
+    .category-card.dragging {
+      opacity: 0.5;
+      transform: scale(0.98);
+    }
+
+    .category-card.drag-over {
+      border-color: var(--primary);
+    }
+
+    .category-header {
+      display: flex;
+      align-items: center;
+      padding: 12px 16px;
+      background: #fff;
+      cursor: grab;
+      gap: 12px;
+    }
+
+    .category-header:active {
+      cursor: grabbing;
+    }
+
+    .drag-handle {
+      color: var(--gray-400);
+      display: flex;
+      align-items: center;
+    }
+
+    .category-info {
+      flex: 1;
+    }
+
+    .category-name {
+      font-weight: 600;
+      font-size: 16px;
+      color: var(--gray-900);
+    }
+
+    .category-count {
+      font-size: 12px;
+      color: var(--gray-500);
+    }
+
+    .category-actions {
+      display: flex;
+      gap: 4px;
+    }
+
+    .category-actions button {
+      background: transparent;
+      border: none;
+      color: var(--gray-400);
+      padding: 6px;
+      border-radius: 4px;
+      cursor: pointer;
+      transition: all 0.2s;
+    }
+
+    .category-actions button:hover {
+      background: var(--gray-100);
+      color: var(--gray-800);
+    }
+
+    .category-actions button.danger:hover {
+      color: var(--danger);
+    }
+
+    /* Items List */
+    .items-list {
+      padding: 12px;
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      min-height: 60px;
+      overflow: hidden;
+      transition: max-height 0.3s ease, padding 0.3s ease, opacity 0.3s ease;
+    }
+
+    .items-list.collapsed {
+      max-height: 0;
+      padding: 0 12px;
+      opacity: 0;
+      min-height: 0;
+    }
+
+    /* Chevron toggle */
+    .category-toggle {
+      width: 24px;
+      height: 24px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      transition: transform 0.3s ease;
+      color: var(--gray-400);
+    }
+
+    .category-toggle:hover {
+      color: var(--gray-800);
+    }
+
+    .category-toggle.expanded {
+      transform: rotate(90deg);
+    }
+
+    /* Item Toggle (for expanding modifiers) */
+    .item-toggle {
+      width: 20px;
+      height: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      transition: transform 0.3s ease;
+      color: var(--gray-400);
+      flex-shrink: 0;
+    }
+
+    .item-toggle:hover {
+      color: var(--gray-800);
+    }
+
+    .item-toggle.expanded {
+      transform: rotate(90deg);
+    }
+
+    .items-list.drag-over {
+      background: rgba(99, 102, 241, 0.02);
+    }
+
+    .item-drop-zone {
+      border: 2px dashed var(--gray-200);
+      border-radius: 6px;
+      padding: 16px;
+      text-align: center;
+      font-size: 13px;
+      color: var(--gray-500);
+    }
+
+    /* Item Card */
+    .item-card {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      padding: 10px 12px;
+      background: #fff;
+      border-radius: 8px;
+      border: 1px solid var(--gray-200);
+      cursor: grab;
+      transition: all 0.2s;
+    }
+
+    .item-card:active {
+      cursor: grabbing;
+    }
+
+    .item-card.dragging {
+      opacity: 0.5;
+    }
+
+    .item-card.drag-over {
+      border-color: var(--primary);
+      transform: translateY(2px);
+    }
+
+    /* Drop indicators for reordering */
+    .item-card.drop-before,
+    .category-card.drop-before {
+      position: relative;
+    }
+
+    .item-card.drop-before::before,
+    .category-card.drop-before::before {
+      content: '';
+      position: absolute;
+      top: -4px;
+      left: 0;
+      right: 0;
+      height: 4px;
+      background: var(--primary);
+      border-radius: 2px;
+    }
+
+    .item-card.drop-after,
+    .category-card.drop-after {
+      position: relative;
+    }
+
+    .item-card.drop-after::after,
+    .category-card.drop-after::after {
+      content: '';
+      position: absolute;
+      bottom: -4px;
+      left: 0;
+      right: 0;
+      height: 4px;
+      background: var(--primary);
+      border-radius: 2px;
+    }
+
+    .item-card.modifier {
+      margin-left: 24px;
+      background: var(--gray-50);
+      border-style: dashed;
+    }
+
+    .item-card.modifier .item-type-badge {
+      background: var(--warning);
+      color: #000;
+    }
+
+    .item-image {
+      width: 48px;
+      height: 48px;
+      background: var(--gray-100);
+      border-radius: 6px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 24px;
+      overflow: hidden;
+      position: relative;
+    }
+
+    .item-image img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    .item-image .photo-badge {
+      position: absolute;
+      bottom: 2px;
+      right: 2px;
+      width: 16px;
+      height: 16px;
+      background: var(--primary);
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .item-image .photo-badge.missing {
+      background: var(--warning);
+    }
+
+    .item-info {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .item-name {
+      font-weight: 500;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      color: var(--gray-800);
+    }
+
+    .item-meta {
+      display: flex;
+      gap: 8px;
+      font-size: 12px;
+      color: var(--gray-500);
+    }
+
+    .item-price {
+      color: var(--primary);
+      font-weight: 600;
+    }
+
+    .item-type-badge {
+      font-size: 10px;
+      padding: 2px 6px;
+      border-radius: 4px;
+      background: var(--gray-100);
+      text-transform: uppercase;
+      color: var(--gray-600);
+    }
+
+    .item-actions {
+      display: flex;
+      gap: 2px;
+    }
+
+    .item-actions button {
+      background: transparent;
+      border: none;
+      color: var(--gray-400);
+      padding: 4px;
+      border-radius: 4px;
+      cursor: pointer;
+      transition: all 0.2s;
+    }
+
+    .item-actions button:hover {
+      background: var(--gray-100);
+      color: var(--gray-800);
+    }
+
+    .item-actions button.danger:hover {
+      color: var(--danger);
+    }
+
+    /* Properties Panel */
+    .builder-properties {
+      width: 320px;
+      background: #fff;
+      border-radius: var(--radius);
+      box-shadow: var(--shadow);
+      padding: 16px;
+      display: flex;
+      flex-direction: column;
+      gap: 16px;
+      overflow-y: auto;
+    }
+
+    .properties-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+
+    .properties-header h3 {
+      margin: 0;
+      font-size: 14px;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      color: var(--gray-500);
+    }
+
+    .property-group {
+      display: flex;
+      flex-direction: column;
+      gap: 12px;
+    }
+
+    .property-group label {
+      font-size: 12px;
+      font-weight: 500;
+      color: var(--gray-500);
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+    }
+
+    .property-group input,
+    .property-group textarea,
+    .property-group select {
+      background: var(--gray-50);
+      border: 1px solid var(--gray-300);
+      border-radius: 6px;
+      padding: 10px 12px;
+      color: var(--gray-800);
+      font-size: 14px;
+    }
+
+    .property-group input:focus,
+    .property-group textarea:focus,
+    .property-group select:focus {
+      outline: none;
+      border-color: var(--primary);
+      box-shadow: 0 0 0 3px rgba(99, 102, 241, 0.1);
+    }
+
+    .property-row {
+      display: flex;
+      gap: 12px;
+    }
+
+    .property-row .property-group {
+      flex: 1;
+    }
+
+    /* Photo Task Section */
+    .photo-task-section {
+      background: var(--gray-50);
+      border-radius: 8px;
+      padding: 12px;
+    }
+
+    .photo-task-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 12px;
+    }
+
+    .photo-task-header h4 {
+      margin: 0;
+      font-size: 13px;
+      font-weight: 600;
+      color: var(--gray-800);
+    }
+
+    .photo-preview {
+      width: 100%;
+      aspect-ratio: 4/3;
+      background: #fff;
+      border-radius: 6px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--gray-400);
+      margin-bottom: 12px;
+      overflow: hidden;
+      border: 1px solid var(--gray-200);
+    }
+
+    .photo-preview img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    .photo-actions {
+      display: flex;
+      gap: 8px;
+    }
+
+    .photo-actions button {
+      flex: 1;
+    }
+
+    /* Task Badge */
+    .task-badge {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+      font-size: 11px;
+      padding: 3px 8px;
+      border-radius: 12px;
+      background: var(--warning);
+      color: #000;
+    }
+
+    .task-badge.completed {
+      background: var(--success);
+    }
+
+    /* Empty State */
+    .empty-canvas {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      padding: 60px 20px;
+      color: var(--gray-500);
+      text-align: center;
+    }
+
+    .empty-canvas svg {
+      width: 64px;
+      height: 64px;
+      margin-bottom: 16px;
+      opacity: 0.5;
+      color: var(--gray-400);
+    }
+
+    .empty-canvas h3 {
+      margin: 0 0 8px 0;
+      color: var(--gray-800);
+    }
+
+    .empty-canvas p {
+      margin: 0;
+      max-width: 300px;
+      color: var(--gray-500);
+    }
+
+    /* Toolbar */
+    .builder-toolbar {
+      display: flex;
+      gap: 8px;
+      padding: 12px 24px;
+      background: #fff;
+      border-bottom: 1px solid var(--gray-200);
+    }
+
+    .toolbar-group {
+      display: flex;
+      gap: 4px;
+      padding-right: 12px;
+      border-right: 1px solid var(--gray-200);
+    }
+
+    .toolbar-group:last-child {
+      border-right: none;
+    }
+
+    .toolbar-btn {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      padding: 8px 12px;
+      background: var(--gray-50);
+      border: 1px solid var(--gray-200);
+      border-radius: var(--radius);
+      color: var(--gray-700);
+      font-size: 13px;
+      cursor: pointer;
+      transition: all 0.2s;
+    }
+
+    .toolbar-btn:hover {
+      background: #fff;
+      border-color: var(--primary);
+      color: var(--gray-900);
+    }
+
+    .toolbar-btn.primary {
+      background: var(--primary);
+      border-color: var(--primary);
+      color: #fff;
+    }
+
+    .toolbar-btn.primary:hover {
+      background: var(--primary-dark);
+    }
+
+    .toolbar-btn.primary:active {
+      background: var(--primary-dark);
+      transform: scale(0.98);
+    }
+
+    .toolbar-btn svg {
+      width: 16px;
+      height: 16px;
+    }
+
+    /* Import/Export Modal */
+    .import-export-area {
+      width: 100%;
+      min-height: 300px;
+      font-family: monospace;
+      font-size: 12px;
+      resize: vertical;
+    }
+
+    /* Selection highlight */
+    .category-card.selected,
+    .item-card.selected {
+      border-color: var(--primary);
+      box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.2);
+    }
+
+    /* Context Menu */
+    .context-menu {
+      position: fixed;
+      background: #fff;
+      border: 1px solid var(--gray-200);
+      border-radius: var(--radius);
+      padding: 8px 0;
+      min-width: 180px;
+      box-shadow: var(--shadow-lg);
+      z-index: 1000;
+      display: none;
+    }
+
+    .context-menu.visible {
+      display: block;
+    }
+
+    .context-menu-item {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      padding: 8px 16px;
+      cursor: pointer;
+      transition: background 0.15s;
+      color: var(--gray-700);
+    }
+
+    .context-menu-item:hover {
+      background: var(--gray-50);
+    }
+
+    .context-menu-item.danger {
+      color: var(--danger);
+    }
+
+    .context-menu-item svg {
+      width: 16px;
+      height: 16px;
+    }
+
+    .context-menu-divider {
+      height: 1px;
+      background: var(--gray-200);
+      margin: 8px 0;
+    }
+
+    /* Keyboard shortcuts hint */
+    .shortcut-hint {
+      font-size: 11px;
+      color: var(--gray-400);
+      margin-left: auto;
+      font-family: monospace;
+    }
+  </style>
+</head>
+<body>
+  <div class="app">
+    <!-- Sidebar (same as portal) -->
+    <aside class="sidebar" id="sidebar">
+      <div class="sidebar-header">
+        <div class="logo">
+          <span class="logo-icon">P</span>
+          <span class="logo-text">Payfrit</span>
+        </div>
+        <button class="sidebar-toggle" id="sidebarToggle">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M3 12h18M3 6h18M3 18h18"/>
+          </svg>
+        </button>
+      </div>
+
+      <div class="business-info" style="padding: 12px 16px; border-bottom: 1px solid var(--gray-200);">
+        <div class="business-avatar" id="businessAvatar">B</div>
+        <div class="business-details">
+          <div class="business-name" id="businessName">Loading...</div>
+          <div class="business-status online">Online</div>
+        </div>
+      </div>
+
+      <nav class="sidebar-nav">
+        <a href="index.html#dashboard" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/>
+            <rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/>
+          </svg>
+          <span>Dashboard</span>
+        </a>
+        <a href="index.html#orders" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2"/>
+            <rect x="9" y="3" width="6" height="4" rx="1"/>
+            <path d="M9 12h6M9 16h6"/>
+          </svg>
+          <span>Orders</span>
+        </a>
+        <a href="#" class="nav-item active">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M3 6h18M3 12h18M3 18h18"/>
+          </svg>
+          <span>Menu</span>
+        </a>
+        <a href="index.html#reports" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M18 20V10M12 20V4M6 20v-6"/>
+          </svg>
+          <span>Reports</span>
+        </a>
+        <a href="index.html#team" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/>
+            <circle cx="9" cy="7" r="4"/>
+            <path d="M23 21v-2a4 4 0 00-3-3.87M16 3.13a4 4 0 010 7.75"/>
+          </svg>
+          <span>Team</span>
+        </a>
+        <a href="index.html#beacons" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <circle cx="12" cy="12" r="3"/>
+            <path d="M12 2v4M12 18v4M2 12h4M18 12h4"/>
+            <path d="M4.93 4.93l2.83 2.83M16.24 16.24l2.83 2.83M4.93 19.07l2.83-2.83M16.24 7.76l2.83-2.83"/>
+          </svg>
+          <span>Beacons</span>
+        </a>
+        <a href="index.html#services" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M18 8A6 6 0 006 8c0 7-3 9-3 9h18s-3-2-3-9"/>
+            <path d="M13.73 21a2 2 0 01-3.46 0"/>
+          </svg>
+          <span>Services</span>
+        </a>
+        <a href="index.html#admin-tasks" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"/>
+          </svg>
+          <span>Task Admin</span>
+        </a>
+        <a href="index.html#settings" class="nav-item">
+          <svg class="nav-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <circle cx="12" cy="12" r="3"/>
+            <path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 010 2.83 2 2 0 01-2.83 0l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-2 2 2 2 0 01-2-2v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83 0 2 2 0 010-2.83l.06-.06a1.65 1.65 0 00.33-1.82 1.65 1.65 0 00-1.51-1H3a2 2 0 01-2-2 2 2 0 012-2h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 010-2.83 2 2 0 012.83 0l.06.06a1.65 1.65 0 001.82.33H9a1.65 1.65 0 001-1.51V3a2 2 0 012-2 2 2 0 012 2v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 0 2 2 0 010 2.83l-.06.06a1.65 1.65 0 00-.33 1.82V9a1.65 1.65 0 001.51 1H21a2 2 0 012 2 2 2 0 01-2 2h-.09a1.65 1.65 0 00-1.51 1z"/>
+          </svg>
+          <span>Settings</span>
+        </a>
+      </nav>
+    </aside>
+
+    <!-- Main Content -->
+    <main class="main-content">
+      <div class="builder-wrapper">
+        <!-- Toolbar -->
+        <div class="builder-toolbar">
+          <div class="toolbar-group">
+            <button class="toolbar-btn" onclick="MenuBuilder.undo()" title="Undo (Ctrl+Z)">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M3 7v6h6M3 13a9 9 0 103-7.5"/>
+              </svg>
+              Undo
+            </button>
+            <button class="toolbar-btn" onclick="MenuBuilder.redo()" title="Redo (Ctrl+Y)">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M21 7v6h-6M21 13a9 9 0 10-3-7.5"/>
+              </svg>
+              Redo
+            </button>
+          </div>
+          <div class="toolbar-group">
+            <button class="toolbar-btn" onclick="MenuBuilder.addCategory()" title="Add Category">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M12 5v14M5 12h14"/>
+              </svg>
+              Category
+            </button>
+            <button class="toolbar-btn" onclick="MenuBuilder.addItem()" title="Add Item">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M12 5v14M5 12h14"/>
+              </svg>
+              Item
+            </button>
+          </div>
+          <div class="toolbar-group">
+            <button class="toolbar-btn" onclick="MenuBuilder.cloneSelected()" title="Clone (Ctrl+D)">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <rect x="9" y="9" width="13" height="13" rx="2"/>
+                <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/>
+              </svg>
+              Clone
+            </button>
+            <button class="toolbar-btn" onclick="MenuBuilder.deleteSelected()" title="Delete (Del)">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/>
+              </svg>
+              Delete
+            </button>
+          </div>
+          <div class="toolbar-group">
+            <button class="toolbar-btn" onclick="MenuBuilder.showOutlineModal()" title="View Full Menu Outline">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M4 6h16M4 12h16M4 18h12"/>
+              </svg>
+              Outline
+            </button>
+          </div>
+          <div class="toolbar-group" style="margin-left: auto;">
+            <button class="toolbar-btn" onclick="MenuBuilder.showMenuManager()" title="Manage Menus" style="font-weight: 600;">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/>
+              </svg>
+              Manage Menus
+            </button>
+            <button class="toolbar-btn primary" onclick="MenuBuilder.saveMenu()">
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                <path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/>
+                <path d="M17 21v-8H7v8M7 3v5h8"/>
+              </svg>
+              Save Menu
+            </button>
+          </div>
+        </div>
+
+    <!-- Main Builder -->
+    <div class="builder-container">
+      <!-- Left Sidebar - Palette -->
+      <div class="builder-sidebar">
+        <h3>Components</h3>
+        <div class="palette-section">
+          <div class="palette-item" draggable="true" data-type="category">
+            <div class="icon">📁</div>
+            <div>
+              <div class="label">Category</div>
+              <div class="hint">Group of menu items</div>
+            </div>
+          </div>
+          <div class="palette-item" draggable="true" data-type="item">
+            <div class="icon">🍽️</div>
+            <div>
+              <div class="label">Menu Item</div>
+              <div class="hint">Orderable product</div>
+            </div>
+          </div>
+          <div class="palette-item" draggable="true" data-type="modifier">
+            <div class="icon">⚙️</div>
+            <div>
+              <div class="label">Modifier</div>
+              <div class="hint">Add-on or option</div>
+            </div>
+          </div>
+          <div class="palette-item" draggable="true" data-type="modifier-group">
+            <div class="icon">📋</div>
+            <div>
+              <div class="label">Modifier Group</div>
+              <div class="hint">Group of options</div>
+            </div>
+          </div>
+        </div>
+
+        <h3>Modifier Templates</h3>
+        <div class="palette-section" id="templateLibrary">
+          <div style="color: var(--gray-500); font-size: 13px; padding: 8px;">Loading templates...</div>
+        </div>
+
+        <h3>Quick Stats</h3>
+        <div style="font-size: 13px; color: var(--text-muted);">
+          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
+            <span>Categories:</span>
+            <strong id="statCategories">0</strong>
+          </div>
+          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
+            <span>Items:</span>
+            <strong id="statItems">0</strong>
+          </div>
+          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
+            <span>Templates:</span>
+            <strong id="statTemplates">0</strong>
+          </div>
+          <div style="display: flex; justify-content: space-between; padding: 6px 0;">
+            <span>Photos Missing:</span>
+            <strong id="statPhotosMissing" style="color: var(--warning);">0</strong>
+          </div>
+        </div>
+
+        <h3>Branding</h3>
+        <div style="display: flex; flex-direction: column; gap: 8px;">
+          <button class="btn btn-secondary" onclick="MenuBuilder.uploadHeader()" style="width: 100%; display: flex; align-items: center; gap: 8px; justify-content: center;">
+            <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2">
+              <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+              <circle cx="8.5" cy="8.5" r="1.5"/>
+              <polyline points="21 15 16 10 5 21"/>
+            </svg>
+            Upload Header
+          </button>
+          <button class="btn btn-secondary" onclick="MenuBuilder.showBrandColorPicker()" style="width: 100%; display: flex; align-items: center; gap: 8px; justify-content: center;">
+            <span id="brandColorSwatch" style="width: 16px; height: 16px; border-radius: 3px; background: #1B4D3E; border: 1px solid rgba(0,0,0,0.2);"></span>
+            Brand Color
+          </button>
+          <p style="font-size: 11px; color: var(--gray-500); margin: 0;">
+            Header: 1200x400px recommended<br>
+            Color: Used for category bars in the app
+          </p>
+        </div>
+      </div>
+
+      <!-- Main Canvas -->
+      <div class="builder-canvas">
+        <div class="canvas-header">
+          <h2>
+            <span id="menuName">Menu Builder</span>
+            <span style="font-size: 13px; color: var(--gray-500); font-weight: normal;" id="businessLabel"></span>
+          </h2>
+          <div class="canvas-actions" style="display: flex; gap: 8px; align-items: center;">
+            <select id="menuSelector" onchange="MenuBuilder.onMenuSelect(this.value)" style="padding: 8px 12px; border: 1px solid var(--gray-300); border-radius: 6px; background: #fff; font-size: 14px; cursor: pointer;">
+              <option value="0">All Categories</option>
+            </select>
+          </div>
+        </div>
+
+        <div class="menu-structure" id="menuStructure">
+          <div class="empty-canvas" id="emptyCanvas">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+              <path d="M3 6h18M3 12h18M3 18h18"/>
+            </svg>
+            <h3>Start Building Your Menu</h3>
+            <p>Drag categories and items from the left panel, or click the buttons above to add them.</p>
+          </div>
+        </div>
+      </div>
+
+      <!-- Right Sidebar - Properties -->
+      <div class="builder-properties" id="propertiesPanel">
+        <div class="properties-header">
+          <h3>Properties</h3>
+        </div>
+
+        <div id="propertiesContent">
+          <p style="color: var(--gray-500); text-align: center; padding: 20px;">
+            Select an item to edit its properties
+          </p>
+        </div>
+      </div>
+    </div>
+      </div> <!-- end builder-wrapper -->
+    </main>
+  </div>
+
+  <!-- Context Menu -->
+  <div class="context-menu" id="contextMenu">
+    <div class="context-menu-item" onclick="MenuBuilder.editSelected()">
+      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/>
+        <path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/>
+      </svg>
+      Edit
+      <span class="shortcut-hint">Enter</span>
+    </div>
+    <div class="context-menu-item" onclick="MenuBuilder.cloneSelected()">
+      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <rect x="9" y="9" width="13" height="13" rx="2"/>
+        <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/>
+      </svg>
+      Clone
+      <span class="shortcut-hint">Ctrl+D</span>
+    </div>
+    <div class="context-menu-item" onclick="MenuBuilder.createPhotoTask()">
+      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <rect x="3" y="3" width="18" height="18" rx="2"/>
+        <circle cx="8.5" cy="8.5" r="1.5"/>
+        <path d="M21 15l-5-5L5 21"/>
+      </svg>
+      Create Photo Task
+    </div>
+    <div class="context-menu-divider"></div>
+    <div class="context-menu-item" onclick="MenuBuilder.moveUp()">
+      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <path d="M12 19V5M5 12l7-7 7 7"/>
+      </svg>
+      Move Up
+      <span class="shortcut-hint">Alt+Up</span>
+    </div>
+    <div class="context-menu-item" onclick="MenuBuilder.moveDown()">
+      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <path d="M12 5v14M19 12l-7 7-7-7"/>
+      </svg>
+      Move Down
+      <span class="shortcut-hint">Alt+Down</span>
+    </div>
+    <div class="context-menu-divider"></div>
+    <div class="context-menu-item danger" onclick="MenuBuilder.deleteSelected()">
+      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/>
+      </svg>
+      Delete
+      <span class="shortcut-hint">Del</span>
+    </div>
+  </div>
+
+  <!-- Modal -->
+  <div class="modal-overlay" id="modalOverlay">
+    <div class="modal" id="modal" style="max-width: 600px;">
+      <div class="modal-header">
+        <h3 id="modalTitle">Modal</h3>
+        <button class="modal-close" onclick="MenuBuilder.closeModal()">&times;</button>
+      </div>
+      <div class="modal-body" id="modalBody"></div>
+    </div>
+  </div>
+
+  <!-- Toast Container -->
+  <div class="toast-container" id="toastContainer"></div>
+
+  <script>
+    // Detect base path for API calls (handles local dev at /biz.payfrit.com/)
+    const BASE_PATH = (() => {
+      const path = window.location.pathname;
+      const portalIndex = path.indexOf('/portal/');
+      if (portalIndex > 0) {
+        return path.substring(0, portalIndex);
+      }
+      return '';
+    })();
+
+    /**
+     * Payfrit Menu Builder
+     * Drag-and-drop menu creation with photo tasks
+     */
+    const MenuBuilder = {
+      // Config
+      config: {
+        apiBaseUrl: BASE_PATH + '/api',
+        businessId: null,
+      },
+
+      // State
+      menu: {
+        categories: []
+      },
+      menus: [],           // List of all menus for this business
+      selectedMenuId: 0,   // Currently selected menu ID (0 = all/default)
+      templates: [],
+      stations: [],
+      selectedElement: null,
+      selectedData: null,
+      undoStack: [],
+      redoStack: [],
+      idCounter: 1,
+      expandedCategoryId: null, // For accordion - only one category expanded at a time
+      expandedItemId: null, // For item accordion - only one item expanded at a time
+      expandedModifierIds: new Set(), // Track which modifiers are expanded
+
+      // Initialize
+      async init() {
+        console.log('[MenuBuilder] Initializing...');
+
+        // Check authentication
+        const token = localStorage.getItem('payfrit_portal_token');
+        const savedBusiness = localStorage.getItem('payfrit_portal_business');
+
+        if (!token || !savedBusiness) {
+          window.location.href = BASE_PATH + '/portal/login.html';
+          return;
+        }
+
+        // Get business ID from localStorage
+        this.config.businessId = parseInt(savedBusiness) || null;
+        this.config.token = token;
+
+        // Setup sidebar toggle
+        this.setupSidebar();
+
+        // Load business info
+        await this.loadBusinessInfo();
+
+        // Setup drag and drop
+        this.setupDragAndDrop();
+
+        // Setup keyboard shortcuts
+        this.setupKeyboardShortcuts();
+
+        // Setup context menu
+        this.setupContextMenu();
+
+        // Load existing menu if any
+        await this.loadMenu();
+
+        console.log('[MenuBuilder] Ready');
+      },
+
+      // Setup sidebar toggle
+      setupSidebar() {
+        const sidebar = document.getElementById('sidebar');
+        const toggle = document.getElementById('sidebarToggle');
+        if (toggle && sidebar) {
+          toggle.addEventListener('click', () => {
+            sidebar.classList.toggle('collapsed');
+          });
+        }
+      },
+
+      // Logout
+      logout() {
+        localStorage.removeItem('payfrit_portal_token');
+        localStorage.removeItem('payfrit_portal_business');
+        window.location.href = BASE_PATH + '/portal/login.html';
+      },
+
+      // Load business info
+      async loadBusinessInfo() {
+        try {
+          const response = await fetch(`${this.config.apiBaseUrl}/businesses/get.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ BusinessID: this.config.businessId })
+          });
+          const data = await response.json();
+          if (data.OK && data.BUSINESS) {
+            const biz = data.BUSINESS;
+            document.getElementById('businessLabel').textContent = `- ${biz.BusinessName}`;
+            // Update sidebar business info
+            const businessName = document.getElementById('businessName');
+            const businessAvatar = document.getElementById('businessAvatar');
+            if (businessName) businessName.textContent = biz.BusinessName;
+            if (businessAvatar) businessAvatar.textContent = biz.BusinessName ? biz.BusinessName.charAt(0).toUpperCase() : 'B';
+          }
+        } catch (err) {
+          console.error('[MenuBuilder] Error loading business:', err);
+        }
+      },
+
+      // Setup drag and drop
+      setupDragAndDrop() {
+        // Palette items
+        document.querySelectorAll('.palette-item').forEach(item => {
+          item.addEventListener('dragstart', (e) => {
+            e.dataTransfer.setData('type', item.dataset.type);
+            e.dataTransfer.setData('source', 'palette');
+          });
+        });
+
+        // Canvas drop zone
+        const structure = document.getElementById('menuStructure');
+        structure.addEventListener('dragover', (e) => {
+          e.preventDefault();
+          e.dataTransfer.dropEffect = 'copy';
+        });
+
+        structure.addEventListener('drop', (e) => {
+          e.preventDefault();
+          const type = e.dataTransfer.getData('type');
+          const source = e.dataTransfer.getData('source');
+
+          if (source === 'palette') {
+            this.handlePaletteDrop(type, e.target);
+          }
+        });
+      },
+
+      // Handle palette drop
+      handlePaletteDrop(type, target) {
+        switch (type) {
+          case 'category':
+            this.addCategory();
+            break;
+          case 'item':
+            this.addItem(this.findCategoryFromTarget(target));
+            break;
+          case 'modifier':
+            this.addModifier(this.findItemFromTarget(target));
+            break;
+          case 'modifier-group':
+            this.addModifierGroup(this.findItemFromTarget(target));
+            break;
+          case 'template-size':
+            this.addSizeTemplate(this.findItemFromTarget(target));
+            break;
+          case 'template-protein':
+            this.addProteinTemplate(this.findItemFromTarget(target));
+            break;
+          case 'template-temp':
+            this.addTempTemplate(this.findItemFromTarget(target));
+            break;
+        }
+      },
+
+      // Find category from drop target
+      findCategoryFromTarget(target) {
+        const card = target.closest('.category-card');
+        if (card) {
+          return parseInt(card.dataset.categoryId);
+        }
+        return this.menu.categories.length > 0 ? this.menu.categories[0].id : null;
+      },
+
+      // Find item from drop target
+      findItemFromTarget(target) {
+        const card = target.closest('.item-card');
+        if (card) {
+          return parseInt(card.dataset.itemId);
+        }
+        return null;
+      },
+
+      // Setup keyboard shortcuts
+      setupKeyboardShortcuts() {
+        document.addEventListener('keydown', (e) => {
+          // Delete
+          if (e.key === 'Delete' && this.selectedElement) {
+            e.preventDefault();
+            this.deleteSelected();
+          }
+
+          // Clone (Ctrl+D)
+          if (e.key === 'd' && e.ctrlKey && this.selectedElement) {
+            e.preventDefault();
+            this.cloneSelected();
+          }
+
+          // Undo (Ctrl+Z)
+          if (e.key === 'z' && e.ctrlKey && !e.shiftKey) {
+            e.preventDefault();
+            this.undo();
+          }
+
+          // Redo (Ctrl+Y or Ctrl+Shift+Z)
+          if ((e.key === 'y' && e.ctrlKey) || (e.key === 'z' && e.ctrlKey && e.shiftKey)) {
+            e.preventDefault();
+            this.redo();
+          }
+
+          // Move up (Alt+Up)
+          if (e.key === 'ArrowUp' && e.altKey && this.selectedElement) {
+            e.preventDefault();
+            this.moveUp();
+          }
+
+          // Move down (Alt+Down)
+          if (e.key === 'ArrowDown' && e.altKey && this.selectedElement) {
+            e.preventDefault();
+            this.moveDown();
+          }
+
+          // Edit (Enter)
+          if (e.key === 'Enter' && this.selectedElement) {
+            e.preventDefault();
+            this.editSelected();
+          }
+
+          // Escape - deselect
+          if (e.key === 'Escape') {
+            this.clearSelection();
+            this.hideContextMenu();
+          }
+        });
+      },
+
+      // Setup context menu
+      setupContextMenu() {
+        document.addEventListener('contextmenu', (e) => {
+          const element = e.target.closest('.category-card, .item-card');
+          if (element) {
+            e.preventDefault();
+            this.selectElement(element);
+            this.showContextMenu(e.clientX, e.clientY);
+          }
+        });
+
+        document.addEventListener('click', () => {
+          this.hideContextMenu();
+        });
+      },
+
+      // Show context menu
+      showContextMenu(x, y) {
+        const menu = document.getElementById('contextMenu');
+        menu.style.left = x + 'px';
+        menu.style.top = y + 'px';
+        menu.classList.add('visible');
+      },
+
+      // Hide context menu
+      hideContextMenu() {
+        document.getElementById('contextMenu').classList.remove('visible');
+      },
+
+      // Generate unique ID
+      generateId() {
+        return `temp_${Date.now()}_${this.idCounter++}`;
+      },
+
+      // Save state for undo
+      saveState() {
+        this.undoStack.push(JSON.stringify(this.menu));
+        this.redoStack = [];
+        if (this.undoStack.length > 50) {
+          this.undoStack.shift();
+        }
+      },
+
+      // Undo
+      undo() {
+        if (this.undoStack.length === 0) return;
+        this.redoStack.push(JSON.stringify(this.menu));
+        this.menu = JSON.parse(this.undoStack.pop());
+        this.render();
+        this.toast('Undo', 'info');
+      },
+
+      // Redo
+      redo() {
+        if (this.redoStack.length === 0) return;
+        this.undoStack.push(JSON.stringify(this.menu));
+        this.menu = JSON.parse(this.redoStack.pop());
+        this.render();
+        this.toast('Redo', 'info');
+      },
+
+      // Add category
+      addCategory(name = null) {
+        this.saveState();
+
+        const category = {
+          id: this.generateId(),
+          name: name || `New Category ${this.menu.categories.length + 1}`,
+          description: '',
+          sortOrder: this.menu.categories.length,
+          items: []
+        };
+
+        this.menu.categories.push(category);
+        this.render();
+        this.selectElementById('category', category.id);
+        this.showPropertiesForCategory(category);
+      },
+
+      // Add item
+      addItem(categoryId = null) {
+        this.saveState();
+
+        // Find category
+        let category = null;
+        if (categoryId) {
+          category = this.menu.categories.find(c => c.id === categoryId);
+        } else if (this.menu.categories.length > 0) {
+          category = this.menu.categories[0];
+        } else {
+          this.toast('Create a category first', 'error');
+          return;
+        }
+
+        const item = {
+          id: this.generateId(),
+          name: 'New Item',
+          description: '',
+          price: 0,
+          imageUrl: null,
+          photoTaskId: null,
+          modifiers: [],
+          sortOrder: category.items.length
+        };
+
+        category.items.push(item);
+        this.render();
+        this.selectElementById('item', item.id);
+        this.showPropertiesForItem(item, category);
+      },
+
+      // Add modifier
+      addModifier(itemId) {
+        if (!itemId) {
+          this.toast('Select an item first', 'error');
+          return;
+        }
+
+        this.saveState();
+
+        // Find item
+        let item = null;
+        let parentCategory = null;
+        for (const cat of this.menu.categories) {
+          const found = cat.items.find(i => i.id === itemId);
+          if (found) {
+            item = found;
+            parentCategory = cat;
+            break;
+          }
+        }
+
+        if (!item) return;
+
+        const modifier = {
+          id: this.generateId(),
+          name: 'New Modifier',
+          price: 0,
+          isDefault: false,
+          sortOrder: item.modifiers.length
+        };
+
+        item.modifiers.push(modifier);
+        this.render();
+      },
+
+      // Add modifier group
+      addModifierGroup(itemId) {
+        if (!itemId) {
+          this.toast('Select an item first', 'error');
+          return;
+        }
+        // For now, just add a modifier with a group indicator
+        this.addModifier(itemId);
+      },
+
+      // Add size template
+      addSizeTemplate(itemId) {
+        if (!itemId) {
+          this.toast('Select an item first', 'error');
+          return;
+        }
+
+        this.saveState();
+
+        let item = null;
+        for (const cat of this.menu.categories) {
+          const found = cat.items.find(i => i.id === itemId);
+          if (found) {
+            item = found;
+            break;
+          }
+        }
+
+        if (!item) return;
+
+        const sizes = [
+          { name: 'Small', price: 0, isDefault: true },
+          { name: 'Medium', price: 1.00, isDefault: false },
+          { name: 'Large', price: 2.00, isDefault: false }
+        ];
+
+        sizes.forEach((s, i) => {
+          item.modifiers.push({
+            id: this.generateId(),
+            name: s.name,
+            price: s.price,
+            isDefault: s.isDefault,
+            group: 'Size',
+            sortOrder: item.modifiers.length + i
+          });
+        });
+
+        this.render();
+        this.toast('Size options added', 'success');
+      },
+
+      // Add protein template
+      addProteinTemplate(itemId) {
+        if (!itemId) {
+          this.toast('Select an item first', 'error');
+          return;
+        }
+
+        this.saveState();
+
+        let item = null;
+        for (const cat of this.menu.categories) {
+          const found = cat.items.find(i => i.id === itemId);
+          if (found) {
+            item = found;
+            break;
+          }
+        }
+
+        if (!item) return;
+
+        const proteins = [
+          { name: 'Chicken', price: 0, isDefault: true },
+          { name: 'Beef', price: 2.00, isDefault: false },
+          { name: 'Lamb', price: 3.00, isDefault: false },
+          { name: 'Falafel (V)', price: 0, isDefault: false }
+        ];
+
+        proteins.forEach((p, i) => {
+          item.modifiers.push({
+            id: this.generateId(),
+            name: p.name,
+            price: p.price,
+            isDefault: p.isDefault,
+            group: 'Protein',
+            sortOrder: item.modifiers.length + i
+          });
+        });
+
+        this.render();
+        this.toast('Protein options added', 'success');
+      },
+
+      // Add temperature template
+      addTempTemplate(itemId) {
+        if (!itemId) {
+          this.toast('Select an item first', 'error');
+          return;
+        }
+
+        this.saveState();
+
+        let item = null;
+        for (const cat of this.menu.categories) {
+          const found = cat.items.find(i => i.id === itemId);
+          if (found) {
+            item = found;
+            break;
+          }
+        }
+
+        if (!item) return;
+
+        const temps = [
+          { name: 'Hot', price: 0, isDefault: true },
+          { name: 'Iced', price: 0.50, isDefault: false },
+          { name: 'Blended', price: 1.00, isDefault: false }
+        ];
+
+        temps.forEach((t, i) => {
+          item.modifiers.push({
+            id: this.generateId(),
+            name: t.name,
+            price: t.price,
+            isDefault: t.isDefault,
+            group: 'Temperature',
+            sortOrder: item.modifiers.length + i
+          });
+        });
+
+        this.render();
+        this.toast('Temperature options added', 'success');
+      },
+
+      // Select element
+      selectElement(element) {
+        this.clearSelection();
+        this.selectedElement = element;
+        element.classList.add('selected');
+
+        // Get data
+        if (element.classList.contains('category-card')) {
+          const catId = element.dataset.categoryId;
+          const category = this.menu.categories.find(c => c.id === catId);
+          this.selectedData = { type: 'category', data: category };
+          this.showPropertiesForCategory(category);
+        } else if (element.classList.contains('item-card')) {
+          const itemId = element.dataset.itemId;
+          for (const cat of this.menu.categories) {
+            const item = cat.items.find(i => i.id === itemId);
+            if (item) {
+              this.selectedData = { type: 'item', data: item, category: cat };
+              this.showPropertiesForItem(item, cat);
+              break;
+            }
+          }
+        }
+      },
+
+      // Select element by ID
+      selectElementById(type, id) {
+        const selector = type === 'category'
+          ? `.category-card[data-category-id="${id}"]`
+          : `.item-card[data-item-id="${id}"]`;
+        const element = document.querySelector(selector);
+        if (element) {
+          this.selectElement(element);
+        }
+      },
+
+      // Select item by ID (shortcut for use in onclick handlers)
+      selectItem(itemId) {
+        this.selectElementById('item', itemId);
+      },
+
+      // Clear selection
+      clearSelection() {
+        if (this.selectedElement) {
+          this.selectedElement.classList.remove('selected');
+        }
+        this.selectedElement = null;
+        this.selectedData = null;
+        document.getElementById('propertiesContent').innerHTML = `
+          <p style="color: var(--gray-500); text-align: center; padding: 20px;">
+            Select an item to edit its properties
+          </p>
+        `;
+      },
+
+      // Show properties for category
+      showPropertiesForCategory(category) {
+        const menuOptions = this.menus.map(m =>
+          `<option value="${m.MenuID}" ${category.menuId === m.MenuID ? 'selected' : ''}>${this.escapeHtml(m.MenuName)}</option>`
+        ).join('');
+
+        document.getElementById('propertiesContent').innerHTML = `
+          <div class="property-group">
+            <label>Category Name</label>
+            <input type="text" id="propCatName" value="${this.escapeHtml(category.name)}"
+              onchange="MenuBuilder.updateCategory('${category.id}', 'name', this.value)">
+          </div>
+          <div class="property-group">
+            <label>Description</label>
+            <textarea id="propCatDesc" rows="3"
+              onchange="MenuBuilder.updateCategory('${category.id}', 'description', this.value)">${this.escapeHtml(category.description || '')}</textarea>
+          </div>
+          ${this.menus.length > 0 ? `
+          <div class="property-group">
+            <label>Assign to Menu</label>
+            <select onchange="MenuBuilder.updateCategory('${category.id}', 'menuId', parseInt(this.value))">
+              <option value="0" ${!category.menuId ? 'selected' : ''}>No Menu (Always Show)</option>
+              ${menuOptions}
+            </select>
+          </div>
+          ` : ''}
+          <div class="property-group">
+            <label>Sort Order</label>
+            <input type="number" id="propCatSort" value="${category.sortOrder}"
+              onchange="MenuBuilder.updateCategory('${category.id}', 'sortOrder', parseInt(this.value))">
+          </div>
+          <div class="property-group" style="margin-top: 16px;">
+            <button class="btn btn-danger" onclick="MenuBuilder.deleteCategory('${category.id}')">
+              Delete Category
+            </button>
+          </div>
+        `;
+      },
+
+      // Show properties for item
+      showPropertiesForItem(item, category) {
+        document.getElementById('propertiesContent').innerHTML = `
+          <div class="property-group">
+            <label>Item Name</label>
+            <input type="text" id="propItemName" value="${this.escapeHtml(item.name)}"
+              onchange="MenuBuilder.updateItem('${category.id}', '${item.id}', 'name', this.value)">
+          </div>
+          <div class="property-group">
+            <label>Description</label>
+            <textarea id="propItemDesc" rows="3"
+              onchange="MenuBuilder.updateItem('${category.id}', '${item.id}', 'description', this.value)">${this.escapeHtml(item.description || '')}</textarea>
+          </div>
+          <div class="property-row">
+            <div class="property-group">
+              <label>Price ($)</label>
+              <input type="number" step="0.01" id="propItemPrice" value="${item.price || 0}"
+                onchange="MenuBuilder.updateItem('${category.id}', '${item.id}', 'price', parseFloat(this.value))">
+            </div>
+            <div class="property-group">
+              <label>Category</label>
+              <select onchange="MenuBuilder.moveItemToCategory('${item.id}', this.value)">
+                ${this.menu.categories.map(c =>
+                  `<option value="${c.id}" ${c.id === category.id ? 'selected' : ''}>${this.escapeHtml(c.name)}</option>`
+                ).join('')}
+              </select>
+            </div>
+          </div>
+
+          <div class="photo-task-section">
+            <div class="photo-task-header">
+              <h4>Item Photo</h4>
+              ${item.photoTaskId ?
+                `<span class="task-badge ${item.imageUrl ? 'completed' : ''}">
+                  ${item.imageUrl ? 'Photo Added' : 'Task Pending'}
+                </span>` : ''}
+            </div>
+            <div class="photo-preview">
+              ${item.imageUrl ?
+                `<img src="${item.imageUrl}" alt="${this.escapeHtml(item.name)}">` :
+                `<span>No photo yet</span>`}
+            </div>
+            <div class="photo-actions">
+              <button class="btn btn-secondary" onclick="MenuBuilder.uploadPhoto('${item.id}')">
+                Upload
+              </button>
+              <button class="btn btn-secondary" onclick="MenuBuilder.createPhotoTask('${item.id}')">
+                Create Task
+              </button>
+            </div>
+          </div>
+
+          <div class="property-group" style="margin-top: 16px;">
+            <label>Modifiers (${item.modifiers.length})</label>
+            <button class="btn btn-secondary" onclick="MenuBuilder.addModifier('${item.id}')" style="margin-top: 8px;">
+              + Add Modifier
+            </button>
+          </div>
+
+          <div class="property-group" style="margin-top: 16px;">
+            <button class="btn btn-danger" onclick="MenuBuilder.deleteItem('${category.id}', '${item.id}')">
+              Delete Item
+            </button>
+          </div>
+        `;
+      },
+
+      // Select modifier and show its properties
+      selectModifier(itemId, modifierId) {
+        this.clearSelection();
+
+        // Find the modifier element and highlight it
+        const element = document.querySelector(`.item-card.modifier[data-modifier-id="${modifierId}"]`);
+        if (element) {
+          this.selectedElement = element;
+          element.classList.add('selected');
+        }
+
+        // Find the modifier data
+        for (const cat of this.menu.categories) {
+          const item = cat.items.find(i => i.id === itemId);
+          if (item) {
+            const modifier = item.modifiers.find(m => m.id === modifierId);
+            if (modifier) {
+              this.selectedData = { type: 'modifier', data: modifier, item: item, category: cat };
+              this.showPropertiesForModifier(modifier, item, cat);
+              break;
+            }
+          }
+        }
+      },
+
+      // Show properties for modifier
+      showPropertiesForModifier(modifier, item, category) {
+        document.getElementById('propertiesContent').innerHTML = `
+          <div class="property-group">
+            <label>Modifier Name</label>
+            <input type="text" id="propModName" value="${this.escapeHtml(modifier.name)}"
+              onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'name', this.value)">
+          </div>
+          <div class="property-row">
+            <div class="property-group">
+              <label>Extra Price ($)</label>
+              <input type="number" step="0.01" id="propModPrice" value="${modifier.price || 0}"
+                onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'price', parseFloat(this.value))">
+            </div>
+            <div class="property-group">
+              <label>Default</label>
+              <select id="propModDefault"
+                onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'isDefault', this.value === 'true')">
+                <option value="false" ${!modifier.isDefault ? 'selected' : ''}>No</option>
+                <option value="true" ${modifier.isDefault ? 'selected' : ''}>Yes</option>
+              </select>
+            </div>
+          </div>
+          <div class="property-group">
+            <label>Group Name (optional)</label>
+            <input type="text" id="propModGroup" value="${this.escapeHtml(modifier.group || '')}"
+              placeholder="e.g., Size, Protein, Temperature"
+              onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'group', this.value)">
+            <small style="color: var(--gray-500); font-size: 11px;">
+              Modifiers with the same group name are shown together
+            </small>
+          </div>
+          <div class="property-group">
+            <label>Sort Order</label>
+            <input type="number" id="propModSort" value="${modifier.sortOrder || 0}"
+              onchange="MenuBuilder.updateModifier('${item.id}', '${modifier.id}', 'sortOrder', parseInt(this.value))">
+          </div>
+          <div style="margin-top: 16px; padding-top: 16px; border-top: 1px solid var(--border-color);">
+            <p style="color: var(--gray-500); font-size: 12px; margin: 0 0 8px;">
+              Parent Item: <strong>${this.escapeHtml(item.name)}</strong>
+            </p>
+          </div>
+          <div class="property-group" style="margin-top: 16px;">
+            <button class="btn btn-danger" onclick="MenuBuilder.deleteModifier('${item.id}', '${modifier.id}')">
+              Delete Modifier
+            </button>
+          </div>
+        `;
+      },
+
+      // Update modifier
+      updateModifier(itemId, modifierId, field, value) {
+        this.saveState();
+        for (const cat of this.menu.categories) {
+          const item = cat.items.find(i => i.id === itemId);
+          if (item) {
+            const modifier = item.modifiers.find(m => m.id === modifierId);
+            if (modifier) {
+              modifier[field] = value;
+              this.render();
+              // Re-select the modifier to keep properties panel open
+              this.selectModifier(itemId, modifierId);
+              break;
+            }
+          }
+        }
+      },
+
+      // Delete modifier
+      deleteModifier(itemId, modifierId) {
+        if (!confirm('Delete this modifier?')) return;
+        this.saveState();
+        for (const cat of this.menu.categories) {
+          const item = cat.items.find(i => i.id === itemId);
+          if (item) {
+            item.modifiers = item.modifiers.filter(m => m.id !== modifierId);
+            break;
+          }
+        }
+        this.clearSelection();
+        this.render();
+        this.toast('Modifier deleted', 'success');
+      },
+
+      // Helper: Find an option recursively in the menu tree
+      findOptionRecursive(options, optionId) {
+        for (const opt of options) {
+          if (opt.id === optionId) return opt;
+          if (opt.options && opt.options.length > 0) {
+            const found = this.findOptionRecursive(opt.options, optionId);
+            if (found) return found;
+          }
+        }
+        return null;
+      },
+
+      // Helper: Find parent info for an option
+      findOptionWithParent(parentId, optionId) {
+        // First check if parent is a top-level item
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            if (item.id === parentId) {
+              const opt = item.modifiers.find(m => m.id === optionId);
+              // rootItem is the item itself when parent is the item
+              if (opt) return { option: opt, parent: item, parentType: 'item', category: cat, rootItem: item };
+            }
+            // Check nested modifiers
+            const result = this.findInModifiers(item.modifiers, parentId, optionId);
+            if (result) return { ...result, rootItem: item, category: cat };
+          }
+        }
+        return null;
+      },
+
+      findInModifiers(modifiers, parentId, optionId) {
+        for (const mod of modifiers) {
+          if (mod.id === parentId) {
+            const opt = (mod.options || []).find(o => o.id === optionId);
+            if (opt) return { option: opt, parent: mod, parentType: 'modifier' };
+          }
+          if (mod.options && mod.options.length > 0) {
+            const result = this.findInModifiers(mod.options, parentId, optionId);
+            if (result) return result;
+          }
+        }
+        return null;
+      },
+
+      // Select option at any depth
+      selectOption(parentId, optionId, depth) {
+        this.clearSelection();
+
+        const element = document.querySelector(`.item-card.modifier[data-modifier-id="${optionId}"]`);
+        if (element) {
+          this.selectedElement = element;
+          element.classList.add('selected');
+        }
+
+        const result = this.findOptionWithParent(parentId, optionId);
+        if (result) {
+          // Store rootItem for detach functionality
+          this.selectedData = {
+            type: 'option',
+            data: result.option,
+            parent: result.parent,
+            depth: depth,
+            rootItem: result.rootItem || result.category?.items?.find(i => i.id === parentId)
+          };
+          this.showPropertiesForOption(result.option, result.parent, depth, result.rootItem);
+        }
+      },
+
+      // Show properties for option at any depth
+      showPropertiesForOption(option, parent, depth, rootItem) {
+        const hasOptions = option.options && option.options.length > 0;
+        const levelName = depth === 1 ? 'Modifier Group' : (depth === 2 ? 'Option' : `Level ${depth} Option`);
+        const isModifierGroup = depth === 1 && hasOptions;
+
+        // Check if this is a shared template (only for depth 1 modifiers)
+        const isShared = depth === 1 && option.dbId && this.isSharedTemplate(option.dbId);
+        const sharedItems = isShared ? this.getItemsSharingTemplate(option.dbId) : [];
+
+        document.getElementById('propertiesContent').innerHTML = `
+          ${isShared ? `
+          <div style="background: rgba(255, 193, 7, 0.1); border: 1px solid var(--warning); border-radius: 8px; padding: 12px; margin-bottom: 16px;">
+            <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 8px;">
+              <span style="font-size: 16px;">🔗</span>
+              <strong style="color: var(--warning);">Shared Template</strong>
+            </div>
+            <p style="color: var(--gray-500); font-size: 12px; margin: 0 0 8px;">
+              Changes will apply to all ${sharedItems.length} items using this modifier:
+            </p>
+            <p style="color: var(--text-secondary); font-size: 11px; margin: 0; max-height: 60px; overflow-y: auto;">
+              ${sharedItems.map(n => this.escapeHtml(n)).join(', ')}
+            </p>
+            ${rootItem ? `
+            <button class="btn btn-secondary" style="margin-top: 12px; font-size: 12px;"
+              onclick="MenuBuilder.detachFromTemplate('${rootItem.id}', '${option.id}')">
+              ✂️ Detach for This Item Only
+            </button>
+            ` : ''}
+          </div>
+          ` : ''}
+          <div class="property-group">
+            <label>${levelName} Name</label>
+            <input type="text" value="${this.escapeHtml(option.name)}"
+              onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'name', this.value)">
+          </div>
+          <div class="property-row">
+            <div class="property-group">
+              <label>Extra Price ($)</label>
+              <input type="number" step="0.01" value="${option.price || 0}"
+                onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'price', parseFloat(this.value))">
+            </div>
+            <div class="property-group">
+              <label>Default</label>
+              <select onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'isDefault', this.value === 'true')">
+                <option value="false" ${!option.isDefault ? 'selected' : ''}>No</option>
+                <option value="true" ${option.isDefault ? 'selected' : ''}>Yes</option>
+              </select>
+            </div>
+          </div>
+          ${isModifierGroup ? `
+          <div style="margin-top: 16px; padding-top: 16px; border-top: 1px solid var(--border-color);">
+            <h4 style="margin: 0 0 12px; font-size: 13px; color: var(--text-muted);">Selection Rules</h4>
+            <div class="property-row">
+              <div class="property-group">
+                <label>Required</label>
+                <select onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'requiresSelection', this.value === 'true')">
+                  <option value="false" ${!option.requiresSelection ? 'selected' : ''}>No</option>
+                  <option value="true" ${option.requiresSelection ? 'selected' : ''}>Yes</option>
+                </select>
+              </div>
+              <div class="property-group">
+                <label>Max Selections</label>
+                <input type="number" min="0" value="${option.maxSelections || 0}"
+                  onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'maxSelections', parseInt(this.value))"
+                  title="0 = unlimited">
+              </div>
+            </div>
+            <p style="color: var(--gray-500); font-size: 11px; margin: 4px 0 0;">
+              Required = customer must select at least one option. Max 0 = unlimited.
+            </p>
+          </div>
+          ` : ''}
+          <div class="property-group">
+            <label>Sort Order</label>
+            <input type="number" value="${option.sortOrder || 0}"
+              onchange="MenuBuilder.updateOption('${parent.id}', '${option.id}', 'sortOrder', parseInt(this.value))">
+          </div>
+
+          <div style="margin-top: 16px; padding-top: 16px; border-top: 1px solid var(--border-color);">
+            <p style="color: var(--gray-500); font-size: 12px; margin: 0 0 8px;">
+              Parent: <strong>${this.escapeHtml(parent.name)}</strong>
+            </p>
+            <p style="color: var(--gray-500); font-size: 12px; margin: 0;">
+              Sub-options: <strong>${hasOptions ? option.options.length : 0}</strong>
+            </p>
+          </div>
+
+          <div class="property-group" style="margin-top: 16px;">
+            <button class="btn btn-secondary" onclick="MenuBuilder.addSubOption('${option.id}')">
+              + Add Sub-Option
+            </button>
+          </div>
+
+          <div class="property-group" style="margin-top: 8px;">
+            <button class="btn btn-danger" onclick="MenuBuilder.deleteOption('${parent.id}', '${option.id}', ${depth})">
+              Delete ${levelName}
+            </button>
+          </div>
+        `;
+      },
+
+      // Update option at any depth
+      // IMPORTANT: Templates are shared across multiple items, so we need to update ALL copies
+      updateOption(parentId, optionId, field, value) {
+        console.log('[MenuBuilder] updateOption called:', { parentId, optionId, field, value });
+        this.saveState();
+
+        // Get the dbId of the option being updated (to find all copies)
+        const result = this.findOptionWithParent(parentId, optionId);
+        if (!result || !result.option) {
+          console.error('[MenuBuilder] Could not find option to update!', { parentId, optionId });
+          return;
+        }
+
+        const optionDbId = result.option.dbId;
+        const parentDbId = result.parent.dbId;
+        const isTopLevelModifier = result.parentType === 'item'; // parent is the menu item itself
+        console.log('[MenuBuilder] Updating option dbId:', optionDbId, 'in parent dbId:', parentDbId, 'isTopLevel:', isTopLevelModifier);
+
+        // Update ALL instances of this option across all items (templates are duplicated)
+        let updateCount = 0;
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            for (const mod of (item.modifiers || [])) {
+              // If editing a top-level modifier group, match by the modifier's dbId directly
+              if (isTopLevelModifier && mod.dbId === optionDbId) {
+                mod[field] = value;
+                updateCount++;
+                console.log('[MenuBuilder] Updated top-level modifier in item:', item.name);
+              }
+              // If editing a nested option, find within the modifier's options
+              else if (!isTopLevelModifier && mod.dbId === parentDbId) {
+                // Find the option within this modifier
+                const opt = (mod.options || []).find(o => o.dbId === optionDbId);
+                if (opt) {
+                  opt[field] = value;
+                  updateCount++;
+                  console.log('[MenuBuilder] Updated nested option in item:', item.name);
+                }
+              }
+              // Also check nested options recursively for deeper levels
+              this.updateOptionInModifiers(mod.options || [], parentDbId, optionDbId, field, value);
+            }
+          }
+        }
+        console.log('[MenuBuilder] Total copies updated:', updateCount);
+
+        this.render();
+        this.selectOption(parentId, optionId, this.selectedData?.depth || 1);
+      },
+
+      // Helper to recursively update option in nested modifiers
+      updateOptionInModifiers(options, parentDbId, optionDbId, field, value) {
+        for (const opt of options) {
+          if (opt.dbId === parentDbId) {
+            const child = (opt.options || []).find(o => o.dbId === optionDbId);
+            if (child) {
+              child[field] = value;
+            }
+          }
+          if (opt.options && opt.options.length > 0) {
+            this.updateOptionInModifiers(opt.options, parentDbId, optionDbId, field, value);
+          }
+        }
+      },
+
+      // Check if a modifier (by dbId) is shared across multiple items
+      isSharedTemplate(modifierDbId) {
+        if (!modifierDbId) return false;
+
+        let count = 0;
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            for (const mod of (item.modifiers || [])) {
+              if (mod.dbId === modifierDbId) {
+                count++;
+                if (count > 1) return true;
+              }
+            }
+          }
+        }
+        return false;
+      },
+
+      // Get list of items that share a template
+      getItemsSharingTemplate(modifierDbId) {
+        if (!modifierDbId) return [];
+
+        const items = [];
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            for (const mod of (item.modifiers || [])) {
+              if (mod.dbId === modifierDbId) {
+                items.push(item.name);
+              }
+            }
+          }
+        }
+        return items;
+      },
+
+      // Detach a modifier from its template - creates a local copy for this item only
+      detachFromTemplate(itemId, modifierId) {
+        this.saveState();
+
+        // Find the item and modifier
+        for (const cat of this.menu.categories) {
+          const item = cat.items.find(i => i.id === itemId);
+          if (item) {
+            const modIndex = item.modifiers.findIndex(m => m.id === modifierId);
+            if (modIndex !== -1) {
+              const mod = item.modifiers[modIndex];
+
+              // Create a deep copy with new IDs (null dbId means it will be created as new)
+              const detachedCopy = this.deepCopyWithNewIds(mod);
+              detachedCopy.name = mod.name + ' (Custom)';
+
+              // Replace the original with the detached copy
+              item.modifiers[modIndex] = detachedCopy;
+
+              this.render();
+              this.toast('Modifier detached - this item now has its own copy', 'success');
+
+              // Select the new detached modifier
+              this.selectOption(itemId, detachedCopy.id, 1);
+              return;
+            }
+          }
+        }
+
+        this.toast('Could not find modifier to detach', 'error');
+      },
+
+      // Create a deep copy of a modifier/option tree with new IDs
+      deepCopyWithNewIds(obj) {
+        const newObj = {
+          id: 'mod_new_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
+          dbId: null, // null = will be created as new in database
+          name: obj.name,
+          price: obj.price || 0,
+          isDefault: obj.isDefault || false,
+          sortOrder: obj.sortOrder || 0,
+          requiresSelection: obj.requiresSelection || false,
+          maxSelections: obj.maxSelections || 0,
+          options: []
+        };
+
+        // Recursively copy options
+        if (obj.options && obj.options.length > 0) {
+          newObj.options = obj.options.map(opt => this.deepCopyWithNewIds(opt));
+        }
+
+        return newObj;
+      },
+
+      // Delete option at any depth
+      deleteOption(parentId, optionId, depth) {
+        if (!confirm('Delete this option and all its sub-options?')) return;
+        this.saveState();
+
+        // Find and remove from parent's options array
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            // Check if parent is the item itself
+            if (item.id === parentId) {
+              item.modifiers = item.modifiers.filter(m => m.id !== optionId);
+              this.clearSelection();
+              this.render();
+              this.toast('Option deleted', 'success');
+              return;
+            }
+            // Check nested
+            if (this.deleteFromModifiers(item.modifiers, parentId, optionId)) {
+              this.clearSelection();
+              this.render();
+              this.toast('Option deleted', 'success');
+              return;
+            }
+          }
+        }
+      },
+
+      deleteFromModifiers(modifiers, parentId, optionId) {
+        for (const mod of modifiers) {
+          if (mod.id === parentId && mod.options) {
+            const idx = mod.options.findIndex(o => o.id === optionId);
+            if (idx !== -1) {
+              mod.options.splice(idx, 1);
+              return true;
+            }
+          }
+          if (mod.options && mod.options.length > 0) {
+            if (this.deleteFromModifiers(mod.options, parentId, optionId)) return true;
+          }
+        }
+        return false;
+      },
+
+      // Add sub-option to any option
+      addSubOption(parentOptionId) {
+        this.saveState();
+
+        const newOption = {
+          id: 'opt_new_' + Date.now(),
+          dbId: null,
+          name: 'New Option',
+          price: 0,
+          isDefault: false,
+          sortOrder: 0,
+          options: []
+        };
+
+        // Find the parent option and add to its options array
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            const found = this.findOptionRecursive(item.modifiers, parentOptionId);
+            if (found) {
+              if (!found.options) found.options = [];
+              found.options.push(newOption);
+              this.render();
+              this.toast('Sub-option added', 'success');
+              return;
+            }
+          }
+        }
+      },
+
+      // Find modifier/option and its parent array
+      findModifierWithParent(modifierId) {
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            // Check if it's a top-level modifier
+            const idx = item.modifiers.findIndex(m => m.id === modifierId);
+            if (idx !== -1) {
+              return { array: item.modifiers, index: idx, parentId: item.id, isItem: true };
+            }
+            // Check nested
+            const nested = this.findNestedModifierWithParent(item.modifiers, modifierId);
+            if (nested) return nested;
+          }
+        }
+        return null;
+      },
+
+      findNestedModifierWithParent(modifiers, modifierId) {
+        for (const mod of modifiers) {
+          if (mod.options && mod.options.length > 0) {
+            const idx = mod.options.findIndex(o => o.id === modifierId);
+            if (idx !== -1) {
+              return { array: mod.options, index: idx, parentId: mod.id, isItem: false };
+            }
+            const nested = this.findNestedModifierWithParent(mod.options, modifierId);
+            if (nested) return nested;
+          }
+        }
+        return null;
+      },
+
+      // Get the parent array for a parentId (item or modifier)
+      getParentModifiersArray(parentId) {
+        for (const cat of this.menu.categories) {
+          for (const item of cat.items) {
+            if (item.id === parentId) {
+              return item.modifiers;
+            }
+            const found = this.findOptionRecursive(item.modifiers, parentId);
+            if (found) {
+              if (!found.options) found.options = [];
+              return found.options;
+            }
+          }
+        }
+        return null;
+      },
+
+      // Deep clone a modifier with new IDs
+      cloneModifierDeep(mod) {
+        const clone = JSON.parse(JSON.stringify(mod));
+        clone.id = this.generateId();
+        clone.dbId = null; // Will get new dbId on save
+        if (clone.options && clone.options.length > 0) {
+          clone.options = clone.options.map(opt => this.cloneModifierDeep(opt));
+        }
+        return clone;
+      },
+
+      // Reorder modifier within same parent
+      reorderModifier(draggedId, targetId, parentId, position) {
+        this.saveState();
+        const parentArray = this.getParentModifiersArray(parentId);
+        if (!parentArray) return;
+
+        const draggedIdx = parentArray.findIndex(m => m.id === draggedId);
+        const targetIdx = parentArray.findIndex(m => m.id === targetId);
+        if (draggedIdx === -1 || targetIdx === -1) return;
+
+        // Remove dragged
+        const [dragged] = parentArray.splice(draggedIdx, 1);
+
+        // Find new target index (may have shifted)
+        let newTargetIdx = parentArray.findIndex(m => m.id === targetId);
+        if (position === 'after') newTargetIdx++;
+
+        // Insert at new position
+        parentArray.splice(newTargetIdx, 0, dragged);
+
+        // Update sort orders
+        parentArray.forEach((m, i) => m.sortOrder = i);
+
+        this.render();
+        this.toast('Modifier reordered', 'success');
+      },
+
+      // Move modifier from one parent to another
+      moveModifier(draggedId, fromParentId, targetModId, toParentId, position) {
+        this.saveState();
+        const fromArray = this.getParentModifiersArray(fromParentId);
+        const toArray = this.getParentModifiersArray(toParentId);
+        if (!fromArray || !toArray) return;
+
+        const draggedIdx = fromArray.findIndex(m => m.id === draggedId);
+        if (draggedIdx === -1) return;
+
+        // Remove from source
+        const [dragged] = fromArray.splice(draggedIdx, 1);
+
+        // Find target position in destination
+        const targetIdx = toArray.findIndex(m => m.id === targetModId);
+        let insertIdx = targetIdx === -1 ? toArray.length : targetIdx;
+        if (position === 'after') insertIdx++;
+
+        // Insert at new position
+        toArray.splice(insertIdx, 0, dragged);
+
+        // Update sort orders in both arrays
+        fromArray.forEach((m, i) => m.sortOrder = i);
+        toArray.forEach((m, i) => m.sortOrder = i);
+
+        this.render();
+        this.toast('Modifier moved', 'success');
+      },
+
+      // Copy modifier to position relative to another modifier
+      copyModifier(draggedId, fromParentId, targetModId, toParentId, position) {
+        this.saveState();
+        const fromArray = this.getParentModifiersArray(fromParentId);
+        const toArray = this.getParentModifiersArray(toParentId);
+        if (!fromArray || !toArray) return;
+
+        const dragged = fromArray.find(m => m.id === draggedId);
+        if (!dragged) return;
+
+        // Clone with new IDs
+        const clone = this.cloneModifierDeep(dragged);
+
+        // Find target position
+        const targetIdx = toArray.findIndex(m => m.id === targetModId);
+        let insertIdx = targetIdx === -1 ? toArray.length : targetIdx;
+        if (position === 'after') insertIdx++;
+
+        // Insert clone
+        toArray.splice(insertIdx, 0, clone);
+
+        // Update sort orders
+        toArray.forEach((m, i) => m.sortOrder = i);
+
+        this.render();
+        this.toast('Modifier copied', 'success');
+      },
+
+      // Move modifier to an item (as top-level modifier)
+      moveModifierToItem(draggedId, fromParentId, toItemId) {
+        this.saveState();
+        const fromArray = this.getParentModifiersArray(fromParentId);
+        if (!fromArray) return;
+
+        // Find target item
+        let targetItem = null;
+        for (const cat of this.menu.categories) {
+          targetItem = cat.items.find(i => i.id === toItemId);
+          if (targetItem) break;
+        }
+        if (!targetItem) return;
+
+        const draggedIdx = fromArray.findIndex(m => m.id === draggedId);
+        if (draggedIdx === -1) return;
+
+        // Remove from source
+        const [dragged] = fromArray.splice(draggedIdx, 1);
+
+        // Add to target item's modifiers
+        dragged.sortOrder = targetItem.modifiers.length;
+        targetItem.modifiers.push(dragged);
+
+        // Update sort orders
+        fromArray.forEach((m, i) => m.sortOrder = i);
+
+        this.render();
+        this.toast('Modifier moved to item', 'success');
+      },
+
+      // Copy modifier to an item (as top-level modifier)
+      copyModifierToItem(draggedId, fromParentId, toItemId) {
+        this.saveState();
+        const fromArray = this.getParentModifiersArray(fromParentId);
+        if (!fromArray) return;
+
+        // Find target item
+        let targetItem = null;
+        for (const cat of this.menu.categories) {
+          targetItem = cat.items.find(i => i.id === toItemId);
+          if (targetItem) break;
+        }
+        if (!targetItem) return;
+
+        const dragged = fromArray.find(m => m.id === draggedId);
+        if (!dragged) return;
+
+        // Clone with new IDs
+        const clone = this.cloneModifierDeep(dragged);
+        clone.sortOrder = targetItem.modifiers.length;
+
+        // Add to target item
+        targetItem.modifiers.push(clone);
+
+        this.render();
+        this.toast('Modifier copied to item', 'success');
+      },
+
+      // Update category
+      // Update category
+      updateCategory(categoryId, field, value) {
+        this.saveState();
+        const category = this.menu.categories.find(c => c.id === categoryId);
+        if (category) {
+          category[field] = value;
+          this.render();
+        }
+      },
+
+      // Update item
+      updateItem(categoryId, itemId, field, value) {
+        this.saveState();
+        const category = this.menu.categories.find(c => c.id === categoryId);
+        if (category) {
+          const item = category.items.find(i => i.id === itemId);
+          if (item) {
+            item[field] = value;
+            this.render();
+          }
+        }
+      },
+
+      // Move item to category
+      moveItemToCategory(itemId, newCategoryId) {
+        this.saveState();
+
+        // Find and remove item from current category
+        let item = null;
+        for (const cat of this.menu.categories) {
+          const idx = cat.items.findIndex(i => i.id === itemId);
+          if (idx !== -1) {
+            item = cat.items.splice(idx, 1)[0];
+            break;
+          }
+        }
+
+        // Add to new category
+        if (item) {
+          const newCat = this.menu.categories.find(c => c.id === newCategoryId);
+          if (newCat) {
+            item.sortOrder = newCat.items.length;
+            newCat.items.push(item);
+          }
+        }
+
+        this.render();
+      },
+
+      // Reorder item within same category (drag and drop)
+      reorderItemInCategory(draggedItemId, targetItemId, position = 'before') {
+        // Find the category containing these items
+        for (const cat of this.menu.categories) {
+          const draggedIdx = cat.items.findIndex(i => i.id === draggedItemId);
+          const targetIdx = cat.items.findIndex(i => i.id === targetItemId);
+          
+          if (draggedIdx !== -1 && targetIdx !== -1 && draggedIdx !== targetIdx) {
+            this.saveState();
+            // Remove dragged item
+            const [draggedItem] = cat.items.splice(draggedIdx, 1);
+            // Find new target index (it may have shifted)
+            const newTargetIdx = cat.items.findIndex(i => i.id === targetItemId);
+            // Insert at new position
+            const insertIdx = position === 'before' ? newTargetIdx : newTargetIdx + 1;
+            cat.items.splice(insertIdx, 0, draggedItem);
+            // Update sortOrder for all items
+            cat.items.forEach((item, idx) => item.sortOrder = idx);
+            this.render();
+            return;
+          }
+        }
+      },
+
+      // Reorder category (drag and drop)
+      reorderCategory(draggedCatId, targetCatId, position = 'before') {
+        const draggedIdx = this.menu.categories.findIndex(c => c.id === draggedCatId);
+        const targetIdx = this.menu.categories.findIndex(c => c.id === targetCatId);
+        
+        if (draggedIdx !== -1 && targetIdx !== -1 && draggedIdx !== targetIdx) {
+          this.saveState();
+          const [draggedCat] = this.menu.categories.splice(draggedIdx, 1);
+          const newTargetIdx = this.menu.categories.findIndex(c => c.id === targetCatId);
+          const insertIdx = position === 'before' ? newTargetIdx : newTargetIdx + 1;
+          this.menu.categories.splice(insertIdx, 0, draggedCat);
+          this.render();
+        }
+      },
+
+      // Delete category
+      deleteCategory(categoryId) {
+        if (!confirm('Delete this category and all its items?')) return;
+        this.saveState();
+        this.menu.categories = this.menu.categories.filter(c => c.id !== categoryId);
+        this.clearSelection();
+        this.render();
+        this.toast('Category deleted', 'success');
+      },
+
+      // Delete item
+      deleteItem(categoryId, itemId) {
+        if (!confirm('Delete this item?')) return;
+        this.saveState();
+        const category = this.menu.categories.find(c => c.id === categoryId);
+        if (category) {
+          category.items = category.items.filter(i => i.id !== itemId);
+        }
+        this.clearSelection();
+        this.render();
+        this.toast('Item deleted', 'success');
+      },
+
+      // Clone selected
+      cloneSelected() {
+        if (!this.selectedData) return;
+        this.saveState();
+
+        if (this.selectedData.type === 'category') {
+          const original = this.selectedData.data;
+          const clone = JSON.parse(JSON.stringify(original));
+          clone.id = this.generateId();
+          clone.name = original.name + ' (Copy)';
+          clone.items.forEach(item => {
+            item.id = this.generateId();
+            item.modifiers.forEach(mod => mod.id = this.generateId());
+          });
+          this.menu.categories.push(clone);
+        } else if (this.selectedData.type === 'item') {
+          const original = this.selectedData.data;
+          const category = this.selectedData.category;
+          const clone = JSON.parse(JSON.stringify(original));
+          clone.id = this.generateId();
+          clone.name = original.name + ' (Copy)';
+          clone.modifiers.forEach(mod => mod.id = this.generateId());
+          category.items.push(clone);
+        }
+
+        this.render();
+        this.toast('Cloned', 'success');
+      },
+
+      // Delete selected
+      deleteSelected() {
+        if (!this.selectedData) return;
+
+        if (this.selectedData.type === 'category') {
+          this.deleteCategory(this.selectedData.data.id);
+        } else if (this.selectedData.type === 'item') {
+          this.deleteItem(this.selectedData.category.id, this.selectedData.data.id);
+        }
+      },
+
+      // Edit selected
+      editSelected() {
+        if (!this.selectedElement) return;
+        // Focus on the name input in properties panel
+        const nameInput = document.getElementById('propCatName') || document.getElementById('propItemName');
+        if (nameInput) {
+          nameInput.focus();
+          nameInput.select();
+        }
+      },
+
+      // Move up
+      moveUp() {
+        if (!this.selectedData) return;
+        this.saveState();
+
+        if (this.selectedData.type === 'category') {
+          const idx = this.menu.categories.findIndex(c => c.id === this.selectedData.data.id);
+          if (idx > 0) {
+            [this.menu.categories[idx - 1], this.menu.categories[idx]] =
+            [this.menu.categories[idx], this.menu.categories[idx - 1]];
+          }
+        } else if (this.selectedData.type === 'item') {
+          const items = this.selectedData.category.items;
+          const idx = items.findIndex(i => i.id === this.selectedData.data.id);
+          if (idx > 0) {
+            [items[idx - 1], items[idx]] = [items[idx], items[idx - 1]];
+          }
+        }
+
+        this.render();
+        this.selectElementById(this.selectedData.type, this.selectedData.data.id);
+      },
+
+      // Move down
+      moveDown() {
+        if (!this.selectedData) return;
+        this.saveState();
+
+        if (this.selectedData.type === 'category') {
+          const idx = this.menu.categories.findIndex(c => c.id === this.selectedData.data.id);
+          if (idx < this.menu.categories.length - 1) {
+            [this.menu.categories[idx], this.menu.categories[idx + 1]] =
+            [this.menu.categories[idx + 1], this.menu.categories[idx]];
+          }
+        } else if (this.selectedData.type === 'item') {
+          const items = this.selectedData.category.items;
+          const idx = items.findIndex(i => i.id === this.selectedData.data.id);
+          if (idx < items.length - 1) {
+            [items[idx], items[idx + 1]] = [items[idx + 1], items[idx]];
+          }
+        }
+
+        this.render();
+        this.selectElementById(this.selectedData.type, this.selectedData.data.id);
+      },
+
+      // Create photo task
+      createPhotoTask(itemId = null) {
+        const id = itemId || (this.selectedData?.type === 'item' ? this.selectedData.data.id : null);
+        if (!id) {
+          this.toast('Select an item first', 'error');
+          return;
+        }
+
+        // Find item
+        let item = null;
+        for (const cat of this.menu.categories) {
+          const found = cat.items.find(i => i.id === id);
+          if (found) {
+            item = found;
+            break;
+          }
+        }
+
+        if (!item) return;
+
+        document.getElementById('modalTitle').textContent = 'Create Photo Task';
+        document.getElementById('modalBody').innerHTML = `
+          <form id="photoTaskForm" class="form">
+            <div class="form-group">
+              <label>Item</label>
+              <input type="text" class="form-input" value="${this.escapeHtml(item.name)}" disabled>
+            </div>
+            <div class="form-group">
+              <label>Task Type</label>
+              <select id="taskType" class="form-select">
+                <option value="employee">Employee Task</option>
+                <option value="user">User Participation (earn PYT)</option>
+              </select>
+            </div>
+            <div class="form-group" id="pytRewardGroup" style="display: none;">
+              <label>PYT Reward</label>
+              <input type="number" id="pytReward" class="form-input" value="10" min="1" max="100">
+              <small style="color: var(--gray-500);">Tokens rewarded for approved photo</small>
+            </div>
+            <div class="form-group">
+              <label>Instructions (optional)</label>
+              <textarea id="taskInstructions" class="form-textarea" rows="3"
+                placeholder="e.g., Photo should show the full plate with garnish visible"></textarea>
+            </div>
+            <button type="submit" class="btn btn-primary">Create Task</button>
+          </form>
+        `;
+        this.showModal();
+
+        document.getElementById('taskType').addEventListener('change', (e) => {
+          document.getElementById('pytRewardGroup').style.display =
+            e.target.value === 'user' ? 'block' : 'none';
+        });
+
+        document.getElementById('photoTaskForm').addEventListener('submit', async (e) => {
+          e.preventDefault();
+          await this.submitPhotoTask(item.id);
+        });
+      },
+
+      // Submit photo task
+      async submitPhotoTask(itemId) {
+        const taskType = document.getElementById('taskType').value;
+        const instructions = document.getElementById('taskInstructions').value;
+        const pytReward = taskType === 'user' ? parseInt(document.getElementById('pytReward').value) : 0;
+
+        try {
+          const response = await fetch(`${this.config.apiBaseUrl}/tasks/create.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              BusinessID: this.config.businessId,
+              ItemID: itemId,
+              TaskType: taskType === 'user' ? 'user_photo' : 'employee_photo',
+              Instructions: instructions,
+              PYTReward: pytReward
+            })
+          });
+
+          const data = await response.json();
+          if (data.OK) {
+            // Update item with task ID
+            for (const cat of this.menu.categories) {
+              const item = cat.items.find(i => i.id === itemId);
+              if (item) {
+                item.photoTaskId = data.TASK_ID;
+                break;
+              }
+            }
+            this.closeModal();
+            this.render();
+            this.toast('Photo task created!', 'success');
+          } else {
+            this.toast(data.ERROR || 'Failed to create task', 'error');
+          }
+        } catch (err) {
+          console.error('[MenuBuilder] Error creating task:', err);
+          // For demo, just mark as having a task
+          for (const cat of this.menu.categories) {
+            const item = cat.items.find(i => i.id === itemId);
+            if (item) {
+              item.photoTaskId = 'pending_' + Date.now();
+              break;
+            }
+          }
+          this.closeModal();
+          this.render();
+          this.toast('Photo task created (demo)', 'success');
+        }
+      },
+
+      // Upload photo
+      uploadPhoto(itemId) {
+        // Find the item and check it has a database ID
+        let targetItem = null;
+        for (const cat of this.menu.categories) {
+          const item = cat.items.find(i => i.id === itemId);
+          if (item) { targetItem = item; break; }
+        }
+        if (!targetItem || !targetItem.dbId) {
+          this.toast('Please save the menu first before uploading photos', 'error');
+          return;
+        }
+
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.accept = 'image/jpeg,image/png,image/gif,image/webp';
+        input.onchange = async (e) => {
+          const file = e.target.files[0];
+          if (!file) return;
+
+          const validTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
+          if (!validTypes.includes(file.type)) {
+            this.toast('Please select a valid image (JPG, PNG, GIF, or WebP)', 'error');
+            return;
+          }
+          if (file.size > 5 * 1024 * 1024) {
+            this.toast('Image must be under 5MB', 'error');
+            return;
+          }
+
+          this.toast('Uploading photo...', 'info');
+
+          try {
+            const formData = new FormData();
+            formData.append('photo', file);
+            formData.append('ItemID', targetItem.dbId);
+
+            const response = await fetch(`${this.config.apiBaseUrl}/menu/uploadItemPhoto.cfm`, {
+              method: 'POST',
+              body: formData,
+              credentials: 'include'
+            });
+
+            const data = await response.json();
+            if (data.OK) {
+              targetItem.imageUrl = data.IMAGEURL + '?t=' + Date.now();
+              this.render();
+              this.toast('Photo uploaded!', 'success');
+            } else {
+              this.toast(data.MESSAGE || 'Failed to upload photo', 'error');
+            }
+          } catch (err) {
+            console.error('Photo upload error:', err);
+            this.toast('Failed to upload photo', 'error');
+          }
+        };
+        input.click();
+      },
+
+      // Show import modal
+      showImportModal() {
+        document.getElementById('modalTitle').textContent = 'Import Menu JSON';
+        document.getElementById('modalBody').innerHTML = `
+          <form id="importForm" class="form">
+            <div class="form-group">
+              <label>Paste JSON data</label>
+              <textarea id="importData" class="form-textarea import-export-area"
+                placeholder='{"categories": [{"name": "...", "items": [...]}]}'></textarea>
+            </div>
+            <div style="display: flex; gap: 8px;">
+              <button type="button" class="btn btn-secondary" onclick="MenuBuilder.loadSampleMenu()">
+                Load Sample
+              </button>
+              <button type="submit" class="btn btn-primary">Import</button>
+            </div>
+          </form>
+        `;
+        this.showModal();
+
+        document.getElementById('importForm').addEventListener('submit', (e) => {
+          e.preventDefault();
+          this.importMenu();
+        });
+      },
+
+      // Import menu
+      importMenu() {
+        try {
+          const data = JSON.parse(document.getElementById('importData').value);
+          this.saveState();
+
+          // Handle different JSON formats
+          if (data.categories) {
+            this.menu = data;
+          } else if (Array.isArray(data)) {
+            // Array of categories
+            this.menu.categories = data.map((cat, i) => ({
+              id: this.generateId(),
+              name: cat.name || cat.category || `Category ${i + 1}`,
+              description: cat.description || '',
+              sortOrder: i,
+              items: (cat.items || cat.children || []).map((item, j) => ({
+                id: this.generateId(),
+                name: item.name || item.title || 'Item',
+                description: item.description || '',
+                price: parseFloat(item.price) || 0,
+                imageUrl: item.imageUrl || item.image || null,
+                photoTaskId: null,
+                modifiers: (item.modifiers || item.children || []).map((mod, k) => ({
+                  id: this.generateId(),
+                  name: mod.name || 'Modifier',
+                  price: parseFloat(mod.price) || 0,
+                  isDefault: mod.isDefault || mod.checked || false,
+                  sortOrder: k
+                })),
+                sortOrder: j
+              }))
+            }));
+          }
+
+          // Ensure all IDs are unique
+          this.menu.categories.forEach(cat => {
+            if (!cat.id || typeof cat.id === 'number') cat.id = this.generateId();
+            cat.items.forEach(item => {
+              if (!item.id || typeof item.id === 'number') item.id = this.generateId();
+              if (item.modifiers) {
+                item.modifiers.forEach(mod => {
+                  if (!mod.id || typeof mod.id === 'number') mod.id = this.generateId();
+                });
+              }
+            });
+          });
+
+          this.closeModal();
+          this.render();
+          this.toast(`Imported ${this.menu.categories.length} categories`, 'success');
+        } catch (err) {
+          console.error('[MenuBuilder] Import error:', err);
+          this.toast('Invalid JSON format', 'error');
+        }
+      },
+
+      // Load sample menu
+      loadSampleMenu() {
+        const sample = {
+          categories: [
+            {
+              name: "Appetizers",
+              description: "Start your meal right",
+              items: [
+                { name: "Hummus", description: "Classic chickpea dip with olive oil", price: 8.99 },
+                { name: "Falafel", description: "Crispy fried chickpea balls", price: 7.99 },
+                { name: "Baba Ganoush", description: "Smoky eggplant dip", price: 9.99 }
+              ]
+            },
+            {
+              name: "Entrees",
+              description: "Main dishes",
+              items: [
+                { name: "Chicken Shawarma", description: "Slow-roasted chicken with garlic sauce", price: 14.99 },
+                { name: "Lamb Kebab", description: "Grilled lamb skewers", price: 16.99 },
+                { name: "Mixed Grill", description: "Assortment of grilled meats", price: 22.99 }
+              ]
+            },
+            {
+              name: "Beverages",
+              description: "Drinks",
+              items: [
+                { name: "Mint Lemonade", description: "Fresh squeezed with mint", price: 4.99 },
+                { name: "Turkish Coffee", description: "Traditional preparation", price: 3.99 }
+              ]
+            }
+          ]
+        };
+        document.getElementById('importData').value = JSON.stringify(sample, null, 2);
+      },
+
+      // Show export modal
+      showExportModal() {
+        document.getElementById('modalTitle').textContent = 'Export Menu JSON';
+        document.getElementById('modalBody').innerHTML = `
+          <div class="form-group">
+            <label>Menu Data</label>
+            <textarea id="exportData" class="form-textarea import-export-area" readonly>${JSON.stringify(this.menu, null, 2)}</textarea>
+          </div>
+          <div style="display: flex; gap: 8px;">
+            <button class="btn btn-secondary" onclick="MenuBuilder.copyExport()">
+              Copy to Clipboard
+            </button>
+            <button class="btn btn-primary" onclick="MenuBuilder.downloadExport()">
+              Download JSON
+            </button>
+          </div>
+        `;
+        this.showModal();
+      },
+
+      // Copy export
+      copyExport() {
+        const textarea = document.getElementById('exportData');
+        textarea.select();
+        document.execCommand('copy');
+        this.toast('Copied to clipboard', 'success');
+      },
+
+      // Download export
+      downloadExport() {
+        const data = document.getElementById('exportData').value;
+        const blob = new Blob([data], { type: 'application/json' });
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = 'menu-export.json';
+        a.click();
+        URL.revokeObjectURL(url);
+      },
+
+      // Show outline modal - full menu in hierarchical text format
+      showOutlineModal() {
+        document.getElementById('modalTitle').textContent = 'Menu Outline';
+
+        let outline = '';
+        const categories = this.menu.categories || [];
+
+        if (categories.length === 0) {
+          outline = '<div style="color: var(--gray-500); text-align: center; padding: 40px;">No menu items yet</div>';
+        } else {
+          outline = '<div class="menu-outline">';
+
+          for (const cat of categories) {
+            outline += `<div class="outline-category">${this.escapeHtml(cat.name)}</div>`;
+
+            const items = cat.items || [];
+            for (const item of items) {
+              const itemPrice = item.price ? `$${parseFloat(item.price).toFixed(2)}` : '';
+              outline += `<div class="outline-item">${this.escapeHtml(item.name)}${itemPrice ? ' <span class="outline-price">' + itemPrice + '</span>' : ''}</div>`;
+
+              // Render modifiers recursively
+              outline += this.renderOutlineModifiers(item.modifiers || [], 2);
+            }
+          }
+
+          outline += '</div>';
+        }
+
+        document.getElementById('modalBody').innerHTML = `
+          <style>
+            .menu-outline {
+              font-family: monospace;
+              font-size: 13px;
+              line-height: 1.6;
+              max-height: 60vh;
+              overflow-y: auto;
+              padding: 16px;
+              background: var(--bg-secondary);
+              border-radius: 8px;
+            }
+            .outline-category {
+              font-weight: bold;
+              font-size: 15px;
+              color: var(--primary);
+              margin-top: 16px;
+              margin-bottom: 4px;
+              text-transform: uppercase;
+            }
+            .outline-category:first-child {
+              margin-top: 0;
+            }
+            .outline-item {
+              padding-left: 20px;
+              color: var(--text-primary);
+            }
+            .outline-modifier {
+              color: var(--text-muted);
+            }
+            .outline-price {
+              color: var(--success);
+            }
+            .outline-modifier .outline-price {
+              color: var(--warning);
+            }
+          </style>
+          ${outline}
+        `;
+        this.showModal();
+      },
+
+      // Helper to render modifiers recursively for outline
+      renderOutlineModifiers(modifiers, depth) {
+        if (!modifiers || modifiers.length === 0) return '';
+
+        let html = '';
+        const indent = '\u00A0\u00A0\u00A0\u00A0'.repeat(depth); // non-breaking spaces for indent
+
+        for (const mod of modifiers) {
+          const modPrice = mod.price ? `+$${parseFloat(mod.price).toFixed(2)}` : '';
+          html += `<div class="outline-modifier" style="padding-left: ${depth * 20}px;">${indent.substring(0, 4)}${this.escapeHtml(mod.name)}${modPrice ? ' <span class="outline-price">' + modPrice + '</span>' : ''}</div>`;
+
+          // Recurse into nested options
+          if (mod.options && mod.options.length > 0) {
+            html += this.renderOutlineModifiers(mod.options, depth + 1);
+          }
+        }
+
+        return html;
+      },
+
+      // Upload header image (1200x400)
+      uploadHeader() {
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.accept = 'image/jpeg,image/png,image/gif,image/webp';
+        input.onchange = async (e) => {
+          const file = e.target.files[0];
+          if (!file) return;
+
+          // Validate file type
+          const validTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'];
+          if (!validTypes.includes(file.type)) {
+            this.toast('Please select a valid image (JPG, PNG, GIF, or WebP)', 'error');
+            return;
+          }
+
+          // Validate file size (max 5MB)
+          if (file.size > 5 * 1024 * 1024) {
+            this.toast('Image must be under 5MB', 'error');
+            return;
+          }
+
+          // Show loading toast
+          this.toast('Uploading header...', 'info');
+
+          try {
+            const formData = new FormData();
+            formData.append('header', file);
+            formData.append('BusinessID', this.config.businessId);
+
+            const response = await fetch(`${this.config.apiBaseUrl}/menu/uploadHeader.cfm`, {
+              method: 'POST',
+              body: formData,
+              credentials: 'include'
+            });
+
+            const data = await response.json();
+            if (data.OK) {
+              this.toast('Header uploaded successfully! Recommended size: 600x200 JPG', 'success');
+            } else {
+              this.toast(data.MESSAGE || 'Failed to upload header', 'error');
+            }
+          } catch (err) {
+            console.error('Header upload error:', err);
+            this.toast('Failed to upload header', 'error');
+          }
+        };
+        input.click();
+      },
+
+      // Show brand color picker modal
+      showBrandColorPicker() {
+        const currentColor = this.brandColor || '#1B4D3E';
+        document.getElementById('modalTitle').textContent = 'Brand Color';
+        document.getElementById('modalBody').innerHTML = `
+          <p style="margin-bottom: 16px; color: var(--text-muted);">
+            This color is used for the category bar gradients in the customer app.
+          </p>
+          <div style="display: flex; align-items: center; gap: 16px; margin-bottom: 16px;">
+            <input type="color" id="brandColorInput" value="${currentColor}"
+              style="width: 60px; height: 40px; border: none; cursor: pointer; border-radius: 4px;">
+            <input type="text" id="brandColorHex" value="${currentColor}"
+              style="width: 100px; padding: 8px; border: 1px solid var(--border); border-radius: 4px; font-family: monospace;"
+              pattern="^#[0-9A-Fa-f]{6}$" maxlength="7">
+            <div id="brandColorPreview" style="flex: 1; height: 40px; border-radius: 4px; background: linear-gradient(to bottom, ${currentColor}44, ${currentColor}00, ${currentColor}66);"></div>
+          </div>
+          <div style="display: flex; gap: 8px; flex-wrap: wrap; margin-bottom: 16px;">
+            <button type="button" class="color-preset" data-color="#1B4D3E" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #1B4D3E;" title="Forest Green (Default)"></button>
+            <button type="button" class="color-preset" data-color="#2C3E50" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #2C3E50;" title="Midnight Blue"></button>
+            <button type="button" class="color-preset" data-color="#8B4513" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #8B4513;" title="Saddle Brown"></button>
+            <button type="button" class="color-preset" data-color="#800020" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #800020;" title="Burgundy"></button>
+            <button type="button" class="color-preset" data-color="#1A1A2E" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #1A1A2E;" title="Dark Navy"></button>
+            <button type="button" class="color-preset" data-color="#4A0E4E" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #4A0E4E;" title="Deep Purple"></button>
+            <button type="button" class="color-preset" data-color="#CC5500" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #CC5500;" title="Burnt Orange"></button>
+            <button type="button" class="color-preset" data-color="#355E3B" style="width: 32px; height: 32px; border-radius: 4px; border: 2px solid transparent; cursor: pointer; background: #355E3B;" title="Hunter Green"></button>
+          </div>
+          <div style="display: flex; gap: 8px; justify-content: flex-end;">
+            <button type="button" class="btn btn-secondary" onclick="MenuBuilder.closeModal()">Cancel</button>
+            <button type="button" class="btn btn-primary" onclick="MenuBuilder.saveBrandColor()">Save Color</button>
+          </div>
+        `;
+        this.showModal();
+
+        // Wire up color picker sync
+        const colorInput = document.getElementById('brandColorInput');
+        const hexInput = document.getElementById('brandColorHex');
+        const preview = document.getElementById('brandColorPreview');
+
+        const updatePreview = (color) => {
+          preview.style.background = `linear-gradient(to bottom, ${color}44, ${color}00, ${color}66)`;
+        };
+
+        colorInput.addEventListener('input', (e) => {
+          hexInput.value = e.target.value.toUpperCase();
+          updatePreview(e.target.value);
+        });
+
+        hexInput.addEventListener('input', (e) => {
+          let val = e.target.value;
+          if (!val.startsWith('#')) val = '#' + val;
+          if (/^#[0-9A-Fa-f]{6}$/.test(val)) {
+            colorInput.value = val;
+            updatePreview(val);
+          }
+        });
+
+        // Preset buttons
+        document.querySelectorAll('.color-preset').forEach(btn => {
+          btn.addEventListener('click', () => {
+            const color = btn.dataset.color;
+            colorInput.value = color;
+            hexInput.value = color;
+            updatePreview(color);
+          });
+        });
+      },
+
+      // Save brand color
+      async saveBrandColor() {
+        const color = document.getElementById('brandColorHex').value.toUpperCase();
+        if (!/^#[0-9A-Fa-f]{6}$/.test(color)) {
+          this.toast('Invalid color format. Use #RRGGBB', 'error');
+          return;
+        }
+
+        try {
+          const response = await fetch(`${this.config.apiBaseUrl}/businesses/saveBrandColor.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ BusinessID: this.config.businessId, BrandColor: color })
+          });
+          const data = await response.json();
+          if (data.OK) {
+            this.brandColor = color;
+            document.getElementById('brandColorSwatch').style.background = color;
+            this.closeModal();
+            this.toast('Brand color saved!', 'success');
+          } else {
+            this.toast(data.MESSAGE || 'Failed to save color', 'error');
+          }
+        } catch (err) {
+          console.error('Save brand color error:', err);
+          this.toast('Failed to save color', 'error');
+        }
+      },
+
+      // Load menu from API
+      async loadMenu(menuId = null) {
+        try {
+          // Use provided menuId or current selected
+          const loadMenuId = menuId !== null ? menuId : this.selectedMenuId;
+          console.log('[MenuBuilder] Loading menu for BusinessID:', this.config.businessId, 'MenuID:', loadMenuId);
+
+          const payload = { BusinessID: this.config.businessId };
+          if (loadMenuId > 0) {
+            payload.MenuID = loadMenuId;
+          }
+
+          const response = await fetch(`${this.config.apiBaseUrl}/menu/getForBuilder.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(payload)
+          });
+          console.log('[MenuBuilder] Response status:', response.status);
+          const data = await response.json();
+          console.log('[MenuBuilder] Response data:', data);
+          console.log('[MenuBuilder] CATEGORY_COUNT:', data.CATEGORY_COUNT);
+          console.log('[MenuBuilder] ITEM_COUNT:', data.ITEM_COUNT);
+          if (data.OK && data.MENU) {
+            this.menu = data.MENU;
+            console.log('[MenuBuilder] Menu categories:', this.menu.categories?.length || 0);
+
+            // Store menus list and update selector
+            this.menus = data.MENUS || [];
+            this.selectedMenuId = data.SELECTED_MENU_ID || 0;
+            this.updateMenuSelector();
+
+            // Store templates from API (default to empty array if not provided)
+            this.templates = data.TEMPLATES || [];
+            // Load brand color if set
+            if (data.BRANDCOLOR && data.BRANDCOLOR.length > 0) {
+              this.brandColor = data.BRANDCOLOR;
+              const swatch = document.getElementById('brandColorSwatch');
+              if (swatch) swatch.style.background = data.BRANDCOLOR;
+            }
+            this.renderTemplateLibrary();
+            this.render();
+          } else {
+            console.log('[MenuBuilder] No MENU in response or OK=false');
+            // Still clear the loading message
+            this.templates = [];
+            this.menus = data.MENUS || [];
+            this.updateMenuSelector();
+            this.renderTemplateLibrary();
+          }
+        } catch (err) {
+          console.error('[MenuBuilder] Error loading menu:', err);
+          // Clear loading message on error
+          this.templates = [];
+          this.renderTemplateLibrary();
+        }
+      },
+
+      // Update menu selector dropdown
+      updateMenuSelector() {
+        const selector = document.getElementById('menuSelector');
+        if (!selector) return;
+
+        let options = '<option value="0">All Menus</option>';
+        for (const menu of this.menus) {
+          const selected = menu.MenuID === this.selectedMenuId ? 'selected' : '';
+          options += `<option value="${menu.MenuID}" ${selected}>${this.escapeHtml(menu.MenuName)}</option>`;
+        }
+        selector.innerHTML = options;
+      },
+
+      // Handle menu selection change
+      async onMenuSelect(menuId) {
+        this.selectedMenuId = parseInt(menuId) || 0;
+        await this.loadMenu(this.selectedMenuId);
+      },
+
+      // Show menu manager modal
+      showMenuManager() {
+        const content = `
+          <div style="display: flex; flex-direction: column; gap: 16px;">
+            <div style="display: flex; justify-content: space-between; align-items: center;">
+              <h4 style="margin: 0;">Your Menus</h4>
+              <button class="btn btn-sm btn-primary" onclick="MenuBuilder.showCreateMenuForm()">+ Add Menu</button>
+            </div>
+            <div id="menuManagerList" style="display: flex; flex-direction: column; gap: 8px;">
+              ${this.menus.length === 0 ? '<p style="color: var(--gray-500); text-align: center;">No menus created yet. Click "Add Menu" to create one.</p>' : ''}
+              ${this.menus.map(menu => `
+                <div style="display: flex; align-items: center; gap: 12px; padding: 12px; background: var(--gray-50); border-radius: 8px;">
+                  <div style="flex: 1;">
+                    <div style="font-weight: 600;">${this.escapeHtml(menu.MenuName)}</div>
+                    <div style="font-size: 12px; color: var(--gray-500);">
+                      ${menu.MenuStartTime && menu.MenuEndTime ? `${menu.MenuStartTime} - ${menu.MenuEndTime}` : 'All day'}
+                      · ${this.formatDaysActive(menu.MenuDaysActive)}
+                    </div>
+                  </div>
+                  <button class="btn btn-sm btn-secondary" onclick="MenuBuilder.editMenu(${menu.MenuID})">Edit</button>
+                  <button class="btn btn-sm btn-danger" onclick="MenuBuilder.deleteMenu(${menu.MenuID})">Delete</button>
+                </div>
+              `).join('')}
+            </div>
+            <div id="menuFormContainer" style="display: none; padding: 16px; background: var(--gray-50); border-radius: 8px;">
+              <h4 id="menuFormTitle" style="margin: 0 0 16px 0;">Create Menu</h4>
+              <input type="hidden" id="editMenuId" value="0">
+              <div class="property-field">
+                <label>Menu Name</label>
+                <input type="text" id="menuNameInput" placeholder="e.g., Lunch Menu, Happy Hour">
+              </div>
+              <div class="property-field">
+                <label>Description (optional)</label>
+                <input type="text" id="menuDescInput" placeholder="Brief description">
+              </div>
+              <div style="display: flex; gap: 12px;">
+                <div class="property-field" style="flex: 1;">
+                  <label>Start Time</label>
+                  <input type="time" id="menuStartInput">
+                </div>
+                <div class="property-field" style="flex: 1;">
+                  <label>End Time</label>
+                  <input type="time" id="menuEndInput">
+                </div>
+              </div>
+              <div class="property-field">
+                <label>Active Days</label>
+                <div style="display: flex; flex-wrap: wrap; gap: 8px;">
+                  ${['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'].map((day, i) => `
+                    <label style="display: flex; align-items: center; gap: 4px; cursor: pointer;">
+                      <input type="checkbox" class="menuDayCheck" data-day="${1 << i}" checked>
+                      ${day}
+                    </label>
+                  `).join('')}
+                </div>
+              </div>
+              <div style="display: flex; gap: 8px; margin-top: 16px;">
+                <button class="btn btn-primary" onclick="MenuBuilder.saveMenuForm()">Save</button>
+                <button class="btn btn-secondary" onclick="MenuBuilder.cancelMenuForm()">Cancel</button>
+              </div>
+            </div>
+          </div>
+        `;
+        document.getElementById('modalTitle').textContent = 'Manage Menus';
+        document.getElementById('modalBody').innerHTML = content;
+        this.showModal();
+      },
+
+      // Format days active bitmask to readable string
+      formatDaysActive(bitmask) {
+        if (bitmask === 127) return 'Every day';
+        const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+        const active = [];
+        for (let i = 0; i < 7; i++) {
+          if (bitmask & (1 << i)) active.push(days[i]);
+        }
+        return active.join(', ') || 'No days';
+      },
+
+      showCreateMenuForm() {
+        document.getElementById('menuFormContainer').style.display = 'block';
+        document.getElementById('menuFormTitle').textContent = 'Create Menu';
+        document.getElementById('editMenuId').value = '0';
+        document.getElementById('menuNameInput').value = '';
+        document.getElementById('menuDescInput').value = '';
+        document.getElementById('menuStartInput').value = '';
+        document.getElementById('menuEndInput').value = '';
+        document.querySelectorAll('.menuDayCheck').forEach(cb => cb.checked = true);
+      },
+
+      cancelMenuForm() {
+        document.getElementById('menuFormContainer').style.display = 'none';
+      },
+
+      async editMenu(menuId) {
+        const menu = this.menus.find(m => m.MenuID === menuId);
+        if (!menu) return;
+
+        document.getElementById('menuFormContainer').style.display = 'block';
+        document.getElementById('menuFormTitle').textContent = 'Edit Menu';
+        document.getElementById('editMenuId').value = menuId;
+        document.getElementById('menuNameInput').value = menu.MenuName;
+        document.getElementById('menuDescInput').value = menu.MenuDescription || '';
+        document.getElementById('menuStartInput').value = menu.MenuStartTime || '';
+        document.getElementById('menuEndInput').value = menu.MenuEndTime || '';
+
+        document.querySelectorAll('.menuDayCheck').forEach(cb => {
+          const day = parseInt(cb.dataset.day);
+          cb.checked = (menu.MenuDaysActive & day) !== 0;
+        });
+      },
+
+      async saveMenuForm() {
+        const menuId = parseInt(document.getElementById('editMenuId').value) || 0;
+        const menuName = document.getElementById('menuNameInput').value.trim();
+        const menuDesc = document.getElementById('menuDescInput').value.trim();
+        const menuStart = document.getElementById('menuStartInput').value;
+        const menuEnd = document.getElementById('menuEndInput').value;
+
+        let daysActive = 0;
+        document.querySelectorAll('.menuDayCheck').forEach(cb => {
+          if (cb.checked) daysActive |= parseInt(cb.dataset.day);
+        });
+
+        if (!menuName) {
+          this.toast('Menu name is required', 'error');
+          return;
+        }
+
+        try {
+          const response = await fetch(`${this.config.apiBaseUrl}/menu/menus.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              BusinessID: this.config.businessId,
+              action: 'save',
+              MenuID: menuId,
+              MenuName: menuName,
+              MenuDescription: menuDesc,
+              MenuStartTime: menuStart,
+              MenuEndTime: menuEnd,
+              MenuDaysActive: daysActive
+            })
+          });
+          const data = await response.json();
+          if (data.OK) {
+            if (data.ACTION === 'created') {
+              // New menu — store context and redirect to wizard to populate it
+              sessionStorage.setItem('payfrit_wizard_menu', JSON.stringify({
+                businessId: this.config.businessId,
+                menuId: data.MenuID,
+                menuName: menuName
+              }));
+              window.location.href = `${BASE_PATH}/portal/setup-wizard.html`;
+              return;
+            }
+            this.toast(`Menu ${data.ACTION}!`, 'success');
+            this.closeModal();
+            await this.loadMenu();
+          } else {
+            this.toast(data.MESSAGE || 'Failed to save menu', 'error');
+          }
+        } catch (err) {
+          this.toast('Error saving menu', 'error');
+        }
+      },
+
+      async deleteMenu(menuId) {
+        if (!confirm('Are you sure you want to delete this menu? Categories in this menu will become unassigned.')) {
+          return;
+        }
+
+        try {
+          const response = await fetch(`${this.config.apiBaseUrl}/menu/menus.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              BusinessID: this.config.businessId,
+              action: 'delete',
+              MenuID: menuId
+            })
+          });
+          const data = await response.json();
+          if (data.OK) {
+            this.toast('Menu deleted', 'success');
+            this.closeModal();
+            await this.loadMenu();
+          } else {
+            this.toast(data.MESSAGE || 'Failed to delete menu', 'error');
+          }
+        } catch (err) {
+          this.toast('Error deleting menu', 'error');
+        }
+      },
+
+      // Render template library in sidebar
+      renderTemplateLibrary() {
+        const container = document.getElementById('templateLibrary');
+        if (!container || !this.templates) return;
+
+        if (this.templates.length === 0) {
+          container.innerHTML = '<div style="color: var(--gray-500); font-size: 13px; padding: 8px;">No templates yet</div>';
+          return;
+        }
+
+        container.innerHTML = this.templates.map(tmpl => `
+          <div class="palette-item template-item" draggable="true" data-type="template" data-template-id="${tmpl.dbId}">
+            <div class="icon">📋</div>
+            <div>
+              <div class="label">${this.escapeHtml(tmpl.name)}</div>
+              <div class="hint">${tmpl.options ? tmpl.options.length : 0} options</div>
+            </div>
+          </div>
+        `).join('');
+
+        // Update template count stat
+        const statEl = document.getElementById('statTemplates');
+        if (statEl) statEl.textContent = this.templates.length;
+      },
+
+      // Save menu to API
+      async saveMenu() {
+        try {
+          console.log('[MenuBuilder] Saving menu...');
+          console.log('[MenuBuilder] BusinessID:', this.config.businessId);
+
+          // Debug: Find and log the specific option we're testing
+          for (const cat of this.menu.categories) {
+            for (const item of cat.items) {
+              for (const mod of (item.modifiers || [])) {
+                if (mod.name === 'Select Drink') {
+                  console.log('[MenuBuilder] Select Drink modifier at save time:', JSON.stringify(mod, null, 2));
+                }
+              }
+            }
+          }
+          console.log('[MenuBuilder] Menu data:', JSON.stringify(this.menu, null, 2));
+
+          // Deep clone menu and strip base64 data URLs to avoid huge payloads
+          const menuClone = JSON.parse(JSON.stringify(this.menu));
+          for (const cat of menuClone.categories) {
+            for (const item of (cat.items || [])) {
+              if (item.imageUrl && item.imageUrl.startsWith('data:')) {
+                item.imageUrl = null;
+              }
+            }
+          }
+
+          const payload = {
+            BusinessID: this.config.businessId,
+            Menu: menuClone
+          };
+          console.log('[MenuBuilder] Full payload:', JSON.stringify(payload, null, 2));
+
+          const response = await fetch(`${this.config.apiBaseUrl}/menu/saveFromBuilder.cfm`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(payload)
+          });
+
+          console.log('[MenuBuilder] Response status:', response.status);
+          const responseText = await response.text();
+          console.log('[MenuBuilder] Raw response:', responseText);
+
+          let data;
+          try {
+            data = JSON.parse(responseText);
+          } catch (parseErr) {
+            console.error('[MenuBuilder] Failed to parse response as JSON:', parseErr);
+            this.toast('Server returned invalid response', 'error');
+            return;
+          }
+
+          console.log('[MenuBuilder] Parsed response:', data);
+
+          if (data.OK) {
+            this.toast('Menu saved successfully!', 'success');
+            // Reload menu to get updated dbIds
+            await this.loadMenu();
+          } else {
+            console.error('[MenuBuilder] Save failed:', data.ERROR, data.DETAIL);
+            this.toast(data.ERROR || 'Failed to save', 'error');
+          }
+        } catch (err) {
+          console.error('[MenuBuilder] Save error:', err);
+          this.toast('Error saving menu: ' + err.message, 'error');
+        }
+      },
+
+      // Recursive function to render modifiers/options at any depth
+      renderModifiers(modifiers, parentItemId, depth) {
+        if (!modifiers || modifiers.length === 0) return '';
+
+        const indent = 16 + (depth * 16); // Progressive indentation
+        const iconSize = Math.max(24, 32 - (depth * 4)); // Smaller icons for deeper levels
+        const icons = ['⚙️', '🔘', '◉', '•']; // Different icons for different levels
+        const icon = icons[Math.min(depth - 1, icons.length - 1)];
+
+        return modifiers.map(mod => {
+          const hasOptions = mod.options && mod.options.length > 0;
+          const modExpanded = this.expandedModifierIds.has(mod.id);
+          return `
+            <div class="item-card modifier depth-${depth} ${modExpanded ? 'expanded' : ''}"
+              data-modifier-id="${mod.id}" data-parent-id="${parentItemId}" data-depth="${depth}"
+              draggable="true"
+              style="margin-left: ${indent}px;"
+              onclick="event.stopPropagation(); MenuBuilder.selectOption('${parentItemId}', '${mod.id}', ${depth})">
+              ${hasOptions ? `
+              <div class="item-toggle ${modExpanded ? 'expanded' : ''}" onclick="event.stopPropagation(); MenuBuilder.toggleModifier('${mod.id}')">
+                <svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                  <path d="M9 18l6-6-6-6"/>
+                </svg>
+              </div>
+              ` : ''}
+              <div class="drag-handle">
+                <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
+                  <circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/>
+                  <circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/>
+                  <circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/>
+                </svg>
+              </div>
+              <div class="item-image" style="width: ${iconSize}px; height: ${iconSize}px; font-size: ${iconSize/2}px;">${icon}</div>
+              <div class="item-info" onclick="event.stopPropagation(); ${hasOptions ? `MenuBuilder.toggleModifier('${mod.id}')` : `MenuBuilder.selectOption('${parentItemId}', '${mod.id}', ${depth})`}" style="cursor: pointer;">
+                <div class="item-name">${this.escapeHtml(mod.name)}</div>
+                <div class="item-meta">
+                  ${mod.price > 0 ? `<span>+$${mod.price.toFixed(2)}</span>` : ''}
+                  ${mod.isDefault ? '<span class="item-type-badge">Default</span>' : ''}
+                  ${mod.requiresSelection ? '<span class="item-type-badge" style="background: #dc3545; color: white;">Required</span>' : ''}
+                  ${mod.maxSelections > 0 ? `<span class="item-type-badge">Max ${mod.maxSelections}</span>` : ''}
+                  ${hasOptions ? `<span class="item-type-badge">${mod.options.length} options</span>` : ''}
+                </div>
+              </div>
+              <div class="item-actions">
+                <button onclick="event.stopPropagation(); MenuBuilder.deleteOption('${parentItemId}', '${mod.id}', ${depth})" title="Delete">
+                  <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                    <path d="M18 6L6 18M6 6l12 12"/>
+                  </svg>
+                </button>
+              </div>
+            </div>
+            ${hasOptions && modExpanded ? this.renderModifiers(mod.options, mod.id, depth + 1) : ''}
+          `;
+        }).join('');
+      },
+
+      // Render menu structure
+      // Render menu structure
+      render() {
+        const container = document.getElementById('menuStructure');
+
+        if (this.menu.categories.length === 0) {
+          container.innerHTML = `
+            <div class="empty-canvas" id="emptyCanvas">
+              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
+                <path d="M3 6h18M3 12h18M3 18h18"/>
+              </svg>
+              <h3>Start Building Your Menu</h3>
+              <p>Drag categories and items from the left panel, or click the buttons above to add them.</p>
+            </div>
+          `;
+          return;
+        }
+
+        container.innerHTML = this.menu.categories.map(category => {
+          const isExpanded = this.expandedCategoryId === category.id;
+          return `
+          <div class="category-card" data-category-id="${category.id}" draggable="true"
+            onclick="MenuBuilder.selectElement(this)">
+            <div class="category-header">
+              <div class="category-toggle ${isExpanded ? 'expanded' : ''}" onclick="event.stopPropagation(); MenuBuilder.toggleCategory('${category.id}')">
+                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                  <path d="M9 18l6-6-6-6"/>
+                </svg>
+              </div>
+              <div class="drag-handle">
+                <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                  <circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/>
+                  <circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/>
+                  <circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/>
+                </svg>
+              </div>
+              <div class="category-info" onclick="event.stopPropagation(); MenuBuilder.toggleCategory('${category.id}')" style="cursor: pointer;">
+                <div class="category-name">${this.escapeHtml(category.name)}</div>
+                <div class="category-count">${category.items.length} items</div>
+              </div>
+              <div class="category-actions">
+                <button onclick="event.stopPropagation(); MenuBuilder.addItem('${category.id}')" title="Add Item">
+                  <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                    <path d="M12 5v14M5 12h14"/>
+                  </svg>
+                </button>
+                <button class="danger" onclick="event.stopPropagation(); MenuBuilder.deleteCategory('${category.id}')" title="Delete">
+                  <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                    <path d="M3 6h18M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/>
+                  </svg>
+                </button>
+              </div>
+            </div>
+            <div class="items-list ${isExpanded ? '' : 'collapsed'}">
+              ${category.items.length === 0 ? `
+                <div class="item-drop-zone">Drag items here or click + to add</div>
+` : category.items.map(item => {
+                const itemExpanded = this.expandedItemId === item.id;
+                const hasModifiers = item.modifiers && item.modifiers.length > 0;
+                return `
+                <div class="item-card ${itemExpanded ? 'expanded' : ''}" data-item-id="${item.id}" draggable="true"
+                  onclick="event.stopPropagation(); MenuBuilder.selectElement(this)">
+                  ${hasModifiers ? `
+                  <div class="item-toggle ${itemExpanded ? 'expanded' : ''}" onclick="event.stopPropagation(); MenuBuilder.toggleItem('${item.id}')">
+                    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                      <path d="M9 18l6-6-6-6"/>
+                    </svg>
+                  </div>
+                  ` : ''}
+                  <div class="drag-handle">
+                    <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
+                      <circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/>
+                      <circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/>
+                      <circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/>
+                    </svg>
+                  </div>
+                  <div class="item-image">
+                    ${item.imageUrl ? `<img src="${item.imageUrl}" alt="">` : '🍽️'}
+                    ${item.photoTaskId ? `
+                      <div class="photo-badge ${item.imageUrl ? '' : 'missing'}" title="${item.imageUrl ? 'Has photo' : 'Photo task pending'}">
+                        <svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                          <rect x="3" y="3" width="18" height="18" rx="2"/>
+                          <circle cx="8.5" cy="8.5" r="1.5"/>
+                          <path d="M21 15l-5-5L5 21"/>
+                        </svg>
+                      </div>
+                    ` : ''}
+                  </div>
+                  <div class="item-info" onclick="event.stopPropagation(); ${hasModifiers ? `MenuBuilder.toggleItem('${item.id}')` : `MenuBuilder.selectItem('${item.id}')`}" style="cursor: pointer;">
+                    <div class="item-name">${this.escapeHtml(item.name)}</div>
+                    <div class="item-meta">
+                      <span class="item-price">$${(item.price || 0).toFixed(2)}</span>
+                      ${hasModifiers ? `<span>${item.modifiers.length} modifiers</span>` : ''}
+                    </div>
+                  </div>
+                  <div class="item-actions">
+                    <button onclick="event.stopPropagation(); MenuBuilder.cloneItem('${category.id}', '${item.id}')" title="Clone">
+                      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <rect x="9" y="9" width="13" height="13" rx="2"/>
+                        <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/>
+                      </svg>
+                    </button>
+                    <button class="danger" onclick="event.stopPropagation(); MenuBuilder.deleteItem('${category.id}', '${item.id}')" title="Delete">
+                      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <path d="M18 6L6 18M6 6l12 12"/>
+                      </svg>
+                    </button>
+                  </div>
+                </div>
+                ${itemExpanded ? this.renderModifiers(item.modifiers, item.id, 1) : ''}
+              `}).join('')}
+            </div>
+          </div>
+        `}).join('');
+
+        // Update stats
+        let totalItems = 0;
+        let missingPhotos = 0;
+        this.menu.categories.forEach(cat => {
+          totalItems += cat.items.length;
+          cat.items.forEach(item => {
+            if (!item.imageUrl) missingPhotos++;
+          });
+        });
+
+        document.getElementById('statCategories').textContent = this.menu.categories.length;
+        document.getElementById('statItems').textContent = totalItems;
+        document.getElementById('statPhotosMissing').textContent = missingPhotos;
+
+        // Re-setup drag handlers for new elements
+        this.setupItemDragHandlers();
+      },
+
+      // Setup drag handlers for items
+      setupItemDragHandlers() {
+        document.querySelectorAll('.category-card').forEach(card => {
+          card.addEventListener('dragstart', (e) => {
+            e.dataTransfer.setData('categoryId', card.dataset.categoryId);
+            e.dataTransfer.setData('source', 'canvas');
+            card.classList.add('dragging');
+          });
+
+          card.addEventListener('dragend', () => {
+            card.classList.remove('dragging');
+            document.querySelectorAll('.drop-before, .drop-after').forEach(el => {
+              el.classList.remove('drop-before', 'drop-after');
+            });
+          });
+
+          card.addEventListener('dragover', (e) => {
+            e.preventDefault();
+            const isDraggingCategory = e.dataTransfer.types.includes('categoryid');
+            const isDraggingItem = e.dataTransfer.types.includes('itemid');
+            
+            if (isDraggingItem) {
+              card.classList.add('drag-over');
+            } else if (isDraggingCategory && !card.classList.contains('dragging')) {
+              // Category reordering - show drop indicator
+              const rect = card.getBoundingClientRect();
+              const midpoint = rect.top + rect.height / 2;
+              card.classList.remove('drop-before', 'drop-after', 'drag-over');
+              if (e.clientY < midpoint) {
+                card.classList.add('drop-before');
+              } else {
+                card.classList.add('drop-after');
+              }
+            }
+          });
+
+          card.addEventListener('dragleave', () => {
+            card.classList.remove('drag-over', 'drop-before', 'drop-after');
+          });
+
+          card.addEventListener('drop', (e) => {
+            e.preventDefault();
+            card.classList.remove('drag-over', 'drop-before', 'drop-after');
+            
+            const itemId = e.dataTransfer.getData('itemId');
+            const draggedCategoryId = e.dataTransfer.getData('categoryId');
+            const targetCategoryId = card.dataset.categoryId;
+            
+            if (itemId) {
+              // Moving item to category
+              this.moveItemToCategory(itemId, targetCategoryId);
+            } else if (draggedCategoryId && draggedCategoryId !== targetCategoryId) {
+              // Reordering categories
+              const rect = card.getBoundingClientRect();
+              const midpoint = rect.top + rect.height / 2;
+              const position = e.clientY < midpoint ? 'before' : 'after';
+              this.reorderCategory(draggedCategoryId, targetCategoryId, position);
+            }
+          });
+        });
+
+        document.querySelectorAll('.item-card:not(.modifier)').forEach(card => {
+          card.addEventListener('dragstart', (e) => {
+            e.stopPropagation();
+            e.dataTransfer.setData('itemId', card.dataset.itemId);
+            e.dataTransfer.setData('source', 'canvas');
+            card.classList.add('dragging');
+          });
+
+          card.addEventListener('dragend', () => {
+            card.classList.remove('dragging');
+            // Remove all drop indicators
+            document.querySelectorAll('.drop-before, .drop-after').forEach(el => {
+              el.classList.remove('drop-before', 'drop-after');
+            });
+          });
+
+          card.addEventListener('dragover', (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            const draggedItemId = e.dataTransfer.types.includes('itemid');
+            if (draggedItemId && !card.classList.contains('dragging')) {
+              // Determine if dropping above or below based on mouse position
+              const rect = card.getBoundingClientRect();
+              const midpoint = rect.top + rect.height / 2;
+              card.classList.remove('drop-before', 'drop-after');
+              if (e.clientY < midpoint) {
+                card.classList.add('drop-before');
+              } else {
+                card.classList.add('drop-after');
+              }
+            }
+          });
+
+          card.addEventListener('dragleave', () => {
+            card.classList.remove('drop-before', 'drop-after');
+          });
+
+          card.addEventListener('drop', (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            const draggedItemId = e.dataTransfer.getData('itemId');
+            const targetItemId = card.dataset.itemId;
+            if (draggedItemId && targetItemId && draggedItemId !== targetItemId) {
+              const position = card.classList.contains('drop-before') ? 'before' : 'after';
+              this.reorderItemInCategory(draggedItemId, targetItemId, position);
+            }
+            card.classList.remove('drop-before', 'drop-after');
+          });
+        });
+
+        // Modifier drag handlers
+        document.querySelectorAll('.item-card.modifier').forEach(card => {
+          card.addEventListener('dragstart', (e) => {
+            e.stopPropagation();
+            e.dataTransfer.setData('modifierId', card.dataset.modifierId);
+            e.dataTransfer.setData('parentId', card.dataset.parentId);
+            e.dataTransfer.setData('depth', card.dataset.depth);
+            e.dataTransfer.setData('source', 'modifier');
+            // Default is copy, hold Shift for move
+            const isMove = e.shiftKey;
+            e.dataTransfer.setData('isMove', isMove ? 'true' : 'false');
+            e.dataTransfer.effectAllowed = isMove ? 'move' : 'copy';
+            card.classList.add('dragging');
+          });
+
+          card.addEventListener('dragend', () => {
+            card.classList.remove('dragging');
+            document.querySelectorAll('.drop-before, .drop-after, .drag-over').forEach(el => {
+              el.classList.remove('drop-before', 'drop-after', 'drag-over');
+            });
+          });
+
+          card.addEventListener('dragover', (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            const isDraggingModifier = e.dataTransfer.types.includes('modifierid');
+            if (isDraggingModifier && !card.classList.contains('dragging')) {
+              const rect = card.getBoundingClientRect();
+              const midpoint = rect.top + rect.height / 2;
+              card.classList.remove('drop-before', 'drop-after');
+              if (e.clientY < midpoint) {
+                card.classList.add('drop-before');
+              } else {
+                card.classList.add('drop-after');
+              }
+            }
+          });
+
+          card.addEventListener('dragleave', (e) => {
+            card.classList.remove('drop-before', 'drop-after');
+          });
+
+          card.addEventListener('drop', (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            const draggedModId = e.dataTransfer.getData('modifierId');
+            const draggedParentId = e.dataTransfer.getData('parentId');
+            const targetModId = card.dataset.modifierId;
+            const targetParentId = card.dataset.parentId;
+            const isMove = e.dataTransfer.getData('isMove') === 'true';
+
+            if (draggedModId && targetModId && draggedModId !== targetModId) {
+              const position = card.classList.contains('drop-before') ? 'before' : 'after';
+
+              if (isMove && draggedParentId === targetParentId) {
+                // Same parent + move = reorder
+                this.reorderModifier(draggedModId, targetModId, targetParentId, position);
+              } else if (isMove) {
+                // Different parent + move = move modifier
+                this.moveModifier(draggedModId, draggedParentId, targetModId, targetParentId, position);
+              } else {
+                // Copy (default)
+                this.copyModifier(draggedModId, draggedParentId, targetModId, targetParentId, position);
+              }
+            }
+            card.classList.remove('drop-before', 'drop-after');
+          });
+        });
+
+        // Allow dropping modifiers onto items (to add as top-level modifier)
+        document.querySelectorAll('.item-card:not(.modifier)').forEach(card => {
+          card.addEventListener('dragover', (e) => {
+            const isDraggingModifier = e.dataTransfer.types.includes('modifierid');
+            if (isDraggingModifier) {
+              e.preventDefault();
+              e.stopPropagation();
+              card.classList.add('drag-over');
+            }
+          });
+
+          card.addEventListener('dragleave', (e) => {
+            if (e.dataTransfer.types.includes('modifierid')) {
+              card.classList.remove('drag-over');
+            }
+          });
+
+          card.addEventListener('drop', (e) => {
+            const isDraggingModifier = e.dataTransfer.types.includes('modifierid');
+            if (isDraggingModifier) {
+              e.preventDefault();
+              e.stopPropagation();
+              const draggedModId = e.dataTransfer.getData('modifierId');
+              const draggedParentId = e.dataTransfer.getData('parentId');
+              const targetItemId = card.dataset.itemId;
+              const isMove = e.dataTransfer.getData('isMove') === 'true';
+
+              if (draggedModId && targetItemId) {
+                if (isMove) {
+                  this.moveModifierToItem(draggedModId, draggedParentId, targetItemId);
+                } else {
+                  this.copyModifierToItem(draggedModId, draggedParentId, targetItemId);
+                }
+              }
+              card.classList.remove('drag-over');
+            }
+          });
+        });
+      },
+
+      // Toggle category expanded/collapsed (accordion behavior)
+      toggleCategory(categoryId) {
+        if (this.expandedCategoryId === categoryId) {
+          this.expandedCategoryId = null;
+        } else {
+          this.expandedCategoryId = categoryId;
+          this.expandedItemId = null;
+          this.expandedModifierIds.clear();
+        }
+        this.render();
+      },
+
+      // Toggle item expanded/collapsed
+      toggleItem(itemId) {
+        if (this.expandedItemId === itemId) {
+          this.expandedItemId = null;
+        } else {
+          this.expandedItemId = itemId;
+          this.expandedModifierIds.clear();
+        }
+        this.render();
+      },
+
+      // Toggle modifier expanded/collapsed
+      toggleModifier(modifierId) {
+        if (this.expandedModifierIds.has(modifierId)) {
+          this.expandedModifierIds.delete(modifierId);
+        } else {
+          this.expandedModifierIds.add(modifierId);
+        }
+        this.render();
+      },
+
+      // Clone item
+      cloneItem(categoryId, itemId) {
+        this.saveState();
+        const category = this.menu.categories.find(c => c.id === categoryId);
+        if (category) {
+          const item = category.items.find(i => i.id === itemId);
+          if (item) {
+            const clone = JSON.parse(JSON.stringify(item));
+            clone.id = this.generateId();
+            clone.name = item.name + ' (Copy)';
+            clone.modifiers.forEach(mod => mod.id = this.generateId());
+            category.items.push(clone);
+            this.render();
+            this.toast('Item cloned', 'success');
+          }
+        }
+      },
+
+      // Show modal
+      showModal() {
+        document.getElementById('modalOverlay').classList.add('visible');
+      },
+
+      // Close modal
+      closeModal() {
+        document.getElementById('modalOverlay').classList.remove('visible');
+      },
+
+      // Toast
+      toast(message, type = 'info') {
+        const container = document.getElementById('toastContainer');
+        const toast = document.createElement('div');
+        toast.className = `toast ${type}`;
+        toast.textContent = message;
+        container.appendChild(toast);
+        setTimeout(() => toast.remove(), 3000);
+      },
+
+      // Escape HTML
+      escapeHtml(str) {
+        if (!str) return '';
+        return str.replace(/[&<>"']/g, (m) => ({
+          '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;'
+        })[m]);
+      }
+    };
+
+    // Initialize
+    document.addEventListener('DOMContentLoaded', () => MenuBuilder.init());
+  </script>
+</body>
+</html>
diff --git a/portal/portal.js b/portal/portal.js
index c8a1667..5ca5159 100644
--- a/portal/portal.js
+++ b/portal/portal.js
@@ -113,18 +113,18 @@ const Portal = {
         this.businessData = biz; // Store for later use
         document.getElementById('businessName').textContent = biz.Name || 'Business';
         document.getElementById('businessAvatar').textContent = (biz.Name || 'B').charAt(0).toUpperCase();
-        document.getElementById('userAvatar').textContent = 'U';
+        document.getElementById('userAvatar').textContent = (document.getElementById('businessAvatar').textContent || 'B');
       } else {
         this.businessData = null;
         document.getElementById('businessName').textContent = 'Business #' + this.config.businessId;
         document.getElementById('businessAvatar').textContent = 'B';
-        document.getElementById('userAvatar').textContent = 'U';
+        document.getElementById('userAvatar').textContent = (document.getElementById('businessAvatar').textContent || 'B');
       }
     } catch (err) {
       console.error('[Portal] Business info error:', err);
       document.getElementById('businessName').textContent = 'Business #' + this.config.businessId;
       document.getElementById('businessAvatar').textContent = 'B';
-      document.getElementById('userAvatar').textContent = 'U';
+      document.getElementById('userAvatar').textContent = (document.getElementById('businessAvatar').textContent || 'B');
     }
   },