diff --git a/DataFilter/DataFilterFilteringLists.cs b/DataFilter/DataFilterFilteringLists.cs
index 308b4d8..f513f5b 100644
--- a/DataFilter/DataFilterFilteringLists.cs
+++ b/DataFilter/DataFilterFilteringLists.cs
@@ -84,7 +84,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = new DateTime(1968, 3, 12, 10, 0, 0).ToUniversalTime();
             w.endDate = new DateTime(1968, 3, 12, 11, 0, 0).ToUniversalTime();
 
@@ -186,7 +186,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
             w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
 
@@ -288,7 +288,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
             w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
 
@@ -389,7 +389,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
             w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
 
@@ -491,7 +491,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
             w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
 
@@ -593,7 +593,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
             w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
 
@@ -695,7 +695,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = DateTime.UtcNow.AddDays(-1);
             w.endDate = DateTime.UtcNow.AddHours(1).AddDays(-1);
 
@@ -797,7 +797,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = DateTime.UtcNow;
             w.endDate = DateTime.UtcNow.AddHours(1);
 
@@ -899,7 +899,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = DateTime.UtcNow.AddDays(1);
             w.endDate = DateTime.UtcNow.AddDays(1).AddHours(1);
 
@@ -1001,7 +1001,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //My theory is any date - 7 days is last week if you go sunday to sunday
             w.startDate = DateTime.UtcNow.AddDays(-7);
             w.endDate = DateTime.UtcNow.AddHours(1).AddDays(-7);
@@ -1103,7 +1103,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = DateTime.UtcNow;
             w.endDate = DateTime.UtcNow.AddHours(1);
 
@@ -1206,7 +1206,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //My theory is any date + 7 days is next week if you go sunday to sunday
             w.startDate = DateTime.UtcNow.AddDays(7);
             w.endDate = DateTime.UtcNow.AddHours(1).AddDays(7);
@@ -1310,7 +1310,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //First day of this month minus 2 days equals second to last day of last month
             w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).ToUniversalTime();
             w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddDays(-2).AddHours(1).ToUniversalTime();
@@ -1415,7 +1415,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //Put it right at midnight this month to ensure boundaries are respected
             w.startDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).ToUniversalTime();
             w.endDate = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00).AddHours(1).ToUniversalTime();
@@ -1521,7 +1521,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //Put it right at midnight next month to ensure boundaries are respected
             //Note, due to daylight saving time this test can fail by one hour on the boundary
             //as noted in March 2019
@@ -1630,7 +1630,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
 
             w.startDate = DateTime.UtcNow;
             w.endDate = DateTime.UtcNow.AddHours(1);
@@ -1735,7 +1735,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //Test if for the past, definitely going to be in the past when the list is fetched after saving, but will it work with the server on another machine??
             //Best to pad in 5 minutes to be on the safe side, these days no two computers on earth should be out by more than 5 minutes to UTC from each other      
             w.startDate = DateTime.UtcNow.AddMinutes(-5);
@@ -1839,7 +1839,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //####
             w.startDate = DateTime.UtcNow.AddMinutes(5);
             w.endDate = DateTime.UtcNow.AddMinutes(5).AddHours(1);
@@ -1943,7 +1943,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //####
             w.startDate = DateTime.UtcNow.AddYears(-1).AddMinutes(-5);
             w.endDate = DateTime.UtcNow.AddYears(-1).AddMinutes(-5).AddHours(1);
@@ -2050,7 +2050,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //####
             w.startDate = DateTime.UtcNow;
             w.endDate = DateTime.UtcNow.AddHours(1);
@@ -2156,7 +2156,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //####
             w.startDate = DateTime.UtcNow.AddMonths(-3).AddMinutes(5);
             w.endDate = DateTime.UtcNow.AddMonths(-3).AddMinutes(5).AddHours(1);
@@ -2259,7 +2259,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //####
             w.startDate = DateTime.UtcNow.AddMonths(-6).AddMinutes(5);
             w.endDate = DateTime.UtcNow.AddMonths(-6).AddMinutes(5).AddHours(1);
@@ -2362,7 +2362,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //####
             w.startDate = DateTime.UtcNow.AddDays(-365).AddMinutes(5);
             w.endDate = DateTime.UtcNow.AddDays(-365).AddMinutes(5).AddHours(1);
@@ -2485,7 +2485,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = InclusiveStartDate;
             w.endDate = InclusiveEndDate;
 
@@ -2602,7 +2602,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = InclusiveStartDate;
             w.endDate = InclusiveEndDate;
 
@@ -2717,7 +2717,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = InclusiveStartDate;
             w.endDate = InclusiveEndDate;
 
@@ -2833,7 +2833,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.startDate = InclusiveStartDate;
             w.endDate = InclusiveEndDate;
 
@@ -2947,7 +2947,7 @@ namespace raven_integration
             //first inclusive widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "aardvark";
             w.roles = 0;
 
@@ -3072,7 +3072,7 @@ namespace raven_integration
             //first inclusive widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "O'Flaherty's pub";
             w.roles = 0;
 
@@ -3194,7 +3194,7 @@ namespace raven_integration
             //first inclusive widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Bill & Ted's excellent adventure";
             w.roles = 0;
 
@@ -3317,7 +3317,7 @@ namespace raven_integration
             var InclusiveTestString = "Ādam Iñtërnâtiônàližætiøn";
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = InclusiveTestString;
             w.roles = 0;
 
@@ -3440,7 +3440,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Alabama";
             w.roles = 0;
 
@@ -3563,7 +3563,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Bjorn";
             w.roles = 0;
 
@@ -3686,7 +3686,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "California";
             w.roles = 0;
 
@@ -3809,7 +3809,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Donut";
             w.roles = 0;
 
@@ -3931,7 +3931,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Egg Salad Sandwich";
             w.roles = 0;
 
@@ -4053,7 +4053,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Gray poupon";
             w.roles = 0;
 
@@ -4175,7 +4175,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Fast Freddy Freak";
             w.roles = 0;
 
@@ -4297,7 +4297,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Granular";
             w.roles = 0;
 
@@ -4420,7 +4420,7 @@ namespace raven_integration
             //first inclusive widget             
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "Bo Horvat";
             w.roles = 0;
 
@@ -4556,12 +4556,12 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.active = true;
             w.roles = 0;
             w.count = 5;
             w.notes = "blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
 
             ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
             Util.ValidateDataReturnResponseOk(a);
@@ -4658,7 +4658,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -4760,7 +4760,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -4864,7 +4864,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -4967,7 +4967,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5071,7 +5071,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5185,7 +5185,7 @@ namespace raven_integration
             //first active widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5313,7 +5313,7 @@ namespace raven_integration
             //first active widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5444,7 +5444,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5545,7 +5545,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5647,7 +5647,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5751,7 +5751,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5854,7 +5854,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -5958,7 +5958,7 @@ namespace raven_integration
             //included widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.active = true;
             w.roles = 0;
@@ -6068,7 +6068,7 @@ namespace raven_integration
             //first inclusive widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             //Tags 
             dynamic InclusiveTagsArray = new JArray();
@@ -6214,7 +6214,7 @@ namespace raven_integration
             //first inclusive widget          
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             //Tags 
             dynamic InclusiveTagsArray = new JArray();
diff --git a/DataFilter/DataFilterOrderBy.cs b/DataFilter/DataFilterOrderBy.cs
index 54d1291..c00eae2 100644
--- a/DataFilter/DataFilterOrderBy.cs
+++ b/DataFilter/DataFilterOrderBy.cs
@@ -28,7 +28,7 @@ namespace raven_integration
 
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
             Util.ValidateDataReturnResponseOk(a);
@@ -36,7 +36,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
             Util.ValidateDataReturnResponseOk(a);
@@ -44,7 +44,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
             Util.ValidateDataReturnResponseOk(a);
@@ -118,7 +118,7 @@ namespace raven_integration
 
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.startDate = DateTime.Now;
             w.endDate = DateTime.Now.AddHours(1);
@@ -129,7 +129,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.startDate = DateTime.Now.AddHours(1);
             w.endDate = DateTime.Now.AddHours(2);
@@ -139,7 +139,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.startDate = DateTime.Now.AddHours(2);
             w.endDate = DateTime.Now.AddHours(3);
@@ -224,7 +224,7 @@ namespace raven_integration
 
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.count = 999;
 
@@ -234,7 +234,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.count = 665;
             a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -243,7 +243,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.count = 333;
             a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -347,7 +347,7 @@ namespace raven_integration
 
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.dollaramount = 2.22;
             w.count = 1;
@@ -358,7 +358,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.dollaramount = 1.11;
             w.count = 2;
@@ -368,7 +368,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.dollaramount = 1.11;
             w.count = 1;
@@ -378,7 +378,7 @@ namespace raven_integration
 
             w = new JObject();
             w.name = Util.Uniquify(WidgetNameStart);
-             w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+             w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.dollaramount = 2.22;
             w.count = 2;
diff --git a/EventLog/EventLog.cs b/EventLog/EventLog.cs
index 8d8a15f..4ee9ae7 100644
--- a/EventLog/EventLog.cs
+++ b/EventLog/EventLog.cs
@@ -26,7 +26,7 @@ namespace raven_integration
 
             dynamic w = new JObject();
             w.name = Util.Uniquify("EventLog Test WIDGET");
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w.notes = "blah";
             w.created = DateTime.Now.ToString();
             w.dollarAmount = 2.22m;
diff --git a/FormCustom/FormCustom.cs b/FormCustom/FormCustom.cs
index bef482c..15a4bfe 100644
--- a/FormCustom/FormCustom.cs
+++ b/FormCustom/FormCustom.cs
@@ -53,6 +53,7 @@ namespace raven_integration
 
             d.template = dtemplate.ToString();//it expects it to be a json string, not actual json
 
+ISN"T THIS WRONG?  It's a direct array, examine the json here
 
             //Is there one already?
             //RETRIEVE           
@@ -120,7 +121,7 @@ namespace raven_integration
         {
             ApiResponse a = await Util.GetAsync("FormCustom/AvailableCustomizableFormKeys", await Util.GetTokenAsync("BizAdminFull"));
             Util.ValidateDataReturnResponseOk(a);
-            ((JArray)a.ObjectResponse["data"]).Count.Should().BeGreaterThan(2);//is 2 as of writing (widget,user)
+            ((JArray)a.ObjectResponse["data"]).Count.Should().BeGreaterThan(1);//is 2 as of writing (widget,user)
         }
 
 
diff --git a/Search/SearchOps.cs b/Search/SearchOps.cs
index aa8d156..3bf509f 100644
--- a/Search/SearchOps.cs
+++ b/Search/SearchOps.cs
@@ -20,7 +20,7 @@ namespace raven_integration
             //CREATE A WIDGET
             dynamic D = new JObject();
             D.name = Util.Uniquify("Search NOTES Test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -33,7 +33,7 @@ namespace raven_integration
             //CREATE FIRST TEST USER WITH PHRASE IN NAME
             D = new JObject();
             D.name = Util.Uniquify("Search NAME DOGS simple Test User");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.notes = "This user has the match in it's name";
            
             D.active = true;
@@ -50,7 +50,7 @@ namespace raven_integration
             //CREATE A SECOND TEST USER WITH PHRASE IN NOTES
             D = new JObject();
             D.name = Util.Uniquify("Search NOTES Test User");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.notes = "This user has the match simple dogs in its notes";
            
             D.active = true;
@@ -67,7 +67,7 @@ namespace raven_integration
             //CREATE A SECOND WIDGET
             D = new JObject();
             D.name = Util.Uniquify("Search NAME simple as in dogs Test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -80,7 +80,7 @@ namespace raven_integration
             //CREATE A THIRD WIDGET
             D = new JObject();
             D.name = Util.Uniquify("Search NO-MATCH THIRD Test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -174,11 +174,12 @@ namespace raven_integration
             //CREATE A WIDGET
             dynamic D = new JObject();
             D.name = Util.Uniquify("Wildcard startswith search test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
             D.notes = "This record will match in notes: The quick brown and hapless goose";
+        
 
             ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), D.ToString());
             Util.ValidateDataReturnResponseOk(a);
@@ -237,7 +238,7 @@ namespace raven_integration
             //CREATE A WIDGET
             dynamic D = new JObject();
             D.name = Util.Uniquify("Wildcard endswith search test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -302,7 +303,7 @@ namespace raven_integration
             //CREATE A WIDGET
             dynamic D = new JObject();
             D.name = Util.Uniquify("Wildcard contains search test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -380,7 +381,7 @@ namespace raven_integration
             //CREATE A WIDGET
             dynamic D = new JObject();
             D.name = Util.Uniquify("TAG search test WIDGET TAG AND PHRASE");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -397,7 +398,7 @@ namespace raven_integration
             //CREATE A WIDGET WITH TAG BUT NOT SEARCH PHRASE
             D = new JObject();
             D.name = Util.Uniquify("TAG search test WIDGET TAG ONLY");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
@@ -541,7 +542,7 @@ namespace raven_integration
             //CREATE A WIDGET
             dynamic D = new JObject();
             D.name = Util.Uniquify("Serial search test WIDGET");
-            D.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            D.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             D.dollarAmount = 1.11m;
             D.active = true;
             D.roles = 0;
diff --git a/Tags/TagOps.cs b/Tags/TagOps.cs
index 233a190..fae4316 100644
--- a/Tags/TagOps.cs
+++ b/Tags/TagOps.cs
@@ -52,7 +52,7 @@ namespace raven_integration
             dynamic w = new JObject();
             w.name = Util.Uniquify(WidgetRunNameStart);
             w.notes="blah";
-            w.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             //Tags 
             dynamic InitialTags = new JArray();
             foreach (string s in InitialTagsList)
diff --git a/Widget/WidgetCrud.cs b/Widget/WidgetCrud.cs
index 621e121..7f29f73 100644
--- a/Widget/WidgetCrud.cs
+++ b/Widget/WidgetCrud.cs
@@ -31,7 +31,7 @@ namespace raven_integration
             w1.active = true;
             w1.roles = 0;
             w1.notes = "The quick brown fox jumped over the six lazy dogs!";
-            w1.customFields = Util.GenerateCustomFieldsJsonString("MyCustomText in Custom 1 field");
+            w1.customFields = Util.WidgetRequiredCustomFieldsJsonString();
 
             //Tags 
             dynamic dTagsArray = new JArray();
@@ -55,7 +55,7 @@ namespace raven_integration
             w2.roles = 0;
             w2.notes = "What is the frequency Kenneth?";
             w2.tags = dTagsArray;
-            w2.customFields = Util.GenerateCustomFieldsJsonString("MyCustomText in Custom 1 field");
+            w2.customFields = Util.WidgetRequiredCustomFieldsJsonString();
 
             ApiResponse r2 = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w2.ToString());
             Util.ValidateDataReturnResponseOk(r2);
@@ -187,7 +187,7 @@ namespace raven_integration
             w2.roles = 0;
 
             w2.notes="blah";
-            w2.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w2.customFields = Util.WidgetRequiredCustomFieldsJsonString();
 
 
             ApiResponse r2 = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w2.ToString());
@@ -224,10 +224,11 @@ namespace raven_integration
             dynamic w2 = new JObject();
             w2.name = Util.Uniquify("PatchConcurrencyViolationShouldFail");
             w2.notes="blah";
-            w2.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            w2.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             w2.dollarAmount = 2.22m;
             w2.active = true;
             w2.roles = 0;
+            w2.customFields = Util.WidgetRequiredCustomFieldsJsonString();
 
             ApiResponse r2 = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w2.ToString());
             Util.ValidateDataReturnResponseOk(r2);
diff --git a/Widget/WidgetLists.cs b/Widget/WidgetLists.cs
index f37edac..caada09 100644
--- a/Widget/WidgetLists.cs
+++ b/Widget/WidgetLists.cs
@@ -60,7 +60,7 @@ namespace raven_integration
             dynamic d = new JObject();
             d.name = Util.Uniquify(NameStart);
             d.notes="blah";
-            d.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            d.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             d.startDate = DateTime.Now;
             d.endDate = DateTime.Now.AddHours(1);
 
@@ -71,7 +71,7 @@ namespace raven_integration
             d = new JObject();
             d.name = Util.Uniquify(NameStart);
             d.notes="blah";
-            d.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            d.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             d.startDate = DateTime.Now.AddHours(1);
             d.endDate = DateTime.Now.AddHours(2);
             a = await Util.PostAsync(RouteName, await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
@@ -81,7 +81,7 @@ namespace raven_integration
             d = new JObject();
             d.name = Util.Uniquify(NameStart);
             d.notes="blah";
-            d.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            d.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             d.startDate = DateTime.Now.AddHours(2);
             d.endDate = DateTime.Now.AddHours(3);
             a = await Util.PostAsync(RouteName, await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
diff --git a/Widget/WidgetValidationTests.cs b/Widget/WidgetValidationTests.cs
index b5893b2..d1c04ac 100644
--- a/Widget/WidgetValidationTests.cs
+++ b/Widget/WidgetValidationTests.cs
@@ -46,7 +46,7 @@ namespace raven_integration
             dynamic d = new JObject();
             d.name = Util.Uniquify("BusinessRuleNameMustBeUnique TEST WIDGET");
             d.notes="blah";
-            d.customFields = Util.GenerateCustomFieldsJsonString("Meh1");
+            d.customFields = Util.WidgetRequiredCustomFieldsJsonString();
             d.created = DateTime.Now.ToString();
             d.dollarAmount = 1.11m;
             d.active = true;
diff --git a/util.cs b/util.cs
index 62c3618..7563901 100644
--- a/util.cs
+++ b/util.cs
@@ -431,6 +431,63 @@ namespace raven_integration
             return dCustomField.ToString();
         }
 
+         /// <summary>
+         /// Generate a custom fields string that satisfies the rules in the sample test data
+         /// </summary>
+         /// <returns></returns>
+         public static string WidgetRequiredCustomFieldsJsonString()
+        {/*CURRENT TEMPLATE DEFINITION FOR WIDGET CUSTOM FIELDS, FROM SEEDER.CS SERVER PROJECT
+        {
+                                        ""template"": [
+                                            {
+                                            ""fld"": ""WidgetNotes"",
+                                            ""required"": ""true""
+                                            },
+                                            {
+                                            ""fld"": ""WidgetCustom1"",
+                                            ""hide"": ""false"",
+                                            ""required"": ""false"",
+                                            ""type"": ""date""
+                                            },
+                                            {
+                                            ""fld"": ""WidgetCustom2"",
+                                            ""hide"": ""false"",
+                                            ""required"": ""true"",
+                                            ""type"": ""text""
+                                            },
+                                            {
+                                            ""fld"": ""WidgetCustom3"",
+                                            ""hide"": ""false"",
+                                            ""required"": ""false"",
+                                            ""type"": ""int""
+                                            },
+                                            {
+                                            ""fld"": ""WidgetCustom4"",
+                                            ""hide"": ""false"",
+                                            ""required"": ""false"",
+                                            ""type"": ""bool""
+                                            },
+                                            {
+                                            ""fld"": ""WidgetCustom5"",
+                                            ""hide"": ""false"",
+                                            ""required"": ""false"",
+                                            ""type"": ""decimal""
+                                            }
+                                        ]
+                                        }"
+         */
+
+            //Custom fields
+            //"[{c1:"blah"}]          
+            dynamic dCustomField = new JObject();
+            dCustomField.c1 = "2019-02-08T06:31:48.0019809Z";
+            dCustomField.c2 = "c2 text";
+            dCustomField.c3 = "333";
+            dCustomField.c4 = "true";
+            dCustomField.c5 = "5.55";
+            return dCustomField.ToString();
+        }
+
 
     }//eoc
 }//eons