diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs
index 5c959968..f6a8e42f 100644
--- a/server/AyaNova/biz/FormFieldReference.cs
+++ b/server/AyaNova/biz/FormFieldReference.cs
@@ -677,33 +677,32 @@ namespace AyaNova.Biz
                 #region Unit
                 {
                     List<FormField> l = new List<FormField>();
-                    // l.Add(new FormField { TKey = "UnitSerial", FieldKey = "UnitSerial", Hideable = false });
-                    l.Add(new FormField { TKey = "UnitNotes", FieldKey = "UnitNotes" });
-                    // l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
+                    l.Add(new FormField { TKey = "UnitDescription", FieldKey = "Description" });
+                    l.Add(new FormField { TKey = "UnitModel", FieldKey = "UnitModelId" });
+                    l.Add(new FormField { TKey = "UnitReplacedByUnitID", FieldKey = "ReplacedByUnitId" });
+                    l.Add(new FormField { TKey = "UnitParentUnitID", FieldKey = "ParentUnitId" });
+ l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
+                    l.Add(new FormField { TKey = "UnitMetered", FieldKey = "Metered" });
+                    l.Add(new FormField { TKey = "UnitBoughtHere", FieldKey = "BoughtHere" });
+                    l.Add(new FormField { TKey = "UnitPurchaseFromID", FieldKey = "PurchasedFromVendorId" });
+                       l.Add(new FormField { TKey = "UnitPurchasedDate", FieldKey = "PurchasedDate" });
+                    l.Add(new FormField { TKey = "UnitReceipt", FieldKey = "Receipt" });                
+                    l.Add(new FormField { TKey = "UnitText1", FieldKey = "Text1" });
+                    l.Add(new FormField { TKey = "UnitText2", FieldKey = "Text2" });
+                    l.Add(new FormField { TKey = "UnitText3", FieldKey = "Text3" });
+                    l.Add(new FormField { TKey = "UnitText4", FieldKey = "Text4" });
+                    l.Add(new FormField { TKey = "UnitNotes", FieldKey = "Notes" });
                     l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
                     l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
                     l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
 
-                    //l.Add(new FormField { TKey = "Customer", FieldKey = "Customer", Hideable = false });
-                    l.Add(new FormField { TKey = "UnitParentUnitID", FieldKey = "UnitParentUnitID" });
-                    l.Add(new FormField { TKey = "UnitModel", FieldKey = "UnitModel" });
-                    // l.Add(new FormField { TKey = "UnitUnitHasOwnAddress", FieldKey = "UnitUnitHasOwnAddress", Hideable = false });
-                    l.Add(new FormField { TKey = "UnitBoughtHere", FieldKey = "UnitBoughtHere" });
-                    l.Add(new FormField { TKey = "UnitPurchaseFromID", FieldKey = "UnitPurchaseFromID" });
-                    l.Add(new FormField { TKey = "UnitReceipt", FieldKey = "UnitReceipt" });
-                    l.Add(new FormField { TKey = "UnitPurchasedDate", FieldKey = "UnitPurchasedDate" });
-                    l.Add(new FormField { TKey = "UnitDescription", FieldKey = "UnitDescription" });
-                    l.Add(new FormField { TKey = "UnitReplacedByUnitID", FieldKey = "UnitReplacedByUnitID" });
-                    //l.Add(new FormField { TKey = "UnitOverrideWarranty", FieldKey = "UnitOverrideWarranty", Hideable = false });
-                    l.Add(new FormField { TKey = "UnitOverrideLength", FieldKey = "UnitOverrideLength" });
-                    l.Add(new FormField { TKey = "UnitOverrideWarrantyTerms", FieldKey = "UnitOverrideWarrantyTerms" });
-                    l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
-                    l.Add(new FormField { TKey = "UnitMetered", FieldKey = "UnitMetered" });
-                    l.Add(new FormField { TKey = "UnitOverrideLifeTime", FieldKey = "UnitOverrideLifeTime" });
-                    l.Add(new FormField { TKey = "UnitText1", FieldKey = "UnitText1" });
-                    l.Add(new FormField { TKey = "UnitText2", FieldKey = "UnitText2" });
-                    l.Add(new FormField { TKey = "UnitText3", FieldKey = "UnitText3" });
-                    l.Add(new FormField { TKey = "UnitText4", FieldKey = "UnitText4" });
+                    //TODO: ALL ADDRESS FIELDS AND UNIT HAS OWN ADDRESS
+                    //also hide that section in UI note if it's all disabled
+
+                        l.Add(new FormField { TKey = "UnitOverrideLength", FieldKey = "WarrantyLength" });
+                    l.Add(new FormField { TKey = "UnitOverrideWarrantyTerms", FieldKey = "WarrantyTerms" });
+                   
+                    l.Add(new FormField { TKey = "UnitOverrideLifeTime", FieldKey = "LifeTimeWarranty" });
 
                     l.Add(new FormField { TKey = "UnitCustom1", FieldKey = "UnitCustom1", IsCustomField = true });
                     l.Add(new FormField { TKey = "UnitCustom2", FieldKey = "UnitCustom2", IsCustomField = true });