diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1871b4f7..81598112 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -55,7 +55,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\"
diff --git a/server/AyaNova/DataList/CustomerWorkOrderDataList.cs b/server/AyaNova/DataList/CustomerWorkOrderDataList.cs
index 87b7f183..29f25fdf 100644
--- a/server/AyaNova/DataList/CustomerWorkOrderDataList.cs
+++ b/server/AyaNova/DataList/CustomerWorkOrderDataList.cs
@@ -11,126 +11,79 @@ namespace AyaNova.DataList
         public CustomerWorkOrderDataList(long translationId)
         {
             DefaultListAType = AyaType.CustomerServiceRequest;
-            SQLFrom = "from acustomerservicerequest " +
-            "left join acustomer on (acustomerservicerequest.customerid=acustomer.id) " +
-            "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) " +
-            "left join auser on (acustomerservicerequest.requestedbyuserid=auser.id) " +
-            "left join aunit on (acustomerservicerequest.unitid = aunit.id) " +
-            "left join aworkorderitem as wi on (acustomerservicerequest.workorderitemid=wi.id) " +
-            "left join aworkorder as w on (wi.workorderid=w.id)";
+            SQLFrom = "from aworkorder " +
+            "left join acustomer on (aworkorder.customerid=acustomer.id) " +
+            "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) ";
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "Created", "Customer", "CustomerServiceRequestTitle", "CustomerServiceRequestPriority", "CustomerServiceRequestStatus", "CustomerServiceRequestItemUnitID", "WorkOrder" };
-            DefaultSortBy = new Dictionary<string, string>() { { "Created", "-" } };
+            DefaultColumns = new List<string>() { "WorkOrderSerialNumber", "WorkOrderServiceDate", "Customer", "WorkOrderCustomerReferenceNumber", "WorkOrderInvoiceNumber", "WorkOrderCustomerContactName" };
+            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" } };
 
             FieldDefinitions = new List<DataListFieldDefinition>();
 
+
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "CustomerServiceRequestTitle",
-                FieldKey = "CustomerServiceRequestTitle",
-                AType = (int)AyaType.CustomerServiceRequest,
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlIdColumnName = "acustomerservicerequest.id",
-                SqlValueColumnName = "acustomerservicerequest.name",
+                TKey = "WorkOrderSerialNumber",
+                FieldKey = "WorkOrderSerialNumber",
+                AType = (int)AyaType.WorkOrder,
+                UiFieldDataType = (int)UiFieldDataType.Integer,
+                SqlIdColumnName = "aworkorder.id",
+                SqlValueColumnName = "aworkorder.serial",
                 IsRowId = true
             });
 
-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "CustomerServiceRequestDetails",
-                FieldKey = "CustomerServiceRequestDetails",
-                UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "acustomerservicerequest.notes"
-            });
-
-
-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "Created",
-                FieldKey = "Created",
-                UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "acustomerservicerequest.daterequested"
-            });
-
-
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 FieldKey = "Customer",
                 TKey = "Customer",
                 UiFieldDataType = (int)UiFieldDataType.Text,
+                // AType = (int)AyaType.Customer,
+                // SqlIdColumnName = "acustomer.id",
                 SqlValueColumnName = "acustomer.name"
             });
 
-            //Openable unit in case decide to allow customers to open a unit record of some kind
-            // FieldDefinitions.Add(new DataListFieldDefinition
-            // {
-            //     FieldKey = "CustomerServiceRequestItemUnitID",
-            //     TKey = "CustomerServiceRequestItemUnitID",
-            //     UiFieldDataType = (int)UiFieldDataType.Text,
-            //     AType = (int)AyaType.Unit,
-            //     SqlIdColumnName = "aunit.id",
-            //     SqlValueColumnName = "aunit.serial"
-            // });
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                FieldKey = "CustomerServiceRequestItemUnitID",
-                TKey = "CustomerServiceRequestItemUnitID",
+                TKey = "HeadOffice",
+                FieldKey = "workorderheadoffice",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "aunit.serial"
+                // AType = (int)AyaType.HeadOffice,
+                // SqlIdColumnName = "aheadoffice.id",
+                SqlValueColumnName = "aheadoffice.name"
             });
 
-
-            //Openable version for future consideration
-            // FieldDefinitions.Add(new DataListFieldDefinition
-            // {
-            //     FieldKey = "WorkOrder",
-            //     TKey = "WorkOrder",
-            //     UiFieldDataType = (int)UiFieldDataType.Text,
-            //     AType = (int)AyaType.WorkOrderItem,
-            //     SqlIdColumnName = "wi.id",
-            //     SqlValueColumnName = "w.serial"
-            // });
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                FieldKey = "WorkOrder",
-                TKey = "WorkOrder",
+                TKey = "WorkOrderCustomerReferenceNumber",
+                FieldKey = "WorkOrderCustomerReferenceNumber",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "w.serial"
+                SqlValueColumnName = "aworkorder.customerreferencenumber"
             });
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                FieldKey = "CustomerServiceRequestRequestedBy",
-                TKey = "CustomerServiceRequestRequestedBy",
+                TKey = "WorkOrderCustomerContactName",
+                FieldKey = "WorkOrderCustomerContactName",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "auser.name"
+                SqlValueColumnName = "aworkorder.customercontactname"
             });
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "CustomerServiceRequestCustomerReferenceNumber",
-                FieldKey = "CustomerServiceRequestCustomerReferenceNumber",
+                TKey = "WorkOrderServiceDate",
+                FieldKey = "WorkOrderServiceDate",
+                UiFieldDataType = (int)UiFieldDataType.DateTime,
+                SqlValueColumnName = "aworkorder.servicedate"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderInvoiceNumber",
+                FieldKey = "WorkOrderInvoiceNumber",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "acustomerservicerequest.customerreferencenumber"
-            });
-
-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "CustomerServiceRequestStatus",
-                FieldKey = "CustomerServiceRequestStatus",
-                UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(CustomerServiceRequestStatus).ToString()),
-                SqlValueColumnName = "acustomerservicerequest.status"
-            });
-
-            FieldDefinitions.Add(new DataListFieldDefinition
-            {
-                TKey = "CustomerServiceRequestPriority",
-                FieldKey = "CustomerServiceRequestPriority",
-                UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(CustomerServiceRequestPriority).ToString()),
-                SqlValueColumnName = "acustomerservicerequest.priority"
+                SqlValueColumnName = "aworkorder.invoicenumber"
             });
 
 
@@ -157,9 +110,6 @@ namespace AyaNova.DataList
             });
 
 
-
-
-
         }
 
         public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)