diff --git a/meter_check.json b/meter_check.json
new file mode 100644
index 0000000..3341ebd
--- /dev/null
+++ b/meter_check.json
@@ -0,0 +1,242 @@
+{
+  "id": "meter_check",
+  "version": 1,
+  "modifiedDate": "2026-07-22",
+  "name": "Meter Check",
+  "description": "Lightweight periodic re-check of an already-installed meter: identify the meter, capture readings, sign off. No setup/config data.",
+  "submission": {
+    "name": "Vivarox n8n Webhook",
+    "subtype": "n8n",
+    "url": "https://n.warky.dev/webhook/1d1c3208-83ad-44e0-aba8-def052cf7629",
+    "method": "POST",
+    "payloadMode": "multipart",
+    "credential": {
+      "authType": "bearer_token",
+      "value": "vivarox@2026"
+    }
+  },
+  "steps": [
+    {
+      "stepOrder": 1,
+      "name": "date_of_check",
+      "label": "Date of Check",
+      "type": "date",
+      "required": true,
+      "group": "reference",
+      "group_description": "Meter Reference"
+    },
+    {
+      "stepOrder": 2,
+      "name": "site",
+      "label": "Site",
+      "type": "text",
+      "required": true,
+      "group": "reference"
+    },
+    {
+      "stepOrder": 3,
+      "name": "serial_no",
+      "label": "Meter Serial No.",
+      "type": "text",
+      "required": true,
+      "group": "reference"
+    },
+    {
+      "stepOrder": 4,
+      "name": "vt_red_to_white",
+      "label": "VT Volts: Red to White",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements",
+      "group_description": "Voltage Measurements"
+    },
+    {
+      "stepOrder": 5,
+      "name": "vt_red_to_blue",
+      "label": "VT Volts: Red to Blue",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 6,
+      "name": "vt_white_to_blue",
+      "label": "VT Volts: White to Blue",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 7,
+      "name": "vt_red_to_grnd",
+      "label": "VT Volts: Red to Grnd",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 8,
+      "name": "vt_white_to_grnd",
+      "label": "VT Volts: White to Grnd",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 9,
+      "name": "vt_blue_to_grnd",
+      "label": "VT Volts: Blue to Grnd",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 10,
+      "name": "ct_secondary_red",
+      "label": "CT Secondary Red",
+      "type": "number",
+      "required": true,
+      "group": "current_measurements",
+      "group_description": "Current Measurements"
+    },
+    {
+      "stepOrder": 11,
+      "name": "ct_secondary_white",
+      "label": "CT Secondary White",
+      "type": "number",
+      "required": true,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 12,
+      "name": "ct_secondary_blue",
+      "label": "CT Secondary Blue",
+      "type": "number",
+      "required": true,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 13,
+      "name": "ct_secondary_calculated_red",
+      "label": "CT Secondary Calculated Red",
+      "type": "number",
+      "required": false,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 14,
+      "name": "ct_secondary_calculated_white",
+      "label": "CT Secondary Calculated White",
+      "type": "number",
+      "required": false,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 15,
+      "name": "ct_secondary_calculated_blue",
+      "label": "CT Secondary Calculated Blue",
+      "type": "number",
+      "required": false,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 16,
+      "name": "voltage_average",
+      "label": "Voltage Average",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity",
+      "group_description": "Data Integrity"
+    },
+    {
+      "stepOrder": 17,
+      "name": "current_average",
+      "label": "Current Average",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 18,
+      "name": "power_factor_average",
+      "label": "Power Factor Average",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 19,
+      "name": "kva_calculated",
+      "label": "kVA Calculated",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 20,
+      "name": "kva_measured",
+      "label": "kVA Measured",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 21,
+      "name": "kw_calculated",
+      "label": "kW Calculated",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 22,
+      "name": "kw_measured",
+      "label": "kW Measured",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 23,
+      "name": "percent_difference_kw",
+      "label": "% Difference kW",
+      "type": "text",
+      "required": false,
+      "group": "data_check",
+      "group_description": "Data Check"
+    },
+    {
+      "stepOrder": 24,
+      "name": "main_meter",
+      "label": "Main Meter",
+      "type": "text",
+      "required": false,
+      "group": "data_check"
+    },
+    {
+      "stepOrder": 25,
+      "name": "check_meter",
+      "label": "Check Meter",
+      "type": "text",
+      "required": false,
+      "group": "data_check"
+    },
+    {
+      "stepOrder": 26,
+      "name": "checked_by",
+      "label": "Checked By",
+      "type": "text",
+      "required": true,
+      "group": "sign_off",
+      "group_description": "Sign Off"
+    },
+    {
+      "stepOrder": 27,
+      "name": "technician_signature",
+      "label": "Technician Signature",
+      "type": "signature",
+      "required": true,
+      "group": "sign_off"
+    }
+  ]
+}
diff --git a/meter_installation.json b/meter_installation.json
index e50769e..9ff88a6 100644
--- a/meter_installation.json
+++ b/meter_installation.json
@@ -22,35 +22,27 @@
       "label": "Date of Installation",
       "type": "date",
       "required": true,
-      "group": "client_detail",
-      "group_description": "Client Detail"
+      "group": "site_detail",
+      "group_description": "Site Detail"
     },
     {
       "stepOrder": 2,
-      "name": "client",
-      "label": "Client",
-      "type": "text",
-      "required": true,
-      "group": "client_detail"
-    },
-    {
-      "stepOrder": 3,
       "name": "site",
       "label": "Site",
       "type": "text",
       "required": true,
-      "group": "client_detail"
+      "group": "site_detail"
     },
     {
-      "stepOrder": 4,
+      "stepOrder": 3,
       "name": "address",
       "label": "Address",
       "type": "text",
       "required": false,
-      "group": "client_detail"
+      "group": "site_detail"
     },
     {
-      "stepOrder": 5,
+      "stepOrder": 4,
       "name": "substation",
       "label": "Substation",
       "type": "text",
@@ -59,7 +51,7 @@
       "group_description": "Point of Measurement"
     },
     {
-      "stepOrder": 6,
+      "stepOrder": 5,
       "name": "feeder",
       "label": "Feeder",
       "type": "text",
@@ -67,7 +59,7 @@
       "group": "point_of_measurement"
     },
     {
-      "stepOrder": 7,
+      "stepOrder": 6,
       "name": "panel_no",
       "label": "Panel No.",
       "type": "text",
@@ -75,7 +67,7 @@
       "group": "point_of_measurement"
     },
     {
-      "stepOrder": 8,
+      "stepOrder": 7,
       "name": "meter_location",
       "label": "Meter Location",
       "type": "text",
@@ -83,7 +75,7 @@
       "group": "point_of_measurement"
     },
     {
-      "stepOrder": 9,
+      "stepOrder": 8,
       "name": "meter_type",
       "label": "Meter Type",
       "type": "select",
@@ -117,7 +109,7 @@
       }
     },
     {
-      "stepOrder": 10,
+      "stepOrder": 9,
       "name": "meter_type_other",
       "label": "Other Meter Type",
       "type": "text",
@@ -125,7 +117,7 @@
       "group": "meter_data"
     },
     {
-      "stepOrder": 11,
+      "stepOrder": 10,
       "name": "serial_no",
       "label": "Serial No.",
       "type": "text",
@@ -133,7 +125,7 @@
       "group": "meter_data"
     },
     {
-      "stepOrder": 12,
+      "stepOrder": 11,
       "name": "firmware_ver",
       "label": "Firmware Ver.",
       "type": "text",
@@ -141,7 +133,7 @@
       "group": "meter_data"
     },
     {
-      "stepOrder": 13,
+      "stepOrder": 12,
       "name": "voltage_inputs",
       "label": "Voltage Inputs (V)",
       "type": "number",
@@ -149,7 +141,7 @@
       "group": "meter_data"
     },
     {
-      "stepOrder": 14,
+      "stepOrder": 13,
       "name": "current_inputs",
       "label": "Current Inputs (A)",
       "type": "number",
@@ -157,7 +149,7 @@
       "group": "meter_data"
     },
     {
-      "stepOrder": 15,
+      "stepOrder": 14,
       "name": "power_supply",
       "label": "Power Supply (V)",
       "type": "number",
@@ -165,7 +157,7 @@
       "group": "meter_data"
     },
     {
-      "stepOrder": 16,
+      "stepOrder": 15,
       "name": "ct_type",
       "label": "CT Type",
       "type": "text",
@@ -174,7 +166,7 @@
       "group_description": "CT/VT Data"
     },
     {
-      "stepOrder": 17,
+      "stepOrder": 16,
       "name": "ct_ratio",
       "label": "CT Ratio",
       "type": "text",
@@ -182,7 +174,7 @@
       "group": "ctvt_data"
     },
     {
-      "stepOrder": 18,
+      "stepOrder": 17,
       "name": "ct_class",
       "label": "CT Class",
       "type": "text",
@@ -190,7 +182,7 @@
       "group": "ctvt_data"
     },
     {
-      "stepOrder": 19,
+      "stepOrder": 18,
       "name": "ct_rating",
       "label": "CT Rating",
       "type": "text",
@@ -198,7 +190,7 @@
       "group": "ctvt_data"
     },
     {
-      "stepOrder": 20,
+      "stepOrder": 19,
       "name": "vt_type",
       "label": "VT Type",
       "type": "text",
@@ -206,7 +198,7 @@
       "group": "ctvt_data"
     },
     {
-      "stepOrder": 21,
+      "stepOrder": 20,
       "name": "ct_info_obtained",
       "label": "Where CT Info Was Obtained",
       "type": "text",
@@ -214,7 +206,7 @@
       "group": "ctvt_data"
     },
     {
-      "stepOrder": 22,
+      "stepOrder": 21,
       "name": "voltage_mode",
       "label": "Voltage Mode",
       "type": "text",
@@ -223,7 +215,7 @@
       "group_description": "Meter Setup"
     },
     {
-      "stepOrder": 23,
+      "stepOrder": 22,
       "name": "primary_voltage",
       "label": "Primary Voltage (V)",
       "type": "number",
@@ -231,7 +223,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 24,
+      "stepOrder": 23,
       "name": "secondary_voltage",
       "label": "Secondary Voltage (V)",
       "type": "number",
@@ -239,7 +231,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 25,
+      "stepOrder": 24,
       "name": "primary_current",
       "label": "Primary Current (A)",
       "type": "number",
@@ -247,7 +239,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 26,
+      "stepOrder": 25,
       "name": "secondary_current",
       "label": "Secondary Current (A)",
       "type": "number",
@@ -255,7 +247,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 27,
+      "stepOrder": 26,
       "name": "com1_id",
       "label": "COM1 ID",
       "type": "text",
@@ -263,7 +255,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 28,
+      "stepOrder": 27,
       "name": "com1_baud_rate",
       "label": "COM1 Baud Rate",
       "type": "number",
@@ -271,7 +263,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 29,
+      "stepOrder": 28,
       "name": "com1_protocol",
       "label": "COM1 Protocol",
       "type": "text",
@@ -279,7 +271,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 30,
+      "stepOrder": 29,
       "name": "com2_id",
       "label": "COM2 ID",
       "type": "text",
@@ -287,7 +279,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 31,
+      "stepOrder": 30,
       "name": "com2_baud_rate",
       "label": "COM2 Baud Rate",
       "type": "number",
@@ -295,7 +287,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 32,
+      "stepOrder": 31,
       "name": "com2_protocol",
       "label": "COM2 Protocol",
       "type": "text",
@@ -303,7 +295,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 33,
+      "stepOrder": 32,
       "name": "eth_ip_address",
       "label": "Eth IP Address",
       "type": "text",
@@ -311,7 +303,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 34,
+      "stepOrder": 33,
       "name": "eth_subnet_mask",
       "label": "Eth Subnet Mask",
       "type": "text",
@@ -319,7 +311,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 35,
+      "stepOrder": 34,
       "name": "eth_gateway",
       "label": "Eth Gateway",
       "type": "text",
@@ -327,7 +319,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 36,
+      "stepOrder": 35,
       "name": "vt_supply_cb",
       "label": "VT Supply CB",
       "type": "text",
@@ -335,7 +327,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 37,
+      "stepOrder": 36,
       "name": "aux_supply_cb",
       "label": "Aux Supply CB",
       "type": "text",
@@ -343,7 +335,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 38,
+      "stepOrder": 37,
       "name": "ct_test_block",
       "label": "CT Test Block",
       "type": "boolean",
@@ -351,7 +343,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 39,
+      "stepOrder": 38,
       "name": "vt_test_block",
       "label": "VT Test Block",
       "type": "boolean",
@@ -359,7 +351,7 @@
       "group": "meter_setup"
     },
     {
-      "stepOrder": 40,
+      "stepOrder": 39,
       "name": "modem_type",
       "label": "Modem Type",
       "type": "text",
@@ -368,7 +360,7 @@
       "group_description": "Modem Data"
     },
     {
-      "stepOrder": 41,
+      "stepOrder": 40,
       "name": "modem_serial_no",
       "label": "Modem Serial No.",
       "type": "text",
@@ -376,7 +368,7 @@
       "group": "modem_data"
     },
     {
-      "stepOrder": 42,
+      "stepOrder": 41,
       "name": "modem_sim_no",
       "label": "SIM No.",
       "type": "text",
@@ -384,7 +376,7 @@
       "group": "modem_data"
     },
     {
-      "stepOrder": 43,
+      "stepOrder": 42,
       "name": "modem_ip_address",
       "label": "Modem IP Address",
       "type": "text",
@@ -392,7 +384,7 @@
       "group": "modem_data"
     },
     {
-      "stepOrder": 44,
+      "stepOrder": 43,
       "name": "modem_signal_strength",
       "label": "Signal Strength",
       "type": "text",
@@ -400,7 +392,7 @@
       "group": "modem_data"
     },
     {
-      "stepOrder": 45,
+      "stepOrder": 44,
       "name": "modem_com_port",
       "label": "Modem COM Port",
       "type": "text",
@@ -408,7 +400,7 @@
       "group": "modem_data"
     },
     {
-      "stepOrder": 46,
+      "stepOrder": 45,
       "name": "install_photo",
       "label": "Photo of Installation",
       "type": "photo",
@@ -417,7 +409,7 @@
       "group_description": "Photos & Diagrams"
     },
     {
-      "stepOrder": 47,
+      "stepOrder": 46,
       "name": "circuit_drawing_photo",
       "label": "Free-Hand Drawing of Metering Circuit (with wire numbering)",
       "type": "photo",
diff --git a/meter_installation_and_verification.json b/meter_installation_and_verification.json
new file mode 100644
index 0000000..163d4b6
--- /dev/null
+++ b/meter_installation_and_verification.json
@@ -0,0 +1,744 @@
+{
+  "id": "meter_installation_and_verification",
+  "version": 1,
+  "modifiedDate": "2026-07-22",
+  "name": "Meter Installation & Verification",
+  "description": "Combined single-visit meter installation and commissioning/verification record, for jobs where both are done in the same visit.",
+  "submission": {
+    "name": "Vivarox n8n Webhook",
+    "subtype": "n8n",
+    "url": "https://n.warky.dev/webhook/1d1c3208-83ad-44e0-aba8-def052cf7629",
+    "method": "POST",
+    "payloadMode": "multipart",
+    "credential": {
+      "authType": "bearer_token",
+      "value": "vivarox@2026"
+    }
+  },
+  "steps": [
+    {
+      "stepOrder": 1,
+      "name": "date_of_installation",
+      "label": "Date of Installation",
+      "type": "date",
+      "required": true,
+      "group": "site_detail",
+      "group_description": "Site Detail"
+    },
+    {
+      "stepOrder": 2,
+      "name": "site",
+      "label": "Site",
+      "type": "text",
+      "required": true,
+      "group": "site_detail"
+    },
+    {
+      "stepOrder": 3,
+      "name": "address",
+      "label": "Address",
+      "type": "text",
+      "required": false,
+      "group": "site_detail"
+    },
+    {
+      "stepOrder": 4,
+      "name": "substation",
+      "label": "Substation",
+      "type": "text",
+      "required": false,
+      "group": "point_of_measurement",
+      "group_description": "Point of Measurement"
+    },
+    {
+      "stepOrder": 5,
+      "name": "feeder",
+      "label": "Feeder",
+      "type": "text",
+      "required": true,
+      "group": "point_of_measurement"
+    },
+    {
+      "stepOrder": 6,
+      "name": "panel_no",
+      "label": "Panel No.",
+      "type": "text",
+      "required": false,
+      "group": "point_of_measurement"
+    },
+    {
+      "stepOrder": 7,
+      "name": "meter_location",
+      "label": "Meter Location",
+      "type": "text",
+      "required": false,
+      "group": "point_of_measurement"
+    },
+    {
+      "stepOrder": 8,
+      "name": "meter_type",
+      "label": "Meter Type",
+      "type": "select",
+      "required": true,
+      "group": "meter_data",
+      "group_description": "Meter Data",
+      "config": {
+        "options": [
+          "Satec PM130EH",
+          "Satec PM135EH",
+          "Satec PM172EH",
+          "Satec PM174EH",
+          "Satec PM175EH",
+          "Satec PM180EH",
+          "Power Analizer PM296",
+          "PM820",
+          "PM3255",
+          "PM5310",
+          "PM5320",
+          "PM5330",
+          "PM5560",
+          "Elster A1140",
+          "Elster A1700",
+          "Elster H100",
+          "Elster AS230",
+          "Landis & Gyr E650",
+          "Enerdis",
+          "Eastron SDM630",
+          "Other"
+        ]
+      }
+    },
+    {
+      "stepOrder": 9,
+      "name": "meter_type_other",
+      "label": "Other Meter Type",
+      "type": "text",
+      "required": false,
+      "group": "meter_data"
+    },
+    {
+      "stepOrder": 10,
+      "name": "serial_no",
+      "label": "Serial No.",
+      "type": "text",
+      "required": true,
+      "group": "meter_data"
+    },
+    {
+      "stepOrder": 11,
+      "name": "firmware_ver",
+      "label": "Firmware Ver.",
+      "type": "text",
+      "required": false,
+      "group": "meter_data"
+    },
+    {
+      "stepOrder": 12,
+      "name": "voltage_inputs",
+      "label": "Voltage Inputs (V)",
+      "type": "number",
+      "required": false,
+      "group": "meter_data"
+    },
+    {
+      "stepOrder": 13,
+      "name": "current_inputs",
+      "label": "Current Inputs (A)",
+      "type": "number",
+      "required": false,
+      "group": "meter_data"
+    },
+    {
+      "stepOrder": 14,
+      "name": "power_supply",
+      "label": "Power Supply (V)",
+      "type": "number",
+      "required": false,
+      "group": "meter_data"
+    },
+    {
+      "stepOrder": 15,
+      "name": "ct_type",
+      "label": "CT Type",
+      "type": "text",
+      "required": false,
+      "group": "ctvt_data",
+      "group_description": "CT/VT Data"
+    },
+    {
+      "stepOrder": 16,
+      "name": "ct_ratio",
+      "label": "CT Ratio",
+      "type": "text",
+      "required": false,
+      "group": "ctvt_data"
+    },
+    {
+      "stepOrder": 17,
+      "name": "ct_class",
+      "label": "CT Class",
+      "type": "text",
+      "required": false,
+      "group": "ctvt_data"
+    },
+    {
+      "stepOrder": 18,
+      "name": "ct_rating",
+      "label": "CT Rating",
+      "type": "text",
+      "required": false,
+      "group": "ctvt_data"
+    },
+    {
+      "stepOrder": 19,
+      "name": "vt_type",
+      "label": "VT Type",
+      "type": "text",
+      "required": false,
+      "group": "ctvt_data"
+    },
+    {
+      "stepOrder": 20,
+      "name": "ct_info_obtained",
+      "label": "Where CT Info Was Obtained",
+      "type": "text",
+      "required": false,
+      "group": "ctvt_data"
+    },
+    {
+      "stepOrder": 21,
+      "name": "voltage_mode",
+      "label": "Voltage Mode",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup",
+      "group_description": "Meter Setup"
+    },
+    {
+      "stepOrder": 22,
+      "name": "primary_voltage",
+      "label": "Primary Voltage (V)",
+      "type": "number",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 23,
+      "name": "secondary_voltage",
+      "label": "Secondary Voltage (V)",
+      "type": "number",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 24,
+      "name": "primary_current",
+      "label": "Primary Current (A)",
+      "type": "number",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 25,
+      "name": "secondary_current",
+      "label": "Secondary Current (A)",
+      "type": "number",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 26,
+      "name": "com1_id",
+      "label": "COM1 ID",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 27,
+      "name": "com1_baud_rate",
+      "label": "COM1 Baud Rate",
+      "type": "number",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 28,
+      "name": "com1_protocol",
+      "label": "COM1 Protocol",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 29,
+      "name": "com2_id",
+      "label": "COM2 ID",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 30,
+      "name": "com2_baud_rate",
+      "label": "COM2 Baud Rate",
+      "type": "number",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 31,
+      "name": "com2_protocol",
+      "label": "COM2 Protocol",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 32,
+      "name": "eth_ip_address",
+      "label": "Eth IP Address",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 33,
+      "name": "eth_subnet_mask",
+      "label": "Eth Subnet Mask",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 34,
+      "name": "eth_gateway",
+      "label": "Eth Gateway",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 35,
+      "name": "vt_supply_cb",
+      "label": "VT Supply CB",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 36,
+      "name": "aux_supply_cb",
+      "label": "Aux Supply CB",
+      "type": "text",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 37,
+      "name": "ct_test_block",
+      "label": "CT Test Block",
+      "type": "boolean",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 38,
+      "name": "vt_test_block",
+      "label": "VT Test Block",
+      "type": "boolean",
+      "required": false,
+      "group": "meter_setup"
+    },
+    {
+      "stepOrder": 39,
+      "name": "modem_type",
+      "label": "Modem Type",
+      "type": "text",
+      "required": false,
+      "group": "modem_data",
+      "group_description": "Modem Data"
+    },
+    {
+      "stepOrder": 40,
+      "name": "modem_serial_no",
+      "label": "Modem Serial No.",
+      "type": "text",
+      "required": false,
+      "group": "modem_data"
+    },
+    {
+      "stepOrder": 41,
+      "name": "modem_sim_no",
+      "label": "SIM No.",
+      "type": "text",
+      "required": false,
+      "group": "modem_data"
+    },
+    {
+      "stepOrder": 42,
+      "name": "modem_ip_address",
+      "label": "Modem IP Address",
+      "type": "text",
+      "required": false,
+      "group": "modem_data"
+    },
+    {
+      "stepOrder": 43,
+      "name": "modem_signal_strength",
+      "label": "Signal Strength",
+      "type": "text",
+      "required": false,
+      "group": "modem_data"
+    },
+    {
+      "stepOrder": 44,
+      "name": "modem_com_port",
+      "label": "Modem COM Port",
+      "type": "text",
+      "required": false,
+      "group": "modem_data"
+    },
+    {
+      "stepOrder": 45,
+      "name": "install_photo",
+      "label": "Photo of Installation",
+      "type": "photo",
+      "required": true,
+      "group": "media",
+      "group_description": "Photos & Diagrams"
+    },
+    {
+      "stepOrder": 46,
+      "name": "circuit_drawing_photo",
+      "label": "Free-Hand Drawing of Metering Circuit (with wire numbering)",
+      "type": "photo",
+      "required": false,
+      "group": "media"
+    },
+    {
+      "stepOrder": 47,
+      "name": "date_of_verification",
+      "label": "Date of Verification",
+      "type": "date",
+      "required": true,
+      "group": "verification_detail",
+      "group_description": "Verification"
+    },
+    {
+      "stepOrder": 48,
+      "name": "vt_red_to_white",
+      "label": "VT Volts: Red to White",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements",
+      "group_description": "Voltage Measurements"
+    },
+    {
+      "stepOrder": 49,
+      "name": "vt_red_to_blue",
+      "label": "VT Volts: Red to Blue",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 50,
+      "name": "vt_white_to_blue",
+      "label": "VT Volts: White to Blue",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 51,
+      "name": "vt_red_to_grnd",
+      "label": "VT Volts: Red to Grnd",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 52,
+      "name": "vt_white_to_grnd",
+      "label": "VT Volts: White to Grnd",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 53,
+      "name": "vt_blue_to_grnd",
+      "label": "VT Volts: Blue to Grnd",
+      "type": "number",
+      "required": true,
+      "group": "voltage_measurements"
+    },
+    {
+      "stepOrder": 54,
+      "name": "ct_secondary_red",
+      "label": "CT Secondary Red",
+      "type": "number",
+      "required": true,
+      "group": "current_measurements",
+      "group_description": "Current Measurements"
+    },
+    {
+      "stepOrder": 55,
+      "name": "ct_secondary_white",
+      "label": "CT Secondary White",
+      "type": "number",
+      "required": true,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 56,
+      "name": "ct_secondary_blue",
+      "label": "CT Secondary Blue",
+      "type": "number",
+      "required": true,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 57,
+      "name": "ct_secondary_calculated_red",
+      "label": "CT Secondary Calculated Red",
+      "type": "number",
+      "required": false,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 58,
+      "name": "ct_secondary_calculated_white",
+      "label": "CT Secondary Calculated White",
+      "type": "number",
+      "required": false,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 59,
+      "name": "ct_secondary_calculated_blue",
+      "label": "CT Secondary Calculated Blue",
+      "type": "number",
+      "required": false,
+      "group": "current_measurements"
+    },
+    {
+      "stepOrder": 60,
+      "name": "voltage_average",
+      "label": "Voltage Average",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity",
+      "group_description": "Data Integrity"
+    },
+    {
+      "stepOrder": 61,
+      "name": "current_average",
+      "label": "Current Average",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 62,
+      "name": "power_factor_average",
+      "label": "Power Factor Average",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 63,
+      "name": "kva_calculated",
+      "label": "kVA Calculated",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 64,
+      "name": "kva_measured",
+      "label": "kVA Measured",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 65,
+      "name": "kw_calculated",
+      "label": "kW Calculated",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 66,
+      "name": "kw_measured",
+      "label": "kW Measured",
+      "type": "number",
+      "required": false,
+      "group": "data_integrity"
+    },
+    {
+      "stepOrder": 67,
+      "name": "percent_difference_kw",
+      "label": "% Difference kW",
+      "type": "text",
+      "required": false,
+      "group": "data_check",
+      "group_description": "Data Check"
+    },
+    {
+      "stepOrder": 68,
+      "name": "main_meter",
+      "label": "Main Meter",
+      "type": "text",
+      "required": false,
+      "group": "data_check"
+    },
+    {
+      "stepOrder": 69,
+      "name": "check_meter",
+      "label": "Check Meter",
+      "type": "text",
+      "required": false,
+      "group": "data_check"
+    },
+    {
+      "stepOrder": 70,
+      "name": "panel_wire",
+      "label": "Panel Wire",
+      "type": "select",
+      "required": false,
+      "group": "other_info",
+      "group_description": "Other Info",
+      "config": {
+        "options": [
+          "Silicone",
+          "PVC"
+        ]
+      }
+    },
+    {
+      "stepOrder": 71,
+      "name": "status_of_cb",
+      "label": "Status of the CB",
+      "type": "select",
+      "required": false,
+      "group": "other_info",
+      "config": {
+        "options": [
+          "ON",
+          "OFF",
+          "OUT"
+        ]
+      }
+    },
+    {
+      "stepOrder": 72,
+      "name": "qa_name",
+      "label": "Name",
+      "type": "text",
+      "required": true,
+      "group": "quality_assurance",
+      "group_description": "Quality Assurance Check"
+    },
+    {
+      "stepOrder": 73,
+      "name": "qa_date",
+      "label": "Date of Check",
+      "type": "date",
+      "required": true,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 74,
+      "name": "check_tight_ct_terminations",
+      "label": "Tight CT Terminations",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 75,
+      "name": "check_wire_numbering_and_labels",
+      "label": "Wire Numbering & Labels",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 76,
+      "name": "check_cable_ties",
+      "label": "Cable Ties",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 77,
+      "name": "check_over_all_neatness",
+      "label": "Over-All Neatness",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 78,
+      "name": "check_correct_material",
+      "label": "Correct Material",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 79,
+      "name": "check_data_integrity",
+      "label": "Data Integrity",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 80,
+      "name": "check_clean_cabinets",
+      "label": "Clean Cabinets",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 81,
+      "name": "check_clean_substation",
+      "label": "Clean Substation",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 82,
+      "name": "check_connections_visually",
+      "label": "Check Connections Visually",
+      "type": "boolean",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 83,
+      "name": "phasor_diagram_photo",
+      "label": "Phasor Diagram (Voltage & Current)",
+      "type": "photo",
+      "required": false,
+      "group": "quality_assurance"
+    },
+    {
+      "stepOrder": 84,
+      "name": "technician_signature",
+      "label": "Technician Signature",
+      "type": "signature",
+      "required": true,
+      "group": "quality_assurance"
+    }
+  ]
+}
diff --git a/meter_verification.json b/meter_verification.json
index 3ef7bcd..96ff550 100644
--- a/meter_verification.json
+++ b/meter_verification.json
@@ -1,6 +1,6 @@
 {
   "id": "meter_verification",
-  "version": 1,
+  "version": 2,
   "modifiedDate": "2026-07-22",
   "name": "Meter Verification",
   "description": "Commissioning/verification visit for a previously installed meter: voltage and current measurements, data integrity, data check and quality assurance sign-off.",
@@ -205,6 +205,29 @@
     },
     {
       "stepOrder": 24,
+      "name": "panel_wire",
+      "label": "Panel Wire",
+      "type": "select",
+      "required": false,
+      "group": "other_info",
+      "group_description": "Other Info",
+      "config": {
+        "options": ["Silicone", "PVC"]
+      }
+    },
+    {
+      "stepOrder": 25,
+      "name": "status_of_cb",
+      "label": "Status of the CB",
+      "type": "select",
+      "required": false,
+      "group": "other_info",
+      "config": {
+        "options": ["ON", "OFF", "OUT"]
+      }
+    },
+    {
+      "stepOrder": 26,
       "name": "qa_name",
       "label": "Name",
       "type": "text",
@@ -213,7 +236,7 @@
       "group_description": "Quality Assurance Check"
     },
     {
-      "stepOrder": 25,
+      "stepOrder": 27,
       "name": "qa_date",
       "label": "Date of Check",
       "type": "date",
@@ -221,7 +244,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 26,
+      "stepOrder": 28,
       "name": "check_tight_ct_terminations",
       "label": "Tight CT Terminations",
       "type": "boolean",
@@ -229,7 +252,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 27,
+      "stepOrder": 29,
       "name": "check_wire_numbering_and_labels",
       "label": "Wire Numbering & Labels",
       "type": "boolean",
@@ -237,7 +260,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 28,
+      "stepOrder": 30,
       "name": "check_cable_ties",
       "label": "Cable Ties",
       "type": "boolean",
@@ -245,7 +268,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 29,
+      "stepOrder": 31,
       "name": "check_over_all_neatness",
       "label": "Over-All Neatness",
       "type": "boolean",
@@ -253,7 +276,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 30,
+      "stepOrder": 32,
       "name": "check_correct_material",
       "label": "Correct Material",
       "type": "boolean",
@@ -261,7 +284,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 31,
+      "stepOrder": 33,
       "name": "check_data_integrity",
       "label": "Data Integrity",
       "type": "boolean",
@@ -269,7 +292,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 32,
+      "stepOrder": 34,
       "name": "check_clean_cabinets",
       "label": "Clean Cabinets",
       "type": "boolean",
@@ -277,7 +300,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 33,
+      "stepOrder": 35,
       "name": "check_clean_substation",
       "label": "Clean Substation",
       "type": "boolean",
@@ -285,7 +308,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 34,
+      "stepOrder": 36,
       "name": "check_connections_visually",
       "label": "Check Connections Visually",
       "type": "boolean",
@@ -293,7 +316,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 35,
+      "stepOrder": 37,
       "name": "phasor_diagram_photo",
       "label": "Phasor Diagram (Voltage & Current)",
       "type": "photo",
@@ -301,7 +324,7 @@
       "group": "quality_assurance"
     },
     {
-      "stepOrder": 36,
+      "stepOrder": 38,
       "name": "technician_signature",
       "label": "Technician Signature",
       "type": "signature",