diff --git a/server/AyaNova/DataList/UnitDataList.cs b/server/AyaNova/DataList/UnitDataList.cs
index 5153f5f0..3403fa85 100644
--- a/server/AyaNova/DataList/UnitDataList.cs
+++ b/server/AyaNova/DataList/UnitDataList.cs
@@ -38,7 +38,7 @@ namespace AyaNova.DataList
             cm.fld = "Active";
             dlistView.Add(cm);
 
-          
+
             DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None);
 
 
@@ -47,12 +47,12 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "UnitName",
-                FieldKey = "unitname",
+                TKey = "UnitSerial",
+                FieldKey = "UnitSerial",
                 AyaObjectType = (int)AyaType.Unit,
                 UiFieldDataType = (int)UiFieldDataType.Text,
                 SqlIdColumnName = "aunit.id",
-                SqlValueColumnName = "aunit.name",
+                SqlValueColumnName = "aunit.serial",
                 IsRowId = true
             });
 
@@ -67,7 +67,7 @@ namespace AyaNova.DataList
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 TKey = "Active",
-                FieldKey = "unitactive",
+                FieldKey = "Active",
                 UiFieldDataType = (int)UiFieldDataType.Bool,
                 SqlValueColumnName = "aunit.active"
             });
@@ -80,43 +80,176 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aunit.tags"
             });
 
-
-            //------------          
-
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "UnitAccountNumber",
-                FieldKey = "UnitAccountNumber",
+                FieldKey = "Customer",
+                TKey = "Customer",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                SqlValueColumnName = "aunit.accountnumber"
+                AyaObjectType = (int)AyaType.Customer,
+                SqlIdColumnName = "acustomer.id",
+                SqlValueColumnName = "acustomer.name"
             });
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                FieldKey = "UnitUnitOverseerID",
-                TKey = "UnitUnitOverseerID",
+                FieldKey = "UnitParentUnitID",
+                TKey = "UnitParentUnitID",
                 UiFieldDataType = (int)UiFieldDataType.Text,
-                AyaObjectType = (int)AyaType.User,
-                SqlIdColumnName = "auser.id",
-                SqlValueColumnName = "auser.name"
+                AyaObjectType = (int)AyaType.Unit,
+                SqlIdColumnName = "aparentunit.id",
+                SqlValueColumnName = "aparentunit.serial"
             });
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "UnitDateStarted",
-                FieldKey = "UnitDateStarted",
-                UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "aunit.datestarted"
+                FieldKey = "UnitReplacedByUnitID",
+                TKey = "UnitReplacedByUnitID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AyaObjectType = (int)AyaType.Unit,
+                SqlIdColumnName = "areplacedbyunit.id",
+                SqlValueColumnName = "areplacedbyunit.serial"
             });
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                TKey = "UnitDateCompleted",
-                FieldKey = "UnitDateCompleted",
-                UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "aunit.datecompleted"
+                FieldKey = "UnitModel",
+                TKey = "UnitModel",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AyaObjectType = (int)AyaType.UnitModel,
+                SqlIdColumnName = "aunitmodel.id",
+                SqlValueColumnName = "aunitmodel.name"
             });
-            //-----------
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitUnitHasOwnAddress",
+                FieldKey = "UnitUnitHasOwnAddress",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aunit.unithasownaddress"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitBoughtHere",
+                FieldKey = "UnitBoughtHere",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aunit.boughthere"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                FieldKey = "UnitPurchaseFromID",
+                TKey = "UnitPurchaseFromID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AyaObjectType = (int)AyaType.Vendor,
+                SqlIdColumnName = "avendor.id",
+                SqlValueColumnName = "avendor.name"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitReceipt",
+                FieldKey = "UnitReceipt",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.receipt"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitPurchasedDate",
+                FieldKey = "UnitPurchasedDate",
+                UiFieldDataType = (int)UiFieldDataType.DateTime,
+                SqlValueColumnName = "aunit.purchaseddate"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitDescription",
+                FieldKey = "UnitDescription",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.description"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitOverrideWarranty",
+                FieldKey = "UnitOverrideWarranty",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aunit.overridemodelwarranty"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitOverrideLength",
+                FieldKey = "UnitOverrideLength",
+                UiFieldDataType = (int)UiFieldDataType.Integer,
+                SqlValueColumnName = "aunit.warrantylength"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitOverrideLifeTime",
+                FieldKey = "UnitOverrideLifeTime",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aunit.lifetimewarranty"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitOverrideWarrantyTerms",
+                FieldKey = "UnitOverrideWarrantyTerms",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.warrantyterms"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UsesBanking",
+                FieldKey = "UsesBanking",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aunit.usesbanking"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitMetered",
+                FieldKey = "UnitMetered",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aunit.metered"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitText1",
+                FieldKey = "UnitText1",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.text1"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitText2",
+                FieldKey = "UnitText2",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.text2"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitText3",
+                FieldKey = "UnitText3",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.text3"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                TKey = "UnitText4",
+                FieldKey = "UnitText4",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aunit.text4"
+            });
+
 
             FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom1", FieldKey = "unitcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" });
             FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "UnitCustom2", FieldKey = "unitcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aunit.customfields" });