diff --git a/.forceignore b/.forceignore
index 7b5b5a7..3b69dd6 100755
--- a/.forceignore
+++ b/.forceignore
@@ -9,4 +9,6 @@ package.xml
 **/.eslintrc.json
 
 # LWC Jest
-**/__tests__/**
\ No newline at end of file
+**/__tests__/**
+
+force-app/main/default/appMenus/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f5f33eb..767dc09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ $RECYCLE.BIN/
 **/__pycache__/
 **/.venv/
 **/venv/
+
+force-app/main/default/appMenus/
\ No newline at end of file
diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json
index afd2538..817808e 100644
--- a/config/project-scratch-def.json
+++ b/config/project-scratch-def.json
@@ -1,13 +1,4 @@
 {
   "orgName": "kcapehart company",
-  "edition": "Developer",
-  "features": ["EnableSetPasswordInApi"],
-  "settings": {
-    "lightningExperienceSettings": {
-      "enableS1DesktopEnabled": true
-    },
-    "mobileSettings": {
-      "enableS1EncryptedStoragePref2": false
-    }
-  }
+  "sourceOrg": "00DDn000008jOSpMAM"
 }
diff --git a/force-app/main/default/appMenus/AppSwitcher.appMenu-meta.xml b/force-app/main/default/appMenus/AppSwitcher.appMenu-meta.xml
new file mode 100644
index 0000000..0a72747
--- /dev/null
+++ b/force-app/main/default/appMenus/AppSwitcher.appMenu-meta.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AppMenu xmlns="http://soap.sforce.com/2006/04/metadata">
+    <appMenuItems>
+        <name>standard__Platform</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Sales</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Service</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Marketing</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__ServiceConsole</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__AppLauncher</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Community</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Sites</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Chatter</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Content</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__Insights</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__LightningSales</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__AllTabSet</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>CPQIntegrationUserApp</name>
+        <type>ConnectedApp</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__LightningBolt</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__SalesforceCMS</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__LightningScheduler</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__QueueManagement</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__RevenueCloudConsole</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__LightningService</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__LightningSalesConsole</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+    <appMenuItems>
+        <name>standard__DataManager</name>
+        <type>CustomApplication</type>
+    </appMenuItems>
+</AppMenu>
diff --git a/force-app/main/default/classes/AccountTriggerHelper.cls b/force-app/main/default/classes/AccountTriggerHelper.cls
index 08cd1b0..a9d4658 100644
--- a/force-app/main/default/classes/AccountTriggerHelper.cls
+++ b/force-app/main/default/classes/AccountTriggerHelper.cls
@@ -1,5 +1,5 @@
 public with sharing class AccountTriggerHelper {
     public static Boolean validatePhoneNumber(Account a) {
-        return Pattern.matches('[0-9(),./\\-]+', a.Phone);
+        return Pattern.matches('[0-9(),./\\-]+', a.Phone); // test
     }
 }
\ No newline at end of file
diff --git a/force-app/main/default/flexipages/LightningSalesConsole_UtilityBar.flexipage-meta.xml b/force-app/main/default/flexipages/LightningSalesConsole_UtilityBar.flexipage-meta.xml
new file mode 100644
index 0000000..5393e11
--- /dev/null
+++ b/force-app/main/default/flexipages/LightningSalesConsole_UtilityBar.flexipage-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
+    <description>The default utility bar for the Sales Console application.</description>
+    <flexiPageRegions>
+        <itemInstances>
+            <componentInstance>
+                <componentName>console:history</componentName>
+                <identifier>console_history</identifier>
+            </componentInstance>
+        </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentName>notes:utilityBarNoteList</componentName>
+                <identifier>notes_utilityBarNoteList</identifier>
+            </componentInstance>
+        </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentName>runtime_sales_todo_list:unifiedToDoListAuraWrapper</componentName>
+                <identifier>runtime_sales_todo_list_unifiedToDoListAuraWrapper</identifier>
+            </componentInstance>
+        </itemInstances>
+        <name>utilityItems</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <masterLabel>Sales Console App Utility Bar</masterLabel>
+    <template>
+        <name>one:utilityBarTemplateDesktop</name>
+    </template>
+    <type>UtilityBar</type>
+</FlexiPage>
diff --git a/force-app/main/default/flexipages/LightningService_UtilityBar.flexipage-meta.xml b/force-app/main/default/flexipages/LightningService_UtilityBar.flexipage-meta.xml
new file mode 100644
index 0000000..358e29d
--- /dev/null
+++ b/force-app/main/default/flexipages/LightningService_UtilityBar.flexipage-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
+    <description>The default utility bar for the Service Console application.</description>
+    <flexiPageRegions>
+        <itemInstances>
+            <componentInstance>
+                <componentName>console:history</componentName>
+                <identifier>console_history</identifier>
+            </componentInstance>
+        </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentName>notes:utilityBarNoteList</componentName>
+                <identifier>notes_utilityBarNoteList</identifier>
+            </componentInstance>
+        </itemInstances>
+        <name>utilityItems</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <masterLabel>Service Console App Utility Bar</masterLabel>
+    <template>
+        <name>one:utilityBarTemplateDesktop</name>
+    </template>
+    <type>UtilityBar</type>
+</FlexiPage>
diff --git a/force-app/main/default/flexipages/RevenueCloudConsole_UtilityBar.flexipage-meta.xml b/force-app/main/default/flexipages/RevenueCloudConsole_UtilityBar.flexipage-meta.xml
new file mode 100644
index 0000000..086b164
--- /dev/null
+++ b/force-app/main/default/flexipages/RevenueCloudConsole_UtilityBar.flexipage-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
+    <description>The default utility bar for the Subscription Management application.</description>
+    <flexiPageRegions>
+        <itemInstances>
+            <componentInstance>
+                <componentName>console:history</componentName>
+                <identifier>console_history</identifier>
+            </componentInstance>
+        </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentName>notes:utilityBarNoteList</componentName>
+                <identifier>notes_utilityBarNoteList</identifier>
+            </componentInstance>
+        </itemInstances>
+        <name>utilityItems</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <masterLabel>Subscription Management App Utility Bar</masterLabel>
+    <template>
+        <name>one:utilityBarTemplateDesktop</name>
+    </template>
+    <type>UtilityBar</type>
+</FlexiPage>
diff --git a/force-app/main/default/objects/Account/fields/Is_Current_Customer__c.field-meta.xml b/force-app/main/default/objects/Account/fields/Is_Current_Customer__c.field-meta.xml
index 9826eb0..fc01f83 100644
--- a/force-app/main/default/objects/Account/fields/Is_Current_Customer__c.field-meta.xml
+++ b/force-app/main/default/objects/Account/fields/Is_Current_Customer__c.field-meta.xml
@@ -5,7 +5,7 @@
     <description>Checkbox to denote if an account is an active customer or not</description>
     <externalId>false</externalId>
     <inlineHelpText>Checkbox to denote if an account is an active customer or not</inlineHelpText>
-    <label>Is Current Customer</label>
+    <label>Is Current Customer?</label>
     <trackFeedHistory>false</trackFeedHistory>
     <type>Checkbox</type>
 </CustomField>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBillingAdmin.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBillingAdmin.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..bb813d2
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBillingAdmin.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementBillingAdmin</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBillingOperations.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBillingOperations.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..9cc6a4e
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBillingOperations.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementBillingOperations</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBuyerIntegrationUser.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBuyerIntegrationUser.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..435ee14
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementBuyerIntegrationUser.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementBuyerIntegrationUser</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementCollections.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementCollections.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..ee8d916
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementCollections.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementCollections</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementCreditMemoAdjustmentsOperations.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementCreditMemoAdjustmentsOperations.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..1f5f53d
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementCreditMemoAdjustmentsOperations.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementCreditMemoAdjustmentsOperations</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementPaymentAdministrator.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementPaymentAdministrator.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..05bfaf0
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementPaymentAdministrator.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementPaymentAdministrator</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementPaymentOperations.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementPaymentOperations.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..42aa0e6
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementPaymentOperations.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementPaymentOperations</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementProductAndPricingAdmin.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementProductAndPricingAdmin.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..2aa873a
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementProductAndPricingAdmin.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementProductAndPricingAdmin</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementSalesOperationsRep.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementSalesOperationsRep.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..3e6626a
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementSalesOperationsRep.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementSalesOperationsRep</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementSalesRep.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementSalesRep.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..0348713
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementSalesRep.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementSalesRep</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsetgroups/force__SubscriptionManagementTaxAdmin.permissionsetgroup-meta.xml b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementTaxAdmin.permissionsetgroup-meta.xml
new file mode 100644
index 0000000..810f9bb
--- /dev/null
+++ b/force-app/main/default/permissionsetgroups/force__SubscriptionManagementTaxAdmin.permissionsetgroup-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSetGroup xmlns="http://soap.sforce.com/2006/04/metadata">
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>SubscriptionManagementTaxAdmin</label>
+    <status>Updated</status>
+</PermissionSetGroup>
diff --git a/force-app/main/default/permissionsets/sfdcInternalInt__sfdc_scrt2.permissionset-meta.xml b/force-app/main/default/permissionsets/sfdcInternalInt__sfdc_scrt2.permissionset-meta.xml
new file mode 100644
index 0000000..80ba7c5
--- /dev/null
+++ b/force-app/main/default/permissionsets/sfdcInternalInt__sfdc_scrt2.permissionset-meta.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSet xmlns="http://soap.sforce.com/2006/04/metadata">
+    <description>Give SCRT2 Integration User necessary access</description>
+    <hasActivationRequired>true</hasActivationRequired>
+    <label>SCRT2 Integration User</label>
+    <license>Cloud Integration User</license>
+    <objectPermissions>
+        <allowCreate>false</allowCreate>
+        <allowDelete>false</allowDelete>
+        <allowEdit>false</allowEdit>
+        <allowRead>true</allowRead>
+        <modifyAllRecords>false</modifyAllRecords>
+        <object>Case</object>
+        <viewAllRecords>true</viewAllRecords>
+    </objectPermissions>
+</PermissionSet>