diff --git a/cumulusci.yml b/cumulusci.yml
index 3d0d6acb..c1784e5d 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -3,7 +3,7 @@ project:
     name: Membership-Management
     package:
         name:  Membership-Management
-        api_version: '59.0'
+        api_version: '48.0'
     source_format: sfdx
 
 tasks:
diff --git a/force-app/main/default/flows/DPEV_Listener.flow-meta.xml b/force-app/main/default/flows/DPEV_Listener.flow-meta.xml
new file mode 100644
index 00000000..58671ff8
--- /dev/null
+++ b/force-app/main/default/flows/DPEV_Listener.flow-meta.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Flow xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>59.0</apiVersion>
+    <decisions>
+        <name>Is_Membership_lookup_populated</name>
+        <label>Is Membership lookup populated?</label>
+        <locationX>314</locationX>
+        <locationY>278</locationY>
+        <defaultConnector>
+            <targetReference>Get_Membership</targetReference>
+        </defaultConnector>
+        <defaultConnectorLabel>Yes</defaultConnectorLabel>
+        <rules>
+            <name>No_MembershipLookupNotPopulated</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>Get_OpportunityLineItem.Membership__c</leftValueReference>
+                <operator>IsNull</operator>
+                <rightValue>
+                    <booleanValue>true</booleanValue>
+                </rightValue>
+            </conditions>
+            <connector>
+                <targetReference>Create_DPEV_Membership_Finder_PE</targetReference>
+            </connector>
+            <label>No</label>
+        </rules>
+    </decisions>
+    <decisions>
+        <name>Is_OpportunityProduct_same_as_Membership_Product</name>
+        <label>Is OpportunityProduct same as Membership Product?</label>
+        <locationX>578</locationX>
+        <locationY>494</locationY>
+        <defaultConnector>
+            <targetReference>Is_this_an_upgrade_or_downgrade</targetReference>
+        </defaultConnector>
+        <defaultConnectorLabel>No</defaultConnectorLabel>
+        <rules>
+            <name>Yes_ProductsMatch</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>Get_OpportunityLineItem.Product2Id</leftValueReference>
+                <operator>EqualTo</operator>
+                <rightValue>
+                    <elementReference>Get_Membership.Product__c</elementReference>
+                </rightValue>
+            </conditions>
+            <connector>
+                <targetReference>Create_DPEV_Extend_Membership</targetReference>
+            </connector>
+            <label>Yes</label>
+        </rules>
+    </decisions>
+    <decisions>
+        <description>Evaluates a custom field on the OpportunityLineItem.Product2</description>
+        <name>Is_this_an_upgrade_or_downgrade</name>
+        <label>Is this an upgrade or downgrade?</label>
+        <locationX>842</locationX>
+        <locationY>602</locationY>
+        <defaultConnectorLabel>No Change</defaultConnectorLabel>
+        <rules>
+            <name>Upgrade</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>Get_OpportunityLineItem.Product2.Membership_Weight__c</leftValueReference>
+                <operator>GreaterThan</operator>
+                <rightValue>
+                    <elementReference>Get_Membership.Product__r.Membership_Weight__c</elementReference>
+                </rightValue>
+            </conditions>
+            <connector>
+                <targetReference>Create_DPEV_Membership_Upgrade_PE</targetReference>
+            </connector>
+            <label>Upgrade</label>
+        </rules>
+        <rules>
+            <name>Downgrade</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>Get_OpportunityLineItem.Product2.Membership_Weight__c</leftValueReference>
+                <operator>LessThan</operator>
+                <rightValue>
+                    <elementReference>Get_Membership.Product__r.Membership_Weight__c</elementReference>
+                </rightValue>
+            </conditions>
+            <connector>
+                <targetReference>Create_DPEV_Membership_Downgrade_PE</targetReference>
+            </connector>
+            <label>Downgrade</label>
+        </rules>
+    </decisions>
+    <description>Platform Event triggered Flow that evaluates the next action to take in Membership processing</description>
+    <environments>Default</environments>
+    <interviewLabel>DPEV Listener {!$Flow.CurrentDateTime}</interviewLabel>
+    <label>BPEV Listener - Create Membership Transaction Process</label>
+    <processMetadataValues>
+        <name>BuilderType</name>
+        <value>
+            <stringValue>LightningFlowBuilder</stringValue>
+        </value>
+    </processMetadataValues>
+    <processMetadataValues>
+        <name>CanvasMode</name>
+        <value>
+            <stringValue>AUTO_LAYOUT_CANVAS</stringValue>
+        </value>
+    </processMetadataValues>
+    <processMetadataValues>
+        <name>OriginBuilderType</name>
+        <value>
+            <stringValue>LightningFlowBuilder</stringValue>
+        </value>
+    </processMetadataValues>
+    <processType>AutoLaunchedFlow</processType>
+    <recordCreates>
+        <description>Create a</description>
+        <name>Create_DPEV_Extend_Membership</name>
+        <label>Create DPEV - Extend Membership</label>
+        <locationX>314</locationX>
+        <locationY>602</locationY>
+        <inputAssignments>
+            <field>Record_Id__c</field>
+            <value>
+                <elementReference>Get_Membership.Id</elementReference>
+            </value>
+        </inputAssignments>
+        <object>DPEV_Extend_Membership__e</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordCreates>
+    <recordCreates>
+        <description>Creates a Platform Event where Record_Id__c = Id of the OpportunityLineItem</description>
+        <name>Create_DPEV_Membership_Downgrade_PE</name>
+        <label>Create DPEV - Membership Downgrade PE</label>
+        <locationX>842</locationX>
+        <locationY>710</locationY>
+        <inputAssignments>
+            <field>Record_Id__c</field>
+            <value>
+                <elementReference>$Record.Record_Id__c</elementReference>
+            </value>
+        </inputAssignments>
+        <object>DPEV_Membership_Downgrade__e</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordCreates>
+    <recordCreates>
+        <description>Creates a Platform Event where Record_Id__c = OpportunityLineItem Id</description>
+        <name>Create_DPEV_Membership_Finder_PE</name>
+        <label>Create DPEV - Membership Finder PE</label>
+        <locationX>50</locationX>
+        <locationY>386</locationY>
+        <inputAssignments>
+            <field>Record_Id__c</field>
+            <value>
+                <elementReference>$Record.Record_Id__c</elementReference>
+            </value>
+        </inputAssignments>
+        <object>DPEV_Membership_Finder__e</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordCreates>
+    <recordCreates>
+        <description>Creates a Platform Event where Record_Id__c = Id of the OpportunityLineItem</description>
+        <name>Create_DPEV_Membership_Upgrade_PE</name>
+        <label>Create DPEV - Membership Upgrade PE</label>
+        <locationX>578</locationX>
+        <locationY>710</locationY>
+        <inputAssignments>
+            <field>Record_Id__c</field>
+            <value>
+                <elementReference>$Record.Record_Id__c</elementReference>
+            </value>
+        </inputAssignments>
+        <object>DPEV_Membership_Upgrade__e</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordCreates>
+    <recordLookups>
+        <description>Queries Membership record where Id = Membership__c lookup on OpporutnityLineItem</description>
+        <name>Get_Membership</name>
+        <label>Get Membership</label>
+        <locationX>578</locationX>
+        <locationY>386</locationY>
+        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
+        <connector>
+            <targetReference>Is_OpportunityProduct_same_as_Membership_Product</targetReference>
+        </connector>
+        <filterLogic>and</filterLogic>
+        <filters>
+            <field>Id</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>Get_OpportunityLineItem.Membership__c</elementReference>
+            </value>
+        </filters>
+        <getFirstRecordOnly>true</getFirstRecordOnly>
+        <object>Membership__c</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordLookups>
+    <recordLookups>
+        <name>Get_OpportunityLineItem</name>
+        <label>Get OpportunityLineItem</label>
+        <locationX>314</locationX>
+        <locationY>170</locationY>
+        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
+        <connector>
+            <targetReference>Is_Membership_lookup_populated</targetReference>
+        </connector>
+        <filterLogic>and</filterLogic>
+        <filters>
+            <field>Id</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>$Record.Record_Id__c</elementReference>
+            </value>
+        </filters>
+        <getFirstRecordOnly>true</getFirstRecordOnly>
+        <object>OpportunityLineItem</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordLookups>
+    <start>
+        <locationX>188</locationX>
+        <locationY>0</locationY>
+        <connector>
+            <targetReference>Get_OpportunityLineItem</targetReference>
+        </connector>
+        <object>BPEV_Membership_Transaction__e</object>
+        <triggerType>PlatformEvent</triggerType>
+    </start>
+    <status>Active</status>
+</Flow>
diff --git a/force-app/main/default/flows/UTILITY_create_PE.flow-meta.xml b/force-app/main/default/flows/UTILITY_create_PE.flow-meta.xml
new file mode 100644
index 00000000..52664c03
--- /dev/null
+++ b/force-app/main/default/flows/UTILITY_create_PE.flow-meta.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Flow xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>59.0</apiVersion>
+    <environments>Default</environments>
+    <interviewLabel>UTILITY - create PE {!$Flow.CurrentDateTime}</interviewLabel>
+    <label>UTILITY - create PE</label>
+    <processMetadataValues>
+        <name>BuilderType</name>
+        <value>
+            <stringValue>LightningFlowBuilder</stringValue>
+        </value>
+    </processMetadataValues>
+    <processMetadataValues>
+        <name>CanvasMode</name>
+        <value>
+            <stringValue>AUTO_LAYOUT_CANVAS</stringValue>
+        </value>
+    </processMetadataValues>
+    <processMetadataValues>
+        <name>OriginBuilderType</name>
+        <value>
+            <stringValue>LightningFlowBuilder</stringValue>
+        </value>
+    </processMetadataValues>
+    <processType>Flow</processType>
+    <recordCreates>
+        <name>Create_PE</name>
+        <label>Create PE</label>
+        <locationX>176</locationX>
+        <locationY>134</locationY>
+        <inputAssignments>
+            <field>Record_Id__c</field>
+            <value>
+                <elementReference>varRecordID</elementReference>
+            </value>
+        </inputAssignments>
+        <object>BPEV_Membership_Transaction__e</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordCreates>
+    <start>
+        <locationX>50</locationX>
+        <locationY>0</locationY>
+        <connector>
+            <targetReference>Create_PE</targetReference>
+        </connector>
+    </start>
+    <status>Draft</status>
+    <variables>
+        <name>varRecordID</name>
+        <dataType>String</dataType>
+        <isCollection>false</isCollection>
+        <isInput>true</isInput>
+        <isOutput>false</isOutput>
+    </variables>
+</Flow>
diff --git a/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml b/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml
index bcf670db..d70f6d3e 100644
--- a/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml	
+++ b/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml	
@@ -27,6 +27,10 @@
                 <behavior>Edit</behavior>
                 <field>Downgrade_Path__c</field>
             </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>Membership_Weight__c</field>
+            </layoutItems>
         </layoutColumns>
         <layoutColumns>
             <layoutItems>
@@ -116,7 +120,6 @@
             <actionType>StandardButton</actionType>
             <sortOrder>3</sortOrder>
         </platformActionListItems>
-    
         <platformActionListItems>
             <actionName>NewEvent</actionName>
             <actionType>QuickAction</actionType>
diff --git a/force-app/main/default/layouts/Product2-Product Layout.layout-meta.xml b/force-app/main/default/layouts/Product2-Product Layout.layout-meta.xml
index e764ee82..d83e0373 100644
--- a/force-app/main/default/layouts/Product2-Product Layout.layout-meta.xml	
+++ b/force-app/main/default/layouts/Product2-Product Layout.layout-meta.xml	
@@ -29,6 +29,10 @@
                 <behavior>Edit</behavior>
                 <field>Family</field>
             </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>Membership_Weight__c</field>
+            </layoutItems>
         </layoutColumns>
         <style>TwoColumnsTopToBottom</style>
     </layoutSections>
@@ -86,7 +90,7 @@
     <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
     <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
     <summaryLayout>
-        <masterLabel>00h6t000002OIPt</masterLabel>
+        <masterLabel>00hDH000005vnmz</masterLabel>
         <sizeX>4</sizeX>
         <sizeY>0</sizeY>
         <summaryLayoutStyle>Default</summaryLayoutStyle>
diff --git a/force-app/main/default/objects/BPEV_Membership_Transaction__e/BPEV_Membership_Transaction__e.object-meta.xml b/force-app/main/default/objects/BPEV_Membership_Transaction__e/BPEV_Membership_Transaction__e.object-meta.xml
new file mode 100644
index 00000000..146b1020
--- /dev/null
+++ b/force-app/main/default/objects/BPEV_Membership_Transaction__e/BPEV_Membership_Transaction__e.object-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+    <deploymentStatus>Deployed</deploymentStatus>
+    <description>Platform Event that triggers logic based upon the Opportunity Line Item provided</description>
+    <eventType>HighVolume</eventType>
+    <label>BPEV - Membership Transaction</label>
+    <pluralLabel>BPEV - Membership Transactions</pluralLabel>
+    <publishBehavior>PublishAfterCommit</publishBehavior>
+</CustomObject>
diff --git a/force-app/main/default/objects/BPEV_Membership_Transaction__e/fields/Record_Id__c.field-meta.xml b/force-app/main/default/objects/BPEV_Membership_Transaction__e/fields/Record_Id__c.field-meta.xml
new file mode 100644
index 00000000..01a6f93b
--- /dev/null
+++ b/force-app/main/default/objects/BPEV_Membership_Transaction__e/fields/Record_Id__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Record_Id__c</fullName>
+    <externalId>false</externalId>
+    <inlineHelpText>OpportunityLineItem Id</inlineHelpText>
+    <isFilteringDisabled>false</isFilteringDisabled>
+    <isNameField>false</isNameField>
+    <isSortingDisabled>false</isSortingDisabled>
+    <label>Record Id</label>
+    <length>255</length>
+    <required>false</required>
+    <type>Text</type>
+    <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/DPEV_Extend_Membership__e/DPEV_Extend_Membership__e.object-meta.xml b/force-app/main/default/objects/DPEV_Extend_Membership__e/DPEV_Extend_Membership__e.object-meta.xml
new file mode 100644
index 00000000..5b78807d
--- /dev/null
+++ b/force-app/main/default/objects/DPEV_Extend_Membership__e/DPEV_Extend_Membership__e.object-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+    <deploymentStatus>Deployed</deploymentStatus>
+    <description>Platform Event to allow data processing for renewal</description>
+    <eventType>HighVolume</eventType>
+    <label>DPEV - Extend Membership</label>
+    <pluralLabel>DPEV - Extend Memberships</pluralLabel>
+    <publishBehavior>PublishAfterCommit</publishBehavior>
+</CustomObject>
diff --git a/force-app/main/default/objects/DPEV_Extend_Membership__e/fields/Record_Id__c.field-meta.xml b/force-app/main/default/objects/DPEV_Extend_Membership__e/fields/Record_Id__c.field-meta.xml
new file mode 100644
index 00000000..9865f992
--- /dev/null
+++ b/force-app/main/default/objects/DPEV_Extend_Membership__e/fields/Record_Id__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Record_Id__c</fullName>
+    <description>Membership Id</description>
+    <externalId>false</externalId>
+    <isFilteringDisabled>false</isFilteringDisabled>
+    <isNameField>false</isNameField>
+    <isSortingDisabled>false</isSortingDisabled>
+    <label>Record Id</label>
+    <length>255</length>
+    <required>false</required>
+    <type>Text</type>
+    <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/DPEV_Membership_Downgrade__e/DPEV_Membership_Downgrade__e.object-meta.xml b/force-app/main/default/objects/DPEV_Membership_Downgrade__e/DPEV_Membership_Downgrade__e.object-meta.xml
new file mode 100644
index 00000000..4b868460
--- /dev/null
+++ b/force-app/main/default/objects/DPEV_Membership_Downgrade__e/DPEV_Membership_Downgrade__e.object-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+    <deploymentStatus>Deployed</deploymentStatus>
+    <description>Platform Event that triggers a membership downgrade</description>
+    <eventType>HighVolume</eventType>
+    <label>DPEV - Membership Downgrade</label>
+    <pluralLabel>DPEV - Membership Downgrades</pluralLabel>
+    <publishBehavior>PublishAfterCommit</publishBehavior>
+</CustomObject>
diff --git a/force-app/main/default/objects/DPEV_Membership_Downgrade__e/fields/Record_Id__c.field-meta.xml b/force-app/main/default/objects/DPEV_Membership_Downgrade__e/fields/Record_Id__c.field-meta.xml
new file mode 100644
index 00000000..8fe576e4
--- /dev/null
+++ b/force-app/main/default/objects/DPEV_Membership_Downgrade__e/fields/Record_Id__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Record_Id__c</fullName>
+    <externalId>false</externalId>
+    <inlineHelpText>Membership Id</inlineHelpText>
+    <isFilteringDisabled>false</isFilteringDisabled>
+    <isNameField>false</isNameField>
+    <isSortingDisabled>false</isSortingDisabled>
+    <label>Record Id</label>
+    <length>255</length>
+    <required>false</required>
+    <type>Text</type>
+    <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/DPEV_Membership_Upgrade__e/DPEV_Membership_Upgrade__e.object-meta.xml b/force-app/main/default/objects/DPEV_Membership_Upgrade__e/DPEV_Membership_Upgrade__e.object-meta.xml
new file mode 100644
index 00000000..ebe30f5d
--- /dev/null
+++ b/force-app/main/default/objects/DPEV_Membership_Upgrade__e/DPEV_Membership_Upgrade__e.object-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
+    <deploymentStatus>Deployed</deploymentStatus>
+    <description>Platform event that triggers upgrading a Membership</description>
+    <eventType>HighVolume</eventType>
+    <label>DPEV - Membership Upgrade</label>
+    <pluralLabel>DPEV - Membership Upgrades</pluralLabel>
+    <publishBehavior>PublishAfterCommit</publishBehavior>
+</CustomObject>
diff --git a/force-app/main/default/objects/DPEV_Membership_Upgrade__e/fields/Record_Id__c.field-meta.xml b/force-app/main/default/objects/DPEV_Membership_Upgrade__e/fields/Record_Id__c.field-meta.xml
new file mode 100644
index 00000000..9865f992
--- /dev/null
+++ b/force-app/main/default/objects/DPEV_Membership_Upgrade__e/fields/Record_Id__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Record_Id__c</fullName>
+    <description>Membership Id</description>
+    <externalId>false</externalId>
+    <isFilteringDisabled>false</isFilteringDisabled>
+    <isNameField>false</isNameField>
+    <isSortingDisabled>false</isSortingDisabled>
+    <label>Record Id</label>
+    <length>255</length>
+    <required>false</required>
+    <type>Text</type>
+    <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Pricebook2/listViews/All.listView-meta.xml b/force-app/main/default/objects/Pricebook2/listViews/All.listView-meta.xml
new file mode 100644
index 00000000..e6c66313
--- /dev/null
+++ b/force-app/main/default/objects/Pricebook2/listViews/All.listView-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>All</fullName>
+    <columns>PRICEBOOK2.NAME</columns>
+    <columns>PRICEBOOK2.IS_ACTIVE</columns>
+    <columns>PRICEBOOK2.DESCRIPTION</columns>
+    <columns>PRICEBOOK2.LAST_UPDATE</columns>
+    <filterScope>Everything</filterScope>
+    <label>All</label>
+</ListView>
diff --git a/force-app/main/default/objects/Product2/fields/Membership_Weight__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/Membership_Weight__c.field-meta.xml
new file mode 100644
index 00000000..be7e5682
--- /dev/null
+++ b/force-app/main/default/objects/Product2/fields/Membership_Weight__c.field-meta.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Membership_Weight__c</fullName>
+    <description>Used in Flows to determine if a membership is an upgrade / downgrade</description>
+    <externalId>false</externalId>
+    <inlineHelpText>For membership products, set weights to &quot;rank&quot; for upgrade / downgrade.</inlineHelpText>
+    <label>Membership Weight</label>
+    <precision>18</precision>
+    <required>false</required>
+    <scale>0</scale>
+    <trackHistory>false</trackHistory>
+    <type>Number</type>
+    <unique>false</unique>
+</CustomField>