diff --git a/.vscode/launch.json b/.vscode/launch.json
index fcc80a75..b77f3b95 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs
index 4685c16e..f166e52c 100644
--- a/server/AyaNova/Controllers/EnumListController.cs
+++ b/server/AyaNova/Controllers/EnumListController.cs
@@ -90,6 +90,7 @@ namespace AyaNova.Api.Controllers
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(PurchaseOrderStatus).ToString()), "PO Status"));
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(ContractOverrideType).ToString()), "Contract price adjustment type"));
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(WorkorderItemTaskCompletionType).ToString()), "Work order item task completion type"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(PMTimeUnit).ToString()), "PM time units"));
             return Ok(ApiOkResponse.Response(ret));
         }
 
@@ -380,11 +381,11 @@ namespace AyaNova.Api.Controllers
                 TranslationKeysToFetch.Add("NotifyEventContractExpiring");
                 TranslationKeysToFetch.Add("NotifyEventCSRAccepted");
                 TranslationKeysToFetch.Add("NotifyEventCSRRejected");
-                TranslationKeysToFetch.Add("NotifyEventWorkorderCompleted"); 
+                TranslationKeysToFetch.Add("NotifyEventWorkorderCompleted");
                 TranslationKeysToFetch.Add("NotifyEventQuoteStatusChange");
                 TranslationKeysToFetch.Add("NotifyEventQuoteStatusAge");
                 TranslationKeysToFetch.Add("NotifyEventObjectAge");
-               // TranslationKeysToFetch.Add("NotifyEventServiceBankDepleted");
+                // TranslationKeysToFetch.Add("NotifyEventServiceBankDepleted");
                 TranslationKeysToFetch.Add("NotifyEventReminderImminent");
                 TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorder");
                 TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorderImminent");
@@ -419,7 +420,7 @@ namespace AyaNova.Api.Controllers
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusChange"], Id = (long)NotifyEventType.QuoteStatusChange });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusAge"], Id = (long)NotifyEventType.QuoteStatusAge });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventObjectAge"], Id = (long)NotifyEventType.ObjectAge });
-               // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventServiceBankDepleted"], Id = (long)NotifyEventType.ServiceBankDepleted });
+                // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventServiceBankDepleted"], Id = (long)NotifyEventType.ServiceBankDepleted });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventReminderImminent"], Id = (long)NotifyEventType.ReminderImminent });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorder"], Id = (long)NotifyEventType.ScheduledOnWorkorder });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorderImminent"], Id = (long)NotifyEventType.ScheduledOnWorkorderImminent });
@@ -542,7 +543,7 @@ namespace AyaNova.Api.Controllers
                 // ReturnList.Add(new NameIdItem() { Name = "-", Id = (long)ContractOverrideType.NotSet });
 
             }
-             else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(WorkorderItemTaskCompletionType).ToString()).ToLowerInvariant())
+            else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(WorkorderItemTaskCompletionType).ToString()).ToLowerInvariant())
             {
                 TranslationKeysToFetch.Add("WorkOrderItemTaskCompletionTypeComplete");
                 TranslationKeysToFetch.Add("WorkOrderItemTaskCompletionTypeIncomplete");
@@ -556,6 +557,24 @@ namespace AyaNova.Api.Controllers
                 ReturnList.Add(new NameIdItem() { Name = LT["WorkOrderItemTaskCompletionTypeNotApplicable"], Id = (long)WorkorderItemTaskCompletionType.NotApplicable });
                 ReturnList.Add(new NameIdItem() { Name = LT["WorkOrderItemTaskCompletionTypeFailed"], Id = (long)WorkorderItemTaskCompletionType.Failed });
             }
+            else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(PMTimeUnit).ToString()).ToLowerInvariant())
+            {
+
+                TranslationKeysToFetch.Add("TimeSpanYears");
+                TranslationKeysToFetch.Add("TimeSpanMonths");
+                TranslationKeysToFetch.Add("TimeSpanDays");
+                TranslationKeysToFetch.Add("TimeSpanHours");
+                TranslationKeysToFetch.Add("TimeSpanMinutes");
+
+                var LT = await TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, translationId);
+
+                ReturnList.Add(new NameIdItem() { Name = LT["TimeSpanYears"], Id = (long)PMTimeUnit.Years });
+                ReturnList.Add(new NameIdItem() { Name = LT["TimeSpanMonths"], Id = (long)PMTimeUnit.Months });
+                ReturnList.Add(new NameIdItem() { Name = LT["TimeSpanDays"], Id = (long)PMTimeUnit.Days });
+                ReturnList.Add(new NameIdItem() { Name = LT["TimeSpanHours"], Id = (long)PMTimeUnit.Hours });
+                ReturnList.Add(new NameIdItem() { Name = LT["TimeSpanMinutes"], Id = (long)PMTimeUnit.Minutes });
+
+            }
             //#################################################################################################################
             //################### NEW HERE DO NOT FORGET TO ADD TO LISTS AVAILABLE ABOVE AS WELL ##############################
             //#################################################################################################################