diff --git a/dlrs/main/classes/LookupRollupStatusCheckController.cls b/dlrs/main/classes/LookupRollupStatusCheckController.cls
index 79828cd9..88f53eec 100644
--- a/dlrs/main/classes/LookupRollupStatusCheckController.cls
+++ b/dlrs/main/classes/LookupRollupStatusCheckController.cls
@@ -40,6 +40,19 @@ public with sharing class LookupRollupStatusCheckController {
     ];
   }
 
+  /**
+   * Get count of scheduled items older than yesterday
+   * The assumption is that normal processing should have handled these
+   */
+  @AuraEnabled(Cacheable=true)
+  public static Integer getOutstandingScheduledItemsForLookup(String lookupID) {
+    return [
+      SELECT COUNT()
+      FROM LookupRollupSummaryScheduleItems__c
+      WHERE LookupRollupSummary2__c = :lookupID AND LastModifiedDate < YESTERDAY
+    ];
+  }
+
   /**
    * Check if the rollup has a Full Calculate schedule
    */
diff --git a/dlrs/main/lwc/flexiblePath/flexiblePath.html b/dlrs/main/lwc/flexiblePath/flexiblePath.html
index 9a677ba6..dc6d209f 100644
--- a/dlrs/main/lwc/flexiblePath/flexiblePath.html
+++ b/dlrs/main/lwc/flexiblePath/flexiblePath.html
@@ -90,9 +90,7 @@
         </div>
       </div>
       <div class="slds-grid slds-path__action" lwc:if={nextActionLabel}>
-        <span id="slds-path__stage-name" class="slds-path__stage-name"
-          >Next Action: {nextActionLabel}</span
-        >
+        <span id="slds-path__stage-name" class="slds-path__stage-name"></span>
         <button
           class="slds-button slds-button_brand slds-path__mark-complete"
           onclick={handleNextActionClick}
diff --git a/dlrs/main/lwc/flexiblePath/flexiblePath.js b/dlrs/main/lwc/flexiblePath/flexiblePath.js
index dc7966ba..26512a32 100644
--- a/dlrs/main/lwc/flexiblePath/flexiblePath.js
+++ b/dlrs/main/lwc/flexiblePath/flexiblePath.js
@@ -1,9 +1,18 @@
 import { LightningElement, api } from "lwc";
 
+export const PATH_STATES = {
+  complete: "complete",
+  current: "current",
+  incomplete: "incomplete",
+  failed: "failed"
+};
+
 /**
  * @typedef step
  * @property {string} label
- * @property {"complete"|"current"|"incomplete"|"failed"} status
+ * @property {string} name
+ * @property {keyof typeof PATH_STATES} status
+ * @property {string?} nextActionLabel
  */
 
 export default class FlexiblePath extends LightningElement {
@@ -25,18 +34,24 @@ export default class FlexiblePath extends LightningElement {
     if (!this.steps) {
       return "unknown";
     }
-    let nextLabel = this.steps.find((s) => s.status === "current")?.label;
-    if (!nextLabel) {
-      nextLabel = this.steps.find((s) => s.status === "incomplete")?.label;
-    }
-    return nextLabel;
+    let nextCurrent = this.nextAction;
+    return nextCurrent?.nextActionLabel ?? nextCurrent?.label;
+  }
+
+  get nextAction() {
+    return (
+      this.steps.find((s) => s.status === "current") ??
+      this.steps.find((s) => s.status === "incomplete")
+    );
   }
 
   handleNextActionClick() {
+    const nextAction = this.nextAction;
     this.dispatchEvent(
       new CustomEvent("nextactionclick", {
         detail: {
-          label: this.nextActionLabel
+          label: nextAction.label,
+          name: nextAction.name
         }
       })
     );
diff --git a/dlrs/main/lwc/manageRollups/manageRollups.js b/dlrs/main/lwc/manageRollups/manageRollups.js
index 6dbb84cf..fdcfa1bf 100644
--- a/dlrs/main/lwc/manageRollups/manageRollups.js
+++ b/dlrs/main/lwc/manageRollups/manageRollups.js
@@ -1,10 +1,12 @@
-import { LightningElement } from "lwc";
+import { LightningElement, wire } from "lwc";
 import { ShowToastEvent } from "lightning/platformShowToastEvent";
 import LightningConfirm from "lightning/confirm";
+import { NavigationMixin, CurrentPageReference } from "lightning/navigation";
+
 import getAllRollupConfigs from "@salesforce/apex/RollupEditorController.getAllRollupConfigs";
 import deleteRollupConfig from "@salesforce/apex/RollupEditorController.deleteRollupConfig";
 import USER_ID from "@salesforce/user/Id";
-import RollupEditorModal from "c/rollupEditorModal";
+import RollupEditor from "c/rollupEditor";
 
 import {
   subscribe,
@@ -13,7 +15,7 @@ import {
   isEmpEnabled
 } from "lightning/empApi";
 
-export default class ManageRollups extends LightningElement {
+export default class ManageRollups extends NavigationMixin(LightningElement) {
   dtColumns = [
     {
       type: "button",
@@ -29,21 +31,21 @@ export default class ManageRollups extends LightningElement {
       }
     },
     {
-      label: "Parent",
-      fieldName: "ParentObject__c"
+      label: "Child",
+      fieldName: "ChildObject__c"
     },
     {
       label: "Field To Aggregate",
       fieldName: "FieldToAggregate__c"
     },
-    {
-      label: "Child",
-      fieldName: "ChildObject__c"
-    },
     {
       label: "Relationship Field",
       fieldName: "RelationshipField__c"
     },
+    {
+      label: "Parent",
+      fieldName: "ParentObject__c"
+    },
     {
       label: "Operation",
       fieldName: "AggregateOperation__c"
@@ -54,7 +56,8 @@ export default class ManageRollups extends LightningElement {
     },
     {
       label: "Active",
-      fieldName: "Active__c"
+      fieldName: "Active__c",
+      type: "boolean"
     },
     {
       type: "button-icon",
@@ -67,6 +70,9 @@ export default class ManageRollups extends LightningElement {
     }
   ];
 
+  @wire(CurrentPageReference)
+  pageRef;
+
   // We only want events for which we've been assigned as the recipient
   channelName = `/event/UserNotification__e?Recipient__c='${USER_ID.substring(
     1,
@@ -125,15 +131,32 @@ export default class ManageRollups extends LightningElement {
   }
 
   async openEditor(rollupName) {
-    const result = await RollupEditorModal.open({
-      // `label` is not included here in this example.
-      // it is set on lightning-modal-header instead
+    const result = await RollupEditor.open({
       size: "large",
       description: "Rollup Config Editor",
       rollupName
     });
-    if (result?.action === "delete") {
-      this.requestDelete(result.rollupName);
+
+    switch (result?.action) {
+      case "delete":
+        this.requestDelete(result.rollupName);
+        break;
+      case "deloyStart":
+        // const rollupName = result.rollupName;
+        this.dispatchEvent(
+          new ShowToastEvent({
+            title: "Deployment Started",
+            message:
+              "Started Metadata Record Upates in Deployment " + result.jobId,
+            variant: "info"
+          })
+        );
+        break;
+      case "navigate":
+        this[NavigationMixin.Navigate](result.config);
+        break;
+      default:
+        break;
     }
   }
 
diff --git a/dlrs/main/lwc/rollupEditor/rollupEditor.html b/dlrs/main/lwc/rollupEditor/rollupEditor.html
index 34745302..f44f6743 100644
--- a/dlrs/main/lwc/rollupEditor/rollupEditor.html
+++ b/dlrs/main/lwc/rollupEditor/rollupEditor.html
@@ -1,482 +1,496 @@
 <template>
-  <lightning-card title={cardHeader}>
-    <div slot="actions">
-      <lightning-button-group>
-        <lightning-button
-          label="Activate"
-          onclick={activateClickHandler}
-          if:true={rollupCanBeActivated}
-        ></lightning-button>
-        <lightning-button
-          label={saveButtonLabel}
-          onclick={runSave}
-        ></lightning-button>
-        <lightning-button
-          label="Cancel"
-          variant="destructive"
-          onclick={cancelClickHandler}
-        ></lightning-button>
-        <lightning-button-menu
-          alternative-text="Show more"
-          menu-alignment="right"
-          lwc:if={rollup.Id}
-        >
-          <lightning-menu-item
-            label="Deactiveate"
-            if:true={rollupCanBeDeactivated}
-            onclick={deactivateClickHandler}
-          ></lightning-menu-item>
-          <lightning-menu-item
-            label="Clone"
-            lwc:if={rollup.Id}
-            onclick={cloneClickHandler}
-          ></lightning-menu-item>
-          <lightning-menu-item
-            label="Manage Triggers"
-            lwc:if={supportsTrigger}
-            onclick={manageTriggerHandler}
-          ></lightning-menu-item>
-          <lightning-menu-item
-            label="Recalculate Now"
-            lwc:if={rollup.Id}
-            onclick={recalculateNowHandler}
-          ></lightning-menu-item>
-          <lightning-menu-item
-            label="Schedule Reclaculation"
-            lwc:if={rollup.Id}
-            onclick={schedulRecalculateHandler}
-          ></lightning-menu-item>
-          <lightning-menu-item
-            label="Delete"
-            lwc:if={rollup.Id}
-            onclick={deleteClickHandler}
-          ></lightning-menu-item>
-        </lightning-button-menu>
-      </lightning-button-group>
-    </div>
+  <lightning-modal-header label={cardHeader}></lightning-modal-header>
+  <lightning-modal-body>
     <!--Name Rollup-->
-    <div class="slds-card__body_inner">
-      <lightning-layout class="slds-p-horizontal_medium">
-        <lightning-layout-item size="12">
-          <c-flexible-path
-            steps={steps}
-            onnextactionclick={pathClickHandler}
-          ></c-flexible-path>
-        </lightning-layout-item>
-      </lightning-layout>
-      <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-        <lightning-layout-item>
-          <c-rollup-editor-error errors={errors.record}></c-rollup-editor-error>
-          <c-rollup-editor-error
-            errors={errors.Active__c}
-          ></c-rollup-editor-error>
-        </lightning-layout-item>
-      </lightning-layout>
-      <lightning-accordion
-        allow-multiple-sections-open
-        active-section-name={openAccordianSections}
-      >
-        <lightning-accordion-section name="Information" label="Information">
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-input
-                type="text"
-                name="rollup_Label"
-                data-name="rollup_Label"
-                onblur={onLabelBlurHandler}
-                label="Lookup Rollup Summary Label"
-                placeholder="My Rollup Name"
-                value={rollup.Label}
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.Label}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-input
-                type="text"
-                name="rollup_DeveloperName"
-                data-name="rollup_DeveloperName"
-                label="Lookup Rollup Summary API Name"
-                placeholder="My_Rollup_Name"
-                disabled={rollup.Id}
-                value={rollup.DeveloperName}
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.DeveloperName}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <lightning-textarea
-                name="rollup_Description__c"
-                data-name="rollup_Description__c"
-                label="Description"
-                value={rollup.Description__c}
-                maxlength="255"
-              ></lightning-textarea>
-              <c-rollup-editor-error
-                errors={errors.Description__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12">
-              <c-rollup-status-check
-                name={rollup.Id}
-                lwc:if={rollup.Id}
-              ></c-rollup-status-check>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
-        <!--Pick Objects-->
-        <lightning-accordion-section name="ChildObject" label="Child Object">
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <p>
-                Pick the child object, the field that holds your data, and the
-                field that holds the reference to the parent.
-              </p>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <c-object-selector
-                label="Child Object"
-                placeholder="Child__c"
-                current-selection={rollup.ChildObject__c}
-                onlookupupdate={childObjectSelected}
-              ></c-object-selector>
-              <c-rollup-editor-error
-                errors={errors.ChildObject__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <c-autocomplete-combobox
-                data-name="rollup_FieldToAggregate__c"
-                label="Data Field"
-                value={rollup.FieldToAggregate__c}
-                options={childRFieldOptions}
-              ></c-autocomplete-combobox>
-              <c-rollup-editor-error
-                errors={errors.FieldToAggregate__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <c-autocomplete-combobox
-                data-name="rollup_RelationshipField__c"
-                label="Relationship to Parent"
-                value={rollup.RelationshipField__c}
-                options={childRFieldOptions}
-                placeholder="Lookup__c"
-                helper-text="All fields are listed but relationship fields are recommended."
-                onchangeselection={relationshipFieldSelectedHandler}
-              ></c-autocomplete-combobox>
-              <c-rollup-editor-error
-                errors={errors.RelationshipField__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
+    <lightning-layout class="slds-p-horizontal_medium" lwc:if={rollup.Id}>
+      <lightning-layout-item size="12">
+        <c-flexible-path
+          steps={steps}
+          onnextactionclick={pathClickHandler}
+        ></c-flexible-path>
+      </lightning-layout-item>
+    </lightning-layout>
+    <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+      <lightning-layout-item>
+        <c-rollup-editor-error errors={errors.record}></c-rollup-editor-error>
+        <c-rollup-editor-error
+          errors={errors.Active__c}
+        ></c-rollup-editor-error>
+        <c-rollup-editor-error
+          errors={scheduledItemsError}
+        ></c-rollup-editor-error>
+      </lightning-layout-item>
+    </lightning-layout>
+    <lightning-accordion
+      allow-multiple-sections-open
+      active-section-name={openAccordianSections}
+    >
+      <lightning-accordion-section name="Information" label="Information">
+        <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-input
+              type="text"
+              name="rollup_Label"
+              data-name="rollup_Label"
+              onblur={onLabelBlurHandler}
+              label="Lookup Rollup Summary Label"
+              placeholder="My Rollup Name"
+              value={rollup.Label}
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.Label}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-input
+              type="text"
+              name="rollup_DeveloperName"
+              data-name="rollup_DeveloperName"
+              label="Lookup Rollup Summary API Name"
+              placeholder="My_Rollup_Name"
+              disabled={rollup.Id}
+              value={rollup.DeveloperName}
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.DeveloperName}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <lightning-textarea
+              name="rollup_Description__c"
+              data-name="rollup_Description__c"
+              label="Description"
+              value={rollup.Description__c}
+              maxlength="255"
+            ></lightning-textarea>
+            <c-rollup-editor-error
+              errors={errors.Description__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12">
+            <c-rollup-status-check
+              name={rollup.Id}
+              lwc:if={rollup.Id}
+            ></c-rollup-status-check>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
+      <!--Pick Objects-->
+      <lightning-accordion-section name="ChildObject" label="Child Object">
+        <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <p>
+              Pick the child object, the field that holds your data, and the
+              field that holds the reference to the parent.
+            </p>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <c-object-selector
+              label="Child Object"
+              placeholder="Child__c"
+              helper-text="The object that holds the data that needs to be rolled up"
+              current-selection={rollup.ChildObject__c}
+              onlookupupdate={childObjectSelected}
+            ></c-object-selector>
+            <c-rollup-editor-error
+              errors={errors.ChildObject__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <c-autocomplete-combobox
+              data-name="rollup_FieldToAggregate__c"
+              label="Field to Aggregate"
+              helper-text="The field on the child object that holds the data to rollup"
+              value={rollup.FieldToAggregate__c}
+              options={childRFieldOptions}
+            ></c-autocomplete-combobox>
+            <c-rollup-editor-error
+              errors={errors.FieldToAggregate__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <c-autocomplete-combobox
+              data-name="rollup_RelationshipField__c"
+              label="Relationship Field"
+              value={rollup.RelationshipField__c}
+              helper-text="The field on the child object that holds Id values for the parent object (doesn't have to be a lookup)"
+              options={childRFieldOptions}
+              placeholder="Lookup__c"
+              onchangeselection={relationshipFieldSelectedHandler}
+            ></c-autocomplete-combobox>
+            <c-rollup-editor-error
+              errors={errors.RelationshipField__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
 
-        <lightning-accordion-section name="ParentObject" label="Parent Object">
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <p>
-                Pick the parent object you want to roll up to and the field that
-                will hold the resulting value
-              </p>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <c-object-selector
-                label="Parent Object"
-                placeholder="Parent__c"
-                current-selection={rollup.ParentObject__c}
-                onlookupupdate={parentObjectSelected}
-              ></c-object-selector>
-              <c-rollup-editor-error
-                errors={errors.ParentObject__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
+      <lightning-accordion-section name="ParentObject" label="Parent Object">
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <p>
+              Pick the parent object you want to roll up to and the field that
+              will hold the resulting value
+            </p>
+          </lightning-layout-item>
+        </lightning-layout>
+        <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <c-object-selector
+              label="Parent Object"
+              placeholder="Parent__c"
+              helper-text="The object that will hold the result of the rollup calculation"
+              current-selection={rollup.ParentObject__c}
+              onlookupupdate={parentObjectSelected}
+            ></c-object-selector>
+            <c-rollup-editor-error
+              errors={errors.ParentObject__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
 
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <c-autocomplete-combobox
-                data-name="rollup_AggregateResultField__c"
-                label="Data Result Field"
-                options={parentRFieldOptions}
-                value={rollup.AggregateResultField__c}
-              ></c-autocomplete-combobox>
-              <c-rollup-editor-error
-                errors={errors.AggregateResultField__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
-        <!--Set Relationship-->
-        <lightning-accordion-section
-          name="Relationship"
-          label="Relationship Criteria"
-        >
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <p>Define how child records will be qualified for the rollup</p>
-            </lightning-layout-item>
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <lightning-textarea
-                name="rollup_RelationshipCriteria__c"
-                data-name="rollup_RelationshipCriteria__c"
-                label="Relationship Criteria"
-                placeholder="Field1__c = TRUE AND Field2__r.Name = 'Parent Value'"
-                value={rollup.RelationshipCriteria__c}
-                maxlength="255"
-              ></lightning-textarea>
-              <c-rollup-editor-error
-                errors={errors.RelationshipCriteria__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="8"
-              class="slds-form-element_stacked"
-            >
-              <lightning-textarea
-                name="rollup_relationship_criteria_fields"
-                data-name="rollup_relationship_criteria_fields"
-                label="Relationship Criteria Fields"
-                placeholder="Status__c, Days__c"
-                value={rollup.RelationshipCriteriaFields__c}
-                maxlength="255"
-              ></lightning-textarea>
-              <c-rollup-editor-error
-                errors={errors.RelationshipCriteriaFields__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
-        <!--Summary settings-->
-        <lightning-accordion-section
-          name="RollupDetails"
-          label="Rollup Details"
-        >
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <p>Select the type and configuration of the rollup action</p>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-combobox
-                name="rollup_AggregateOperation__c"
-                data-name="rollup_AggregateOperation__c"
-                label="Rollup Type"
-                placeholder="Select"
-                options={aggregateOptions}
-                value={rollup.AggregateOperation__c}
-                required
-              ></lightning-combobox>
-              <c-rollup-editor-error
-                errors={errors.AggregateOperation__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-input
-                type="text"
-                name="rollup_ConcatenateDelimiter__c"
-                data-name="rollup_ConcatenateDelimiter__c"
-                label="Concatenate Delimiter"
-                value={rollup.ConcatenateDelimiter__c}
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.ConcatenateDelimiter__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-input
-                type="text"
-                name="rollup_FieldToOrderBy__c"
-                data-name="rollup_FieldToOrderBy__c"
-                label="Field(s) to Order By"
-                value={rollup.FieldToOrderBy__c}
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.FieldToOrderBy__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-input
-                type="number"
-                name="rollup_RowLimit__c"
-                data-name="rollup_RowLimit__c"
-                label="Row Limit"
-                value={rollup.RowLimit__c}
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.RowLimit__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <h2 class="header">Aggregate All Rows</h2>
-              <lightning-input
-                type="checkbox"
-                name="rollup_AggregateAllRows__c"
-                data-name="rollup_AggregateAllRows__c"
-                label="Include Deleted &amp; Archived Records"
-                value={rollup.AggregateAllRows__c}
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.AggregateAllRows__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <c-autocomplete-combobox
+              data-name="rollup_AggregateResultField__c"
+              label="Aggregate Result Field"
+              helper-text="The field on the parent object that will hold the result of the rollup calculation"
+              options={parentRFieldOptions}
+              value={rollup.AggregateResultField__c}
+            ></c-autocomplete-combobox>
+            <c-rollup-editor-error
+              errors={errors.AggregateResultField__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
+      <!--Set Relationship-->
+      <lightning-accordion-section
+        name="Relationship"
+        label="Relationship Criteria"
+      >
+        <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <p>Define how child records will be qualified for the rollup</p>
+          </lightning-layout-item>
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <lightning-textarea
+              name="rollup_RelationshipCriteria__c"
+              data-name="rollup_RelationshipCriteria__c"
+              label="Relationship Criteria"
+              field-level-help="The WHERE portion of a SOQL query, records that match the clause will be included in the rollup data"
+              placeholder="Field1__c = TRUE AND Field2__r.Name = 'Parent Value'"
+              value={rollup.RelationshipCriteria__c}
+              maxlength="255"
+            ></lightning-textarea>
+            <c-rollup-editor-error
+              errors={errors.RelationshipCriteria__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-textarea
+              name="rollup_relationship_criteria_fields"
+              data-name="rollup_relationship_criteria_fields"
+              label="Relationship Criteria Fields"
+              field-level-help="Field API names on the child object which when changed will trigger recalculation, each on a new line (Field to Aggregate and Relationship Field are implicitly included)"
+              placeholder={relationshipCriteriaPlaceholder}
+              value={rollup.RelationshipCriteriaFields__c}
+              maxlength="255"
+            ></lightning-textarea>
+            <c-rollup-editor-error
+              errors={errors.RelationshipCriteriaFields__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <h3 class="slds-form-element__label">Aggregate All Rows</h3>
+            <lightning-input
+              type="checkbox"
+              name="rollup_AggregateAllRows__c"
+              data-name="rollup_AggregateAllRows__c"
+              label="Include Deleted &amp; Archived Records"
+              field-level-help="If you only want Archived Records add 'IsDeleted = FALSE' to the Relationship Criteria"
+              checked={rollup.AggregateAllRows__c}
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.AggregateAllRows__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
+      <!--Summary settings-->
+      <lightning-accordion-section name="RollupDetails" label="Rollup Details">
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <p>Select the type and configuration of the rollup action</p>
+          </lightning-layout-item>
+        </lightning-layout>
+        <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-combobox
+              name="rollup_AggregateOperation__c"
+              data-name="rollup_AggregateOperation__c"
+              label="Rollup Type"
+              placeholder="Select"
+              options={aggregateOptions}
+              value={rollup.AggregateOperation__c}
+              onchange={rollupTypeChangeHandler}
+              required
+            ></lightning-combobox>
+            <c-rollup-editor-error
+              errors={errors.AggregateOperation__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-input
+              type="text"
+              name="rollup_ConcatenateDelimiter__c"
+              data-name="rollup_ConcatenateDelimiter__c"
+              label="Concatenate Delimiter"
+              field-level-help="For Rollup Types Concatenate and Concatenate Distinct, used to separate values in the output"
+              value={rollup.ConcatenateDelimiter__c}
+              disabled={shouldDisableConcatDelim}
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.ConcatenateDelimiter__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-input
+              type="text"
+              name="rollup_FieldToOrderBy__c"
+              data-name="rollup_FieldToOrderBy__c"
+              label="Field(s) to Order By"
+              field-level-help="Applies to First, Last, and Concatenate (Distinct) rollups, a SOQL ORDER BY clause, may order by multiple fields ASC or DESC"
+              value={rollup.FieldToOrderBy__c}
+              disabled={shouldDisableFieldToOrderBy}
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.FieldToOrderBy__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-input
+              type="number"
+              name="rollup_RowLimit__c"
+              data-name="rollup_RowLimit__c"
+              label="Row Limit"
+              field-level-help="Applies to Last and Concatentate (Distinct) operators"
+              value={rollup.RowLimit__c}
+              disabled={shouldDisableRowLimit}
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.RowLimit__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
 
-        <lightning-accordion-section
-          name="CalculationMode"
-          label="Calculation Mode"
-        >
-          <lightning-layout multiple-rows class="slds-p-horizontal_medium">
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-combobox
-                name="rollup_CalculationMode__c"
-                data-name="rollup_CalculationMode__c"
-                label="Calculation Mode"
-                placeholder="Select"
-                options={calculationModes}
-                value={rollup.CalculationMode__c}
-                required
-              ></lightning-combobox>
-              <c-rollup-editor-error
-                errors={errors.CalculationMode__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-            <lightning-layout-item
-              size="12"
-              large-device-size="6"
-              class="slds-form-element_stacked"
-            >
-              <lightning-combobox
-                name="rollup_CalculationSharingMode__c"
-                data-name="rollup_CalculationSharingMode__c"
-                label="Calculation Sharing Mode"
-                placeholder="Select"
-                options={calculationSharingModes}
-                value={rollup.CalculationSharingMode__c}
-                required
-              ></lightning-combobox>
-              <c-rollup-editor-error
-                errors={errors.CalculationSharingMode__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
+      <lightning-accordion-section
+        name="CalculationMode"
+        label="Calculation Mode"
+      >
+        <lightning-layout multiple-rows class="slds-p-horizontal_medium">
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-combobox
+              name="rollup_CalculationMode__c"
+              data-name="rollup_CalculationMode__c"
+              label="Calculation Mode"
+              field-level-help="Control how DLRS checks for changes and when/how the parent record is updated"
+              placeholder="Select"
+              options={calculationModes}
+              value={rollup.CalculationMode__c}
+              required
+            ></lightning-combobox>
+            <c-rollup-editor-error
+              errors={errors.CalculationMode__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+          <lightning-layout-item
+            size="12"
+            large-device-size="6"
+            class="slds-form-element_stacked"
+          >
+            <lightning-combobox
+              name="rollup_CalculationSharingMode__c"
+              data-name="rollup_CalculationSharingMode__c"
+              label="Calculation Sharing Mode"
+              field-level-help="Choose which Apex Sharing mode should be used when the rollup value is calculated"
+              placeholder="Select"
+              options={calculationSharingModes}
+              value={rollup.CalculationSharingMode__c}
+              required
+            ></lightning-combobox>
+            <c-rollup-editor-error
+              errors={errors.CalculationSharingMode__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
 
-        <lightning-accordion-section name="Advanced" label="Advanced">
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <lightning-textarea
-                name="rollup_TestCode2__c"
-                data-name="rollup_TestCode2__c"
-                label="Test Code (Child Object)"
-                value={rollup.TestCode2__c}
-                maxlength="131072"
-              ></lightning-textarea>
-              <c-rollup-editor-error
-                errors={errors.TestCode2__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item size="12" class="slds-form-element_stacked">
-              <lightning-textarea
-                name="rollup_TestCodeParent__c"
-                data-name="rollup_TestCodeParent__c"
-                label="Test Code (Parent Object)"
-                value={rollup.TestCodeParent__c}
-                maxlength="131072"
-              ></lightning-textarea>
-              <c-rollup-editor-error
-                errors={errors.TestCodeParent__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-          <lightning-layout class="slds-p-horizontal_medium">
-            <lightning-layout-item class="slds-form-element_stacked">
-              <lightning-input
-                type="checkbox"
-                name="rollup_TestCodeSeeAllData__c"
-                data-name="rollup_TestCodeSeeAllData__c"
-                label="Test Code Sees All Data?"
-                value={rollup.TestCodeSeeAllData__c}
-                variant="label-stacked"
-                style="padding-left: 0px !important"
-              ></lightning-input>
-              <c-rollup-editor-error
-                errors={errors.TestCodeSeeAllData__c}
-              ></c-rollup-editor-error>
-            </lightning-layout-item>
-          </lightning-layout>
-        </lightning-accordion-section>
-      </lightning-accordion>
-    </div>
-  </lightning-card>
+      <lightning-accordion-section name="Advanced" label="Advanced">
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <lightning-textarea
+              name="rollup_TestCode2__c"
+              data-name="rollup_TestCode2__c"
+              label="Test Code (Child Object)"
+              field-level-help="Define a custom method body to be used in the generated test class"
+              value={rollup.TestCode2__c}
+              maxlength="131072"
+            ></lightning-textarea>
+            <c-rollup-editor-error
+              errors={errors.TestCode2__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item size="12" class="slds-form-element_stacked">
+            <lightning-textarea
+              name="rollup_TestCodeParent__c"
+              data-name="rollup_TestCodeParent__c"
+              label="Test Code (Parent Object)"
+              field-level-help="Define a custom method body to be used in the generated test class"
+              value={rollup.TestCodeParent__c}
+              maxlength="131072"
+            ></lightning-textarea>
+            <c-rollup-editor-error
+              errors={errors.TestCodeParent__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+        <lightning-layout class="slds-p-horizontal_medium">
+          <lightning-layout-item class="slds-form-element_stacked">
+            <lightning-input
+              type="checkbox"
+              name="rollup_TestCodeSeeAllData__c"
+              data-name="rollup_TestCodeSeeAllData__c"
+              label="Test Code Sees All Data?"
+              value={rollup.TestCodeSeeAllData__c}
+              variant="label-stacked"
+              style="padding-left: 0px !important"
+            ></lightning-input>
+            <c-rollup-editor-error
+              errors={errors.TestCodeSeeAllData__c}
+            ></c-rollup-editor-error>
+          </lightning-layout-item>
+        </lightning-layout>
+      </lightning-accordion-section>
+    </lightning-accordion>
+  </lightning-modal-body>
+  <lightning-modal-footer>
+    <lightning-layout horizontal-align="center">
+      <lightning-layout-item>
+        <lightning-button-group>
+          <lightning-button
+            label="Activate"
+            onclick={activateClickHandler}
+            if:true={rollupCanBeActivated}
+          ></lightning-button>
+          <lightning-button
+            label={saveButtonLabel}
+            onclick={runSave}
+          ></lightning-button>
+          <lightning-button
+            label="Cancel"
+            variant="destructive"
+            onclick={cancelClickHandler}
+          ></lightning-button>
+          <lightning-button-menu
+            alternative-text="Show more"
+            menu-alignment="bottom-right"
+            lwc:if={rollup.Id}
+          >
+            <lightning-menu-item
+              label="Deactiveate"
+              if:true={rollupCanBeDeactivated}
+              onclick={deactivateClickHandler}
+            ></lightning-menu-item>
+            <lightning-menu-item
+              label="Clone"
+              lwc:if={rollup.Id}
+              onclick={cloneClickHandler}
+            ></lightning-menu-item>
+            <lightning-menu-item
+              label="Manage Triggers"
+              lwc:if={supportsTrigger}
+              onclick={manageTriggerHandler}
+            ></lightning-menu-item>
+            <lightning-menu-item
+              label="Recalculate Now"
+              lwc:if={rollup.Id}
+              onclick={recalculateNowHandler}
+            ></lightning-menu-item>
+            <lightning-menu-item
+              label="Schedule Reclaculation"
+              lwc:if={rollup.Id}
+              onclick={schedulRecalculateHandler}
+            ></lightning-menu-item>
+            <lightning-menu-item
+              label="Delete"
+              lwc:if={rollup.Id}
+              onclick={deleteClickHandler}
+            ></lightning-menu-item>
+          </lightning-button-menu>
+        </lightning-button-group>
+      </lightning-layout-item>
+    </lightning-layout>
+  </lightning-modal-footer>
 </template>
diff --git a/dlrs/main/lwc/rollupEditor/rollupEditor.js b/dlrs/main/lwc/rollupEditor/rollupEditor.js
index 58be3623..09524e70 100644
--- a/dlrs/main/lwc/rollupEditor/rollupEditor.js
+++ b/dlrs/main/lwc/rollupEditor/rollupEditor.js
@@ -1,5 +1,9 @@
-import { api, LightningElement, track, wire } from "lwc";
-import { ShowToastEvent } from "lightning/platformShowToastEvent";
+import { api, track, wire } from "lwc";
+
+import LightningModal from "lightning/modal";
+
+import { PATH_STATES } from "c/flexiblePath";
+
 import getRollupConfig from "@salesforce/apex/RollupEditorController.getRollupConfig";
 import validateRollupConfig from "@salesforce/apex/RollupEditorController.validateRollupConfig";
 import saveRollupConfig from "@salesforce/apex/RollupEditorController.saveRollupConfig";
@@ -9,13 +13,8 @@ import getFullCalculatePageUrl from "@salesforce/apex/RollupEditorController.get
 import getScheduleCalculatePageUrl from "@salesforce/apex/RollupEditorController.getScheduleCalculatePageUrl";
 import hasChildTriggerDeployed from "@salesforce/apex/LookupRollupStatusCheckController.hasChildTriggerDeployed";
 import getScheduledJobs from "@salesforce/apex/LookupRollupStatusCheckController.getScheduledJobs";
+import getOutstandingScheduledItemsForLookup from "@salesforce/apex/LookupRollupStatusCheckController.getOutstandingScheduledItemsForLookup";
 
-import { NavigationMixin } from "lightning/navigation";
-const PATH_VALUES = {
-  complete: "complete",
-  current: "current",
-  incomplete: "incomplete"
-};
 const DEFAULT_ROLLUP_VALUES = Object.freeze({
   Active__c: false,
   CalculationMode__c: "Scheduled",
@@ -24,33 +23,71 @@ const DEFAULT_ROLLUP_VALUES = Object.freeze({
 
 const STEP_TEMPLATES = Object.freeze({
   default: [
-    { label: "Configure", status: PATH_VALUES.current },
-    { label: "...", status: PATH_VALUES.incomplete }
+    {
+      label: "Configure",
+      name: "save",
+      nextActionLabel: "Save",
+      status: PATH_STATES.current
+    },
+    { label: "...", status: PATH_STATES.incomplete }
   ],
   Realtime: [
-    { label: "Configure", status: PATH_VALUES.complete },
-    { label: "Deploy Trigger", status: PATH_VALUES.incomplete },
-    { label: "Activate", status: PATH_VALUES.incomplete }
+    {
+      label: "Configure",
+      name: "save",
+      nextActionLabel: "Save",
+      status: PATH_STATES.complete
+    },
+    {
+      label: "Deploy Trigger",
+      name: "deployTrigger",
+      nextActionLabel: "Manage Triggers",
+      status: PATH_STATES.incomplete
+    },
+    { label: "Activate", name: "activate", status: PATH_STATES.incomplete }
   ],
   Scheduled: [
-    { label: "Configure", status: PATH_VALUES.complete },
-    { label: "Schedule Job", status: PATH_VALUES.incomplete },
-    { label: "Deploy Trigger", status: PATH_VALUES.incomplete },
-    { label: "Activate", status: PATH_VALUES.incomplete }
+    {
+      label: "Configure",
+      name: "save",
+      nextActionLabel: "Save",
+      status: PATH_STATES.complete
+    },
+    {
+      label: "Schedule Job",
+      name: "scheduleJob",
+      nextActionLabel: "Schedule",
+      status: PATH_STATES.incomplete
+    },
+    {
+      label: "Deploy Trigger",
+      name: "deployTrigger",
+      nextActionLabel: "Manage Triggers",
+      status: PATH_STATES.incomplete
+    },
+    { label: "Activate", name: "activate", status: PATH_STATES.incomplete }
   ],
   other: [
-    { label: "Configure", status: PATH_VALUES.complete },
-    { label: "Activate", status: PATH_VALUES.incomplete }
+    {
+      label: "Configure",
+      name: "save",
+      nextActionLabel: "Save",
+      status: PATH_STATES.complete
+    },
+    { label: "Activate", name: "activate", status: PATH_STATES.incomplete }
   ]
 });
-export default class RollupEditor extends NavigationMixin(LightningElement) {
+export default class RollupEditor extends LightningModal {
   isLoading = false;
-
   childTriggerIsDeployed = false;
+  rollupId;
 
   @wire(getScheduledJobs)
   scheduledJobCount;
 
+  @wire(getOutstandingScheduledItemsForLookup, { lookupID: "$rollupId" })
+  outstandingScheduledItems;
+
   openAccordianSections = [
     "Information",
     "ChildObject",
@@ -84,9 +121,7 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
   }
 
   get cardHeader() {
-    return this.rollup.DeveloperName
-      ? this.rollup.DeveloperName
-      : "Lookup Rollup Summary Creation Wizard";
+    return this.rollup.Id ? `Edit ${this.rollup.Label}` : "Create Rollup";
   }
 
   get saveButtonLabel() {
@@ -105,6 +140,21 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
     return this.rollup.Id && this.rollup.Active__c;
   }
 
+  get scheduledItemsError() {
+    if (
+      !this.outstandingScheduledItems ||
+      !this.outstandingScheduledItems?.data
+    ) {
+      return null;
+    }
+
+    return `This rollup has ${this.outstandingScheduledItems} outstanding scheduled items`;
+  }
+
+  get relationshipCriteriaPlaceholder() {
+    return "Status__c\r\nDays__c";
+  }
+
   async getRollup() {
     if (!this.rollupName) {
       this.rollup = { ...DEFAULT_ROLLUP_VALUES };
@@ -113,6 +163,7 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
         this.rollup = await getRollupConfig({
           rollupName: this.rollupName
         });
+        this.rollupId = this.rollup.Id;
       } catch (error) {
         this.errors.record = [error.message];
       }
@@ -151,21 +202,21 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
     });
     for (let s of STEP_TEMPLATES[this.rollup.CalculationMode__c] ||
       STEP_TEMPLATES.other) {
-      if (s.label === "Deploy Trigger") {
+      if (s.name === "deployTrigger") {
         s.status = this.childTriggerIsDeployed
-          ? PATH_VALUES.complete
-          : PATH_VALUES.incomplete;
+          ? PATH_STATES.complete
+          : PATH_STATES.incomplete;
       }
-      if (s.label === "Schedule Job") {
+      if (s.name === "scheduleJob") {
         s.status =
           this.scheduledJobCount.data > 0
-            ? PATH_VALUES.complete
-            : PATH_VALUES.incomplete;
+            ? PATH_STATES.complete
+            : PATH_STATES.incomplete;
       }
-      if (s.label === "Activate") {
+      if (s.name === "activate") {
         s.status = this.rollup.Active__c
-          ? PATH_VALUES.complete
-          : PATH_VALUES.incomplete;
+          ? PATH_STATES.complete
+          : PATH_STATES.incomplete;
       }
       newSteps.push(s);
     }
@@ -193,8 +244,7 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
   }
 
   cancelClickHandler() {
-    const evt = new CustomEvent("cancel");
-    this.dispatchEvent(evt);
+    this.close();
   }
 
   cloneClickHandler() {
@@ -203,10 +253,7 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
   }
 
   deleteClickHandler() {
-    const evt = new CustomEvent("requestdelete", {
-      detail: { rollupName: this.rollup.DeveloperName }
-    });
-    this.dispatchEvent(evt);
+    this.close({ action: "delete", rollupName: this.rollup.DeveloperName });
   }
 
   activateClickHandler() {
@@ -219,19 +266,25 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
     this.runSave();
   }
 
+  rollupTypeChangeHandler(event) {
+    this.rollup.AggregateOperation__c = event.detail.value;
+  }
+
   pathClickHandler(event) {
     console.log("Path clicked", event.detail.label);
-    switch (event.detail.label) {
-      case "Deploy Trigger":
+    switch (event.detail.name) {
+      case "deployTrigger":
         this.manageTriggerHandler();
         break;
-
-      case "Activate":
+      case "activate":
         this.activateClickHandler();
         break;
-      case "Schedule Job":
+      case "scheduleJob":
         console.error("Job Schedule UI not implemented");
         break;
+      case "save":
+        this.runSave();
+        break;
       default:
         console.error("Unexpected action", event.detail.label);
         break;
@@ -239,34 +292,40 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
   }
 
   async manageTriggerHandler() {
-    // TODO: return to this page, maybe to this rollup??
     const url = await getManageTriggerPageUrl({ rollupId: this.rollup.Id });
-    this[NavigationMixin.Navigate]({
-      type: "standard__webPage",
-      attributes: {
-        url
+    this.close({
+      action: "navigate",
+      config: {
+        type: "standard__webPage",
+        attributes: {
+          url
+        }
       }
     });
   }
 
   async recalculateNowHandler() {
-    // TODO: return to this page, maybe to this rollup??
     const url = await getFullCalculatePageUrl({ rollupId: this.rollup.Id });
-    this[NavigationMixin.Navigate]({
-      type: "standard__webPage",
-      attributes: {
-        url
+    this.close({
+      action: "navigate",
+      config: {
+        type: "standard__webPage",
+        attributes: {
+          url
+        }
       }
     });
   }
 
   async schedulRecalculateHandler() {
-    // TODO: return to this page, maybe to this rollup??
     const url = await getScheduleCalculatePageUrl({ rollupId: this.rollup.Id });
-    this[NavigationMixin.Navigate]({
-      type: "standard__webPage",
-      attributes: {
-        url
+    this.close({
+      action: "navigate",
+      config: {
+        type: "standard__webPage",
+        attributes: {
+          url
+        }
       }
     });
   }
@@ -306,20 +365,12 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
     const jobId = await saveRollupConfig({
       rollup: JSON.stringify(this.rollup)
     });
-    const evt = new ShowToastEvent({
-      title: "Deployment Started",
-      message: "Started Metadata Record Upates in Deployment " + jobId,
-      variant: "info"
+
+    this.close({
+      action: "deloyStart",
+      jobId,
+      rollupName: this.rollup.DeveloperName
     });
-    this.dispatchEvent(evt);
-    this.dispatchEvent(
-      new CustomEvent("deploystarted", {
-        detail: {
-          rollup: this.rollup,
-          jobId
-        }
-      })
-    );
     this.isLoading = false;
   }
 
@@ -392,7 +443,7 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
       { label: "Count", value: "Count" },
       { label: "Count Distinct", value: "Count Distinct" },
       { label: "Concatenate", value: "Concatenate" },
-      { label: "Concatenate Distinct", value: "	Concatenate Distinct" },
+      { label: "Concatenate Distinct", value: "Concatenate Distinct" },
       { label: "First", value: "First" },
       { label: "Last", value: "Last" }
     ];
@@ -413,4 +464,22 @@ export default class RollupEditor extends NavigationMixin(LightningElement) {
       { label: "System", value: "System" }
     ];
   }
+
+  get shouldDisableConcatDelim() {
+    return !["Concatenate", "Concatenate Distinct"].includes(
+      this.rollup.AggregateOperation__c
+    );
+  }
+
+  get shouldDisableFieldToOrderBy() {
+    return !["Concatenate", "Concatenate Distinct", "First", "Last"].includes(
+      this.rollup.AggregateOperation__c
+    );
+  }
+
+  get shouldDisableRowLimit() {
+    return !["Concatenate", "Concatenate Distinct", "Last"].includes(
+      this.rollup.AggregateOperation__c
+    );
+  }
 }
diff --git a/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.html b/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.html
deleted file mode 100644
index 13f82f7b..00000000
--- a/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-  <lightning-modal-header label="Rollup Editor"></lightning-modal-header>
-  <lightning-modal-body>
-    <c-rollup-editor
-      rollup-name={rollupName}
-      onrequestdelete={handleRequestDelete}
-      oncancel={handleCancelRequest}
-    ></c-rollup-editor>
-  </lightning-modal-body>
-</template>
diff --git a/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.js b/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.js
deleted file mode 100644
index b1b0f402..00000000
--- a/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { api } from "lwc";
-import LightningModal from "lightning/modal";
-
-export default class RollupEditorModal extends LightningModal {
-  @api rollupName;
-
-  handleCancelRequest() {
-    this.close();
-  }
-
-  handleRequestDelete() {
-    this.close({ action: "delete", rollupName: this.rollupName });
-  }
-}
diff --git a/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.js-meta.xml b/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.js-meta.xml
deleted file mode 100644
index 6127d855..00000000
--- a/dlrs/main/lwc/rollupEditorModal/rollupEditorModal.js-meta.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>59.0</apiVersion>
-    <isExposed>false</isExposed>
-</LightningComponentBundle>
\ No newline at end of file