diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 87a70a8..29ced53 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -850,15 +850,20 @@ namespace AyaNova.PlugIn.V8
                 d.webAddress = c.WebAddress;
                 d.popUpNotes = c.PopUpNotes;
                 d.billHeadOffice = c.BillHeadOffice;
-                if (c.BillHeadOffice && c.HeadOfficeID!=Guid.Empty)
+              
+               
+                if (c.HeadOfficeID != Guid.Empty)
                 {
-
+                    d.headOfficeId = GetMap(c.HeadOfficeID, "HeadOffice for Client " + d.name);
                 }
-                //todo: headOfficeId
                 d.techNotes = c.TechNotes;
                 d.accountNumber = c.AccountNumber;
                 d.usesBanking = c.UsesBanking;
-                //TODO d.contractId = 
+              
+                if (c.ContractID != Guid.Empty)
+                {
+                    d.contractId = GetMap(c.ContractID, "Contract for Client " + d.name);
+                }
                 d.contractExpires = c.ContractExpires;//?? dates
                 //todo d.defaultServiceTemplateId = c.defaultservicetemplateid
                 d.phone1 = c.Phone1;
@@ -1054,7 +1059,11 @@ namespace AyaNova.PlugIn.V8
 
                 d.accountNumber = c.AccountNumber;
                 d.usesBanking = c.UsesBanking;
-                //TODO d.contractId = 
+                if (c.ContractID != Guid.Empty)
+                {
+                    d.contractId = GetMap(c.ContractID, "Contract for Head Office " + d.name);
+                }
+                
                 d.contractExpires = c.ContractExpires;//?? dates
                 d.phone1 = c.Phone1;
                 d.phone2 = c.Phone2;