diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index ac81baf..5122806 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -9,6 +9,6 @@ jobs:
    uses: "SFDO-Community/standard-workflows/.github/workflows/beta-2gp.yml@main"
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  #  with:
+  #   cumulusci-version: '3.93.0'
+  #   sfdx-version: '7.209.6'
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index b3edfc6..5bf1d9c 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -1,16 +1,11 @@
 name: "Feature Test"
 on:
-  push:
-    branches:
-      - feature/**
-
+  pull_request:
+  workflow_dispatch:
 
 jobs:
- feature-test:
-   name: "Feature Test"
-   uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
-   secrets:
-    dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  feature-test:
+    name: "Feature Test"
+    uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
+    secrets:
+      dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
\ No newline at end of file
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index 1696028..e704693 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -1,11 +1,11 @@
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
 jobs:
   upload-production-release-2gp:
     name: "Upload Production Release (2GP)"
     uses: SFDO-Community/standard-workflows/.github/workflows/production-2gp.yml@main
-    with:
-      cumulusci-version: '3.93.0'
-      sfdx-version: '7.209.6'
+    # with:
+    #   cumulusci-version: '3.93.0'
+    #   sfdx-version: '7.209.6'
     secrets:
       dev-hub-auth-url: '${{ secrets.PACKAGING_ORG_AUTH_URL }}'
diff --git a/CODEOWNERS b/CODEOWNERS
index ce7a494..f1550f4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,14 @@
-# Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
+# Python
+*.py                  @SFDO-Community/sfdo-release-engineers
+
+# CumulusCI
+/cumulusci.yml        @SFDO-Community/sfdo-release-engineers
+/tasks/               @SFDO-Community/sfdo-release-engineers
+
+# Actions
+/.github                @SFDO-Community/sfdo-release-engineers
+/scripts                @SFDO-Community/sfdo-release-engineers
+
+
 #ECCN:Open Source
+#GUSINFO:Open Source,Open Source Workflow
diff --git a/force-app/main/default/classes/UUIDBatchJob.cls b/force-app/main/default/classes/UUIDBatchJob.cls
index f208d4e..ee56f15 100644
--- a/force-app/main/default/classes/UUIDBatchJob.cls
+++ b/force-app/main/default/classes/UUIDBatchJob.cls
@@ -109,12 +109,12 @@ public with sharing class UUIDBatchJob implements Database.Batchable<SObject> {
       }
     );
 
-    Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
-    mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
-    mail.setSubject('UUID Batch Job Complete');
-    mail.setPlainTextBody(emailBody);
-
     try {
+      Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
+      mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
+      mail.setSubject('UUID Batch Job Complete');
+      mail.setPlainTextBody(emailBody);
+
       Messaging.sendEmail(new List<Messaging.SingleEmailMessage>{ mail });
     } catch (Exception e) {
       System.debug(
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
similarity index 85%
rename from force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
index 33b4625..307b43b 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml
+++ b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
     <accessType>Public</accessType>
-    <name>Unsubscribe Link</name>
+    <name>UnsubscribeLink</name>
     <publicFolderAccess>ReadOnly</publicFolderAccess>
 </EmailFolder>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email
new file mode 100644
index 0000000..f86d2ca
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >
+  <messaging:htmlEmailBody > <!--  When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+<P>Dear Friend,</P>
+
+<P>It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!</P>
+
+<P>Your friend,</P>
+
+<P>Bob</P>
+
+
+     <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
+     which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
+   </messaging:htmlEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
new file mode 100644
index 0000000..30fb7aa
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object. </description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Unsubscribe Sample Contact Template</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml
new file mode 100644
index 0000000..3f23bc9
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object. </description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Unsubscribe Sample Lead Template</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email
new file mode 100644
index 0000000..4b47148
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody. 
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+Dear Friend,
+
+It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!
+
+Your friend,
+
+Bob
+
+Copy and paste this in your browser to unsubscribe: 
+{!Recipient.Unsubscribe_Url_Plain_Text__c}  <!-- This field can be 
+added to any plain text contact or lead email to display the url-->
+   </messaging:plainTextEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml
new file mode 100644
index 0000000..9b44272
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email </description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Unsubscribe Sample Lead Template-Plain Text</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email
rename to force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
similarity index 89%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml
rename to force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
index e1707b0..d66ee3a 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Contact Template </name>
+    <name>Sample Contact Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
new file mode 100644
index 0000000..fe5b9ac
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+<P>Dear Friend,</P>
+
+<P>It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!</P>
+
+<P>Your friend,</P>
+
+<P>Bob</P>
+
+
+     <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
+     which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
+   </messaging:htmlEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
similarity index 90%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml
rename to force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
index e063018..aed24c3 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Lead Template</name>
+    <name>Sample Lead Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email
rename to force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
similarity index 88%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml
rename to force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
index 1a92eb7..baf382d 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Lead Template-Plain Text</name>
+    <name>Sample Lead Template-Plain Text</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>