diff --git a/server/biz/FormFieldReference.cs b/server/biz/FormFieldReference.cs
index e8c72a2..49195e1 100644
--- a/server/biz/FormFieldReference.cs
+++ b/server/biz/FormFieldReference.cs
@@ -34,7 +34,7 @@ namespace Sockeye.Biz
                     }
                     //No type / not corebiz form keys:
                     _formFieldKeys.Add("Contact");
-                   
+
                 }
                 return _formFieldKeys;
             }
@@ -191,7 +191,7 @@ namespace Sockeye.Biz
                     l.Add(new FormField { TKey = "AddressDeliveryAddress", FieldKey = "Address" });
                     l.Add(new FormField { TKey = "AddressCity", FieldKey = "City" });
                     l.Add(new FormField { TKey = "AddressStateProv", FieldKey = "Region" });
-                    l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" });                    
+                    l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" });
                     l.Add(new FormField { TKey = "AddressPostal", FieldKey = "AddressPostal" });
                     l.Add(new FormField { TKey = "AddressLatitude", FieldKey = "Latitude" });
                     l.Add(new FormField { TKey = "AddressLongitude", FieldKey = "Longitude" });
@@ -221,7 +221,7 @@ namespace Sockeye.Biz
                 }
                 #endregion
 
-              
+
 
                 #region Memo
                 {
@@ -304,32 +304,54 @@ namespace Sockeye.Biz
                 }
                 #endregion
 
-  #region License
+                #region Vendor
                 {
                     List<FormField> l = new List<FormField>();
-            
-                  
+                    l.Add(new FormField { TKey = "VendorAccountNumber", FieldKey = "AccountNumber" });
+                    l.Add(new FormField { TKey = "WebAddress", FieldKey = "WebAddress" });
+                    l.Add(new FormField { TKey = "HeadOfficeEmail", FieldKey = "EmailAddress" });
+                    l.Add(new FormField { TKey = "HeadOfficePhone1", FieldKey = "Phone1" });
+                    l.Add(new FormField { TKey = "HeadOfficePhone2", FieldKey = "Phone2" });
+                    l.Add(new FormField { TKey = "HeadOfficePhone3", FieldKey = "Phone3" });
+                    l.Add(new FormField { TKey = "HeadOfficePhone4", FieldKey = "Phone4" });
+                    l.Add(new FormField { TKey = "HeadOfficePhone5", FieldKey = "Phone5" });
+                    l.Add(new FormField { TKey = "VendorContact", FieldKey = "Contact" });
+                    l.Add(new FormField { TKey = "VendorNotes", FieldKey = "Notes" });
+                    l.Add(new FormField { TKey = "VendorContactNotes", FieldKey = "ContactNotes" });
+                    l.Add(new FormField { TKey = "AlertNotes", FieldKey = "AlertNotes" });
                     l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
-                    l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
+                    l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki", Requireable = false });
                     l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments", Requireable = false });
+                    l.Add(new FormField { TKey = "AddressDeliveryAddress", FieldKey = "Address" });
+                    l.Add(new FormField { TKey = "AddressCity", FieldKey = "City" });
+                    l.Add(new FormField { TKey = "AddressStateProv", FieldKey = "Region" });
+                    l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" });
+                    l.Add(new FormField { TKey = "AddressPostal", FieldKey = "AddressPostal" });
+                    l.Add(new FormField { TKey = "AddressLatitude", FieldKey = "Latitude" });
+                    l.Add(new FormField { TKey = "AddressLongitude", FieldKey = "Longitude" });
+                    l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" });
+                    l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" });
+                    l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" });
+                    l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" });
+                    l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" });
 
-                    l.Add(new FormField { TKey = "LicenseCustom1", FieldKey = "LicenseCustom1", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom2", FieldKey = "LicenseCustom2", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom3", FieldKey = "LicenseCustom3", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom4", FieldKey = "LicenseCustom4", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom5", FieldKey = "LicenseCustom5", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom6", FieldKey = "LicenseCustom6", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom7", FieldKey = "LicenseCustom7", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom8", FieldKey = "LicenseCustom8", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom9", FieldKey = "LicenseCustom9", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom10", FieldKey = "LicenseCustom10", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom11", FieldKey = "LicenseCustom11", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom12", FieldKey = "LicenseCustom12", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom13", FieldKey = "LicenseCustom13", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom14", FieldKey = "LicenseCustom14", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom15", FieldKey = "LicenseCustom15", IsCustomField = true });
-                    l.Add(new FormField { TKey = "LicenseCustom16", FieldKey = "LicenseCustom16", IsCustomField = true });
-                    _formFields.Add(SockType.License.ToString(), l);
+                    l.Add(new FormField { TKey = "VendorCustom1", FieldKey = "VendorCustom1", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom2", FieldKey = "VendorCustom2", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom3", FieldKey = "VendorCustom3", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom4", FieldKey = "VendorCustom4", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom5", FieldKey = "VendorCustom5", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom6", FieldKey = "VendorCustom6", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom7", FieldKey = "VendorCustom7", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom8", FieldKey = "VendorCustom8", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom9", FieldKey = "VendorCustom9", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom10", FieldKey = "VendorCustom10", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom11", FieldKey = "VendorCustom11", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom12", FieldKey = "VendorCustom12", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom13", FieldKey = "VendorCustom13", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom14", FieldKey = "VendorCustom14", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom15", FieldKey = "VendorCustom15", IsCustomField = true });
+                    l.Add(new FormField { TKey = "VendorCustom16", FieldKey = "VendorCustom16", IsCustomField = true });
+                    _formFields.Add(SockType.Vendor.ToString(), l);
                 }
                 #endregion