diff --git a/force-app/main/default/classes/Cmdt.cls b/force-app/main/default/classes/Cmdt.cls
index ff52300..c8122a9 100644
--- a/force-app/main/default/classes/Cmdt.cls
+++ b/force-app/main/default/classes/Cmdt.cls
@@ -5,18 +5,19 @@ public with sharing class Cmdt {
         
         // Gather all active Bundles and put them into a Map (key: DeveloperName; Bundle)
         for( Indicator_Bundle__mdt bundle : [
-            SELECT Id, DeveloperName, MasterLabel, Label,
-                Active__c, 
-                Card_Icon__c, 
-                Card_Icon_Background__c, 
-                Card_Icon_Foreground__c, 
-                Card_Text__c, 
-                Card_Title__c, 
-                Description__c,
-                sObject__c, 
-                sObject__r.QualifiedApiName, 
-                sObject__r.Label
-            FROM Indicator_Bundle__mdt
+                SELECT Id, DeveloperName, MasterLabel, Label, QualifiedApiName,
+                        Active__c,
+                        Card_Icon__c,
+                        Card_Icon_Background__c,
+                        Card_Icon_Foreground__c,
+                        Card_Text__c,
+                        Card_Title__c,
+                        Description__c,
+                        sObject__c,
+                        sObject__r.QualifiedApiName,
+                        sObject__r.Label
+                FROM Indicator_Bundle__mdt
+                WHERE Delete__c != TRUE
         ] ) {
             setBundle(bundle);
         }
@@ -24,31 +25,32 @@ public with sharing class Cmdt {
         // Gather all active Items and put them into a Map (key: Developername; Item)
         // Using SOQL because of parent-related values AND Advanced_Field__c is long text.
         for( Indicator_Item__mdt item : [
-            SELECT Id, DeveloperName, MasterLabel,
-                Active__c,
-                Advanced_Field__c,
-                Advanced_Field_Label__c,
-                Display_Multiple__c,
-                Empty_Static_Text_Behavior__c,
-                Field__c, Field__r.QualifiedApiName,
-                Hover_Text__c,
-                Icon_Value__c,
-                Image__c,
-                Inverse_Hover_Text__c,
-                Inverse_Icon_Value__c,
-                Inverse_Image__c,
-                Inverse_Static_Text__c,
-                Show_False_or_Blank__c,
-                sObject__c, sObject__r.QualifiedApiName,
-                Static_Text__c,
-                Zero_Behavior__c,
-                Icon_Background__c,
-                Icon_Foreground__c,
-                Inverse_Icon_Background__c,
-                Inverse_Icon_Foreground__c,
-                Description__c
-            FROM Indicator_Item__mdt
-            // WHERE Active__c = TRUE
+                SELECT Id, DeveloperName, MasterLabel, Label, QualifiedApiName,
+                        Active__c,
+                        Advanced_Field__c,
+                        Advanced_Field_Label__c,
+                        Display_Multiple__c,
+                        Empty_Static_Text_Behavior__c,
+                        Field__c, Field__r.QualifiedApiName,
+                        Hover_Text__c,
+                        Icon_Value__c,
+                        Image__c,
+                        Inverse_Hover_Text__c,
+                        Inverse_Icon_Value__c,
+                        Inverse_Image__c,
+                        Inverse_Static_Text__c,
+                        Show_False_or_Blank__c,
+                        sObject__c, sObject__r.QualifiedApiName,
+                        Static_Text__c,
+                        Zero_Behavior__c,
+                        Icon_Background__c,
+                        Icon_Foreground__c,
+                        Inverse_Icon_Background__c,
+                        Inverse_Icon_Foreground__c,
+                        Description__c
+                FROM Indicator_Item__mdt
+                WHERE Delete__c != TRUE
+                // WHERE Active__c = TRUE
         ]){
             setItem(item);
         }
@@ -56,13 +58,15 @@ public with sharing class Cmdt {
         // Gather all active Bundle Items (Bundle and Item are active) and put them into a Map (key: Bundle DeveloperName; List of BundleItems)
         // Using SOQL because of the Order By clause rather than creating a custom sort method.
         for( Indicator_Bundle_Item__mdt bundleItem : [
-            SELECT Indicator_Bundle__c, Indicator_Bundle__r.DeveloperName,
-                Indicator_Item__c, Indicator_Item__r.DeveloperName,
-                Order__c
-            FROM Indicator_Bundle_Item__mdt
-            // WHERE Indicator_Bundle__r.Active__c = TRUE
-            // AND Indicator_Item__r.Active__c = TRUE
-            ORDER BY Order__c
+                SELECT Id, DeveloperName, QualifiedApiName, MasterLabel, Label,
+                        Indicator_Bundle__c, Indicator_Bundle__r.DeveloperName, Indicator_Bundle__r.QualifiedApiName,
+                        Indicator_Item__c, Indicator_Item__r.DeveloperName, Indicator_Item__r.QualifiedApiName,
+                        Order__c
+                FROM Indicator_Bundle_Item__mdt
+                WHERE Delete__c != TRUE
+                // WHERE Indicator_Bundle__r.Active__c = TRUE
+                // AND Indicator_Item__r.Active__c = TRUE
+                ORDER BY Order__c
         ]){
             setBundleItem(bundleItem);
         }
@@ -70,25 +74,28 @@ public with sharing class Cmdt {
         // Gather all active Item Extensions and put them into a Map (key: Indicator Item; List of Extensions)
         // Using SOQL because of the Order By clause rather than creating a custom sort method.
         for(Indicator_Item_Extension__mdt itemExtension : [
-            SELECT Id, Active__c,
-                Contains_Text__c,
-                Text_Operator__c,
-                Hover_Text__c,
-                Icon_Value__c,
-                Image__c,
-                Indicator_Item__c,
-                Indicator_Item__r.DeveloperName,
-                Maximum__c,
-                Minimum__c,
-                Priority__c,
-                Static_Text__c,
-                Icon_Background__c,
-                Icon_Foreground__c,
-                Description__c
-            FROM Indicator_Item_Extension__mdt
-            // WHERE Active__c = TRUE
-            // AND Indicator_Item__r.Active__c = TRUE
-            ORDER BY Indicator_Item__c, Priority__c DESC, MasterLabel
+                SELECT Id, DeveloperName, QualifiedApiName, Label, MasterLabel,
+                        Active__c,
+                        Contains_Text__c,
+                        Text_Operator__c,
+                        Hover_Text__c,
+                        Icon_Value__c,
+                        Image__c,
+                        Indicator_Item__c,
+                        Indicator_Item__r.DeveloperName,
+                        Indicator_Item__r.QualifiedApiName,
+                        Maximum__c,
+                        Minimum__c,
+                        Priority__c,
+                        Static_Text__c,
+                        Icon_Background__c,
+                        Icon_Foreground__c,
+                        Description__c
+                FROM Indicator_Item_Extension__mdt
+                WHERE Delete__c != TRUE
+                // WHERE Active__c = TRUE
+                // AND Indicator_Item__r.Active__c = TRUE
+                ORDER BY Indicator_Item__c, Priority__c DESC, MasterLabel
         ]){
             setItemExtension(itemExtension);
         }
@@ -143,7 +150,7 @@ public with sharing class Cmdt {
     }
 
     public static List<Indicator_Item__mdt> getAllOrphanItems(){
-        
+
         List<Indicator_Item__mdt> orphanItems = new List<Indicator_Item__mdt>();
 
         for(String itemName : itemsByName.keyset()){
@@ -159,28 +166,28 @@ public with sharing class Cmdt {
         if(bundlesByName.containsKey(bundleDevName))
             return bundlesByName.get(bundleDevName);
         else
-            return new Indicator_Bundle__mdt();
+                return new Indicator_Bundle__mdt();
     }
 
     public static Indicator_Item__mdt getItem(String itemDevName){
         if(itemsByName.containsKey(itemDevName))
             return itemsByName.get(itemDevName);
         else
-            return new Indicator_Item__mdt();
+                return new Indicator_Item__mdt();
     }
 
     public static List<Indicator_Bundle_Item__mdt> getBundleItems(String bundleDevName){
         if(bundleItemsByBundle.containsKey(bundleDevname))
             return bundleItemsByBundle.get(bundleDevName);
-        else 
-            return new List<Indicator_Bundle_Item__mdt>();
+        else
+                return new List<Indicator_Bundle_Item__mdt>();
     }
 
     public static List<Indicator_Item_Extension__mdt> getExtensionsForItem(String itemDevName){
         if(extensionsByItem.containsKey(itemDevName))
             return extensionsByItem.get(itemDevName);
         else
-            return new List<Indicator_Item_Extension__mdt>();
+                return new List<Indicator_Item_Extension__mdt>();
     }
 
     // Static variables used across methods.
diff --git a/force-app/main/default/classes/MetadataDeploy.cls b/force-app/main/default/classes/MetadataDeploy.cls
new file mode 100644
index 0000000..105b2c4
--- /dev/null
+++ b/force-app/main/default/classes/MetadataDeploy.cls
@@ -0,0 +1,23 @@
+/**
+ * Created by robertwright on 10/30/23.
+ */
+
+public with sharing class MetadataDeploy implements Metadata.DeployCallback {
+
+        public String resultMessage;
+
+        public void handleResult(Metadata.DeployResult result,Metadata.DeployCallbackContext context) {
+            if(result.status === Metadata.DeployStatus.Succeeded) {
+                resultMessage = 'MetaData Deploy Succeeded';
+            } else resultMessage = 'MetaData Deploy Failed';
+            if(Test.isRunningTest()) System.debug(resultMessage);
+        }
+
+        public static Id upsertMetaData(Metadata.DeployContainer deployContainer) {
+            MetadataDeploy callback = new MetadataDeploy();
+            Id upsertId;
+            if(!Test.isRunningTest()) upsertId = Metadata.Operations.enqueueDeployment(deployContainer,callback);
+            return upsertId;
+        }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/MetadataDeploy.cls-meta.xml b/force-app/main/default/classes/MetadataDeploy.cls-meta.xml
new file mode 100644
index 0000000..7a51829
--- /dev/null
+++ b/force-app/main/default/classes/MetadataDeploy.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>58.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/MetadataDeployTests.cls b/force-app/main/default/classes/MetadataDeployTests.cls
new file mode 100644
index 0000000..1131fc6
--- /dev/null
+++ b/force-app/main/default/classes/MetadataDeployTests.cls
@@ -0,0 +1,10 @@
+/**
+ * Created by robertwright on 10/30/23.
+ */
+
+@IsTest
+private class MetadataDeployTests {
+    @IsTest
+    static void testBehavior() {
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/MetadataDeployTests.cls-meta.xml b/force-app/main/default/classes/MetadataDeployTests.cls-meta.xml
new file mode 100644
index 0000000..7a51829
--- /dev/null
+++ b/force-app/main/default/classes/MetadataDeployTests.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>58.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/MetadataUtility.cls b/force-app/main/default/classes/MetadataUtility.cls
new file mode 100644
index 0000000..26c1199
--- /dev/null
+++ b/force-app/main/default/classes/MetadataUtility.cls
@@ -0,0 +1,123 @@
+/**
+ * Created by robertwright on 10/30/23.
+ */
+
+public with sharing class MetadataUtility {
+
+    /**Static Params**/
+    private static final String Label_Field = 'Label';
+    private static final String QualifiedApiName_Field = 'QualifiedApiName';
+    private static final Set<DescribeFieldResult> entityRelationshipFields = new Set<DescribeFieldResult>{
+            Indicator_Bundle__mdt.sObject__c.getDescribe(),
+            Indicator_Item__mdt.Field__c.getDescribe(),
+            Indicator_Item__mdt.sObject__c.getDescribe()
+    };
+
+    private static Metadata.DeployContainer deployContainer;
+    private static DescribeSObjectResult describeSObjectResult;
+    private static Map<String,Object> populatedFieldsMap;
+
+    /**Wrappers**/
+    public class deploymentWrapper {
+
+        @AuraEnabled public Indicator_Bundle__mdt indicatorBundle;
+        @AuraEnabled public List<Indicator_Bundle_Item__mdt> indicatorBundleItems;
+        @AuraEnabled public Indicator_Item__mdt indicatorItem;
+        @AuraEnabled public List<Indicator_Item_Extension__mdt> indicatorItemExtensions;
+
+        public deploymentWrapper() {}
+
+    }
+
+    /**Controller Methods**/
+    @AuraEnabled
+    public static Id deployIndicatorBundles(deploymentWrapper items) {
+        return deployWrapperMetadata(items);
+    }
+
+    /**Metadata Methods**/
+    private static Id deployWrapperMetadata(deploymentWrapper wrapper) {
+        deployContainer = new Metadata.DeployContainer(); // Build New Deployment Container
+        if(wrapper.indicatorBundle != null) processMetadataRecords(new List<Indicator_Bundle__mdt>{wrapper.indicatorBundle},Indicator_Bundle__mdt.getSObjectType());
+        if(wrapper.indicatorItem != null) processMetadataRecords(new List<Indicator_Item__mdt>{wrapper.indicatorItem},Indicator_Item__mdt.getSObjectType());
+        if(wrapper.indicatorItemExtensions != null && !wrapper.indicatorItemExtensions.isEmpty()) processMetadataRecords(wrapper.indicatorItemExtensions,Indicator_Item_Extension__mdt.getSObjectType());
+        if(wrapper.indicatorBundleItems != null && !wrapper.indicatorBundleItems.isEmpty()) processMetadataRecords(wrapper.indicatorBundleItems,Indicator_Bundle_Item__mdt.getSObjectType());
+        Id deployId = MetadataDeploy.upsertMetaData(deployContainer); // Deploy Deploy Container
+        return deployId;
+    }
+
+    private static void processMetadataRecords(List<SObject> records,SObjectType sObjectType) {
+        describeSObjectResult = sObjectType.getDescribe();
+        for(SObject record : records) buildMetaData(record.getPopulatedFieldsAsMap()); // Build Metadata Maps and Add to Deploy Container
+    }
+
+    private static void buildMetaData(Map<String,Object> metadataFieldValueMap) {
+        populatedFieldsMap = metadataFieldValueMap;
+        if(populatedFieldsMap == null) populatedFieldsMap = new Map<String, Object>();
+
+        String sObjectName = describeSObjectResult.getName();
+        String QualifiedApiName = (String) populatedFieldsMap.get(QualifiedApiName_Field);
+        String fullName = mergeFullName(sObjectName,QualifiedApiName);
+        String label = (String) populatedFieldsMap.get(Label_Field);
+
+        if(String.isBlank(label)) label = 'Unnamed Metadata';
+        Metadata.CustomMetadata customMetadata = buildCustomMetadata(fullName,label);
+        deployContainer.addMetadata(customMetadata);
+    }
+
+    private static String mergeFullName(String metadataName, String QualifiedApiName) {
+        String DeveloperName = (QualifiedApiName.length() > 40) ? QualifiedApiName.substring(0,40) : QualifiedApiName;
+        return metadataName.replace('__mdt','')+'.'+DeveloperName;
+    }
+
+    private static Metadata.CustomMetadata buildCustomMetadata(String fullName, String recordLabel) {
+        Metadata.CustomMetadata customMetadata = new Metadata.CustomMetadata();
+        customMetadata.fullName = fullName;
+        customMetadata.label = (recordLabel.length() > 40) ? recordLabel.substring(0,40) : recordLabel;
+
+        Map<String,Schema.SObjectField> describeFieldMap = describeSObjectResult.fields.getMap();
+
+        for(String fieldName : populatedFieldsMap.keySet()) processCustomMetadataFieldValues(customMetadata,describeFieldMap.get(fieldName));
+
+        return customMetadata;
+    }
+
+    private static void processCustomMetadataFieldValues(Metadata.CustomMetadata customMetadata,Schema.SObjectField sObjectField) {
+
+        if(sObjectField == null) return; /**Return if sObjectField not found**/
+        DescribeFieldResult fieldResult = sObjectField.getDescribe();
+        if(!fieldResult.isCustom()) return; /**Return If Standard Field**/
+
+        String fieldName = fieldResult.getName();
+        Boolean isReference = fieldResult.getType() === DisplayType.REFERENCE;
+        Boolean isEntityRelationshipField = entityRelationshipFields.contains(fieldResult);
+
+        Object value = null;
+
+        if(isReference || isEntityRelationshipField) {
+            SObject relatedRecord;
+            Map<String,Object> relatedRecordPopulatedFieldMap;
+            String relationshipName = (isEntityRelationshipField) ? fieldName.removeEnd('__c')+'__r' : fieldResult.getRelationshipName(); /**We replace __c with __r to resolve Entity Relationship non reference**/
+            if(populatedFieldsMap.containsKey(relationshipName)) {
+                try{
+                    relatedRecord = (SObject) populatedFieldsMap.get(relationshipName);
+                    relatedRecordPopulatedFieldMap = relatedRecord.getPopulatedFieldsAsMap();
+                } catch(Exception ex) {
+                    System.debug(ex.getMessage());
+                }
+            }
+            if(relatedRecordPopulatedFieldMap != null && relatedRecordPopulatedFieldMap.containsKey(QualifiedApiName_Field)) value = (String) relatedRecordPopulatedFieldMap.get(QualifiedApiName_Field);
+
+        } else if(populatedFieldsMap.containsKey(fieldName)) value = populatedFieldsMap.get(fieldName);
+
+        if(value == null || value == '' && fieldResult.defaultValue != null) value = fieldResult.defaultValue;
+        else if(value == null || value == '' && fieldResult.defaultValueFormula != null) value = fieldResult.defaultValueFormula.removeEnd('\'').removeEnd('"').removeStart('\'').removeStart('"');
+
+        Metadata.CustomMetadataValue metadataField = new Metadata.CustomMetadataValue();
+        metadataField.field = fieldName;
+        metadataField.value = value;
+
+        customMetadata.values.add(metadataField);
+    }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/MetadataUtility.cls-meta.xml b/force-app/main/default/classes/MetadataUtility.cls-meta.xml
new file mode 100644
index 0000000..fbbad0a
--- /dev/null
+++ b/force-app/main/default/classes/MetadataUtility.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>56.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/lwc/configurationManager/configurationManager.html b/force-app/main/default/lwc/configurationManager/configurationManager.html
index 0fd987e..79908ec 100644
--- a/force-app/main/default/lwc/configurationManager/configurationManager.html
+++ b/force-app/main/default/lwc/configurationManager/configurationManager.html
@@ -6,44 +6,45 @@
                     <lightning-button-menu alternative-text="Toggle menu" menu-alignment="auto" nubbin label="New">
                         <template for:each={newUrls} for:item="entity">
                             <lightning-menu-item
-                                key={entity.Name}
-                                label={entity.Label}
-                                value={entity.NewUrl}
-                                onclick={handleNewClick}
+                                    data-developer-name={entity.Name}
+                                    key={entity.Name}
+                                    label={entity.Label}
+                                    value={entity.NewUrl}
+                                    onclick={handleNewClick}
                             ></lightning-menu-item>
                         </template>
                     </lightning-button-menu>
                 </div>
                 <p class="slds-p-horizontal_small">Review existing Indicators or create new custom metadata records.<br/></p>
                 <!-- <lightning-layout pull-to-boundary="small"> -->
-                    <!-- <lightning-layout-item size="3" padding="around-small"> -->
-                        <lightning-combobox
-                            name="bundleSearch"
-                            label="Indicator Bundle"
-                            value={bundleName}
-                            placeholder="Select a Bundle"
-                            options={options}
-                            onchange={handleChange}
-                            class="slds-p-horizontal_small"
-                        ></lightning-combobox>
-                    <!-- </lightning-layout-item> -->
+                <!-- <lightning-layout-item size="3" padding="around-small"> -->
+                <lightning-combobox
+                        name="bundleSearch"
+                        label="Indicator Bundle"
+                        value={bundleName}
+                        placeholder="Select a Bundle"
+                        options={options}
+                        onchange={handleChange}
+                        class="slds-p-horizontal_small"
+                ></lightning-combobox>
+                <!-- </lightning-layout-item> -->
                 <!-- </lightning-layout> -->
             </lightning-card>
         </lightning-layout-item>
     </lightning-layout>
     <template lwc:if={showSpinner}>
-        <lightning-spinner 
-            alternative-text="Loading"
-            variant="brand"
-            size="large"
+        <lightning-spinner
+                alternative-text="Loading"
+                variant="brand"
+                size="large"
         ></lightning-spinner>
     </template>
     <template lwc:elseif={showKey}>
         <lightning-layout pull-to-boundary="small">
             <lightning-layout-item size="12" padding="horizontal-small">
                 <c-key
-                    bundle={bundle}
-                    is-setup="true"
+                        bundle={bundle}
+                        is-setup="true"
                 ></c-key>
             </lightning-layout-item>
         </lightning-layout>
diff --git a/force-app/main/default/lwc/configurationManager/configurationManager.js b/force-app/main/default/lwc/configurationManager/configurationManager.js
index efc795c..46306d1 100644
--- a/force-app/main/default/lwc/configurationManager/configurationManager.js
+++ b/force-app/main/default/lwc/configurationManager/configurationManager.js
@@ -5,6 +5,13 @@ import getNewCmdtUrls from '@salesforce/apex/IndicatorController.getNewCmdtUrls'
 import getBundleOptions from '@salesforce/apex/IndicatorListBundleSelector.getBundleOptions';
 import { refreshApex } from '@salesforce/apex';
 
+import IndicatorEditModal from "c/indicatorEditModal";
+
+import Indicator_Bundle from "@salesforce/schema/Indicator_Bundle__mdt";
+import Indicator_Item from "@salesforce/schema/Indicator_Item__mdt";
+import Indicator_Item_Extension from "@salesforce/schema/Indicator_Item_Extension__mdt";
+
+
 export default class ConfigurationManager extends LightningElement {
     bundleName = '';
     bundle;
@@ -67,8 +74,23 @@ export default class ConfigurationManager extends LightningElement {
     }
 
     handleNewClick(event) {
-        // console.dir(event);
-        window.open('/lightning/setup/CustomMetadata/page?address=' + event.target.value,'_blank');
+        const developerName = (event.currentTarget.dataset || {}).developerName;
+
+        /**This can be removed after proof of concept**/
+        switch (developerName) {
+            case Indicator_Bundle.objectApiName.replace('__c',''):
+                IndicatorEditModal.open({
+                    masterLabel:event.currentTarget.label,
+                    objectApiName:Indicator_Bundle.objectApiName,
+                    isNew:true,
+                    size:'full'
+                }).then((result) => {
+                    console.log(result);
+                });
+                break;
+            default:
+                window.open('/lightning/setup/CustomMetadata/page?address=' + event.target.value,'_blank');
+        }
     }
 
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/configurationManager/configurationManager.js-meta.xml b/force-app/main/default/lwc/configurationManager/configurationManager.js-meta.xml
index 4d40a8d..14b3d8e 100644
--- a/force-app/main/default/lwc/configurationManager/configurationManager.js-meta.xml
+++ b/force-app/main/default/lwc/configurationManager/configurationManager.js-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>59.0</apiVersion>
     <isExposed>true</isExposed>
     <description>Manage and configure the Salesforce Indicators</description>
     <masterLabel>Indicators Manager</masterLabel>
diff --git a/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.css b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.css
new file mode 100644
index 0000000..26d00e2
--- /dev/null
+++ b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.css
@@ -0,0 +1,3 @@
+/**
+ * Created by robertwright on 10/31/23.
+ */
diff --git a/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.html b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.html
new file mode 100644
index 0000000..7836de1
--- /dev/null
+++ b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.html
@@ -0,0 +1,98 @@
+<!--
+ - Created by robertwright on 10/31/23.
+ -->
+
+<!-- Edit Indicator Bundle -->
+<template>
+    <div class="slds-container_fluid slds-is-relative" style="min-height: 500px">
+        <template if:true={objectInfo.apiName}>
+            <lightning-layout class="slds-container_fluid" multiple-rows >
+                <lightning-layout-item padding="horizontal-small" size=6>
+                    <lightning-input
+                            required
+                            data-field-api-name={bundleInfo.Label.fieldApiName}
+                            type={bundleInfo.Label.dataType}
+                            label={bundleInfo.Label.label}
+                            value={bundleInfo.Label.value}
+                            field-level-help={bundleInfo.Label.inlineHelpText}
+                            onchange={handleLabelChange}>
+                    </lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item padding="horizontal-small" size=6>
+                    <lightning-input
+                            disabled
+                            data-field-api-name={bundleInfo.QualifiedApiName.fieldApiName}
+                            type={bundleInfo.QualifiedApiName.dataType}
+                            label={bundleInfo.QualifiedApiName.label}
+                            value={bundleInfo.QualifiedApiName.value}
+                            field-level-help={bundleInfo.QualifiedApiName.inlineHelpText}>
+                    </lightning-input>
+                </lightning-layout-item>
+
+                <lightning-layout-item padding="horizontal-small" size=12>
+                    <lightning-input
+                            data-field-api-name={bundleInfo.sObject_FIELD.fieldApiName}
+                            required={bundleInfo.sObject_FIELD.required}
+                            type={bundleInfo.sObject_FIELD.dataType}
+                            label={bundleInfo.sObject_FIELD.label}
+                            value={bundleInfo.sObject_FIELD.value}
+                            field-level-help={bundleInfo.sObject_FIELD.inlineHelpText}
+                            onchange={handleChange}>
+                    </lightning-input>
+                </lightning-layout-item>
+
+                <lightning-layout-item padding="horizontal-small" size=4>
+                    <lightning-input
+                            data-field-api-name={bundleInfo.Card_Title_FIELD.fieldApiName}
+                            required={bundleInfo.Card_Title_FIELD.required}
+                            type={bundleInfo.Card_Title_FIELD.dataType}
+                            label={bundleInfo.Card_Title_FIELD.label}
+                            value={bundleInfo.Card_Title_FIELD.value}
+                            field-level-help={bundleInfo.Card_Title_FIELD.inlineHelpText}
+                            onchange={handleChange}>
+                    </lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item padding="horizontal-small" size=4>
+                    <lightning-input
+                            data-field-api-name={bundleInfo.Card_Text_FIELD.fieldApiName}
+                            required={bundleInfo.Card_Text_FIELD.required}
+                            type={bundleInfo.Card_Text_FIELD.dataType}
+                            label={bundleInfo.Card_Text_FIELD.label}
+                            value={bundleInfo.Card_Text_FIELD.value}
+                            field-level-help={bundleInfo.Card_Text_FIELD.inlineHelpText}
+                            onchange={handleChange}>
+                    </lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item padding="horizontal-small" size=4>
+                    <lightning-input
+                            data-field-api-name={bundleInfo.Card_Icon_FIELD.fieldApiName}
+                            required={bundleInfo.Card_Icon_FIELD.required}
+                            type={bundleInfo.Card_Icon_FIELD.dataType}
+                            label={bundleInfo.Card_Icon_FIELD.label}
+                            value={bundleInfo.Card_Icon_FIELD.value}
+                            field-level-help={bundleInfo.Card_Icon_FIELD.inlineHelpText}
+                            onchange={handleChange}>
+                    </lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item padding="horizontal-small" size=12>
+                    <lightning-input
+                            data-field-api-name={bundleInfo.Description_FIELD.fieldApiName}
+                            required={bundleInfo.Description_FIELD.required}
+                            type={bundleInfo.Description_FIELD.dataType}
+                            label={bundleInfo.Description_FIELD.label}
+                            value={bundleInfo.Description_FIELD.value}
+                            field-level-help={bundleInfo.Description_FIELD.inlineHelpText}
+                            onchange={handleChange}>
+                    </lightning-input>
+                </lightning-layout-item>
+
+                <lightning-layout class="slds-container_fluid slds-p-around_small slds-margin-top_small" horizontal-align="end">
+                    <lightning-button label="Save" value="Save" variant="brand" onclick={handleSave} ></lightning-button>
+                </lightning-layout>
+
+            </lightning-layout>
+        </template>
+
+        <lightning-spinner if:true={showSpinner} variant="brand" size="large"></lightning-spinner>
+    </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.js b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.js
new file mode 100644
index 0000000..e22289e
--- /dev/null
+++ b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.js
@@ -0,0 +1,195 @@
+/**
+ * Created by robertwright on 10/31/23.
+ */
+
+import {LightningElement, wire, track} from 'lwc';
+import { getObjectInfo } from "lightning/uiObjectInfoApi";
+import deployIndicatorBundles from '@salesforce/apex/MetadataUtility.deployIndicatorBundles';
+
+import Indicator_Bundle from "@salesforce/schema/Indicator_Bundle__mdt";
+
+import Active_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Active__c";
+import Card_Icon_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Card_Icon__c";
+import Card_Icon_Background_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Card_Icon_Background__c";
+import Card_Icon_Foreground_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Card_Icon_Foreground__c";
+import Card_Text_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Card_Text__c";
+import Card_Title_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Card_Title__c";
+import Description_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.Description__c";
+import sObject_FIELD from "@salesforce/schema/Indicator_Bundle__mdt.sObject__c";
+import {NavigationMixin} from "lightning/navigation";
+
+export default class EditIndicatorBundle extends LightningElement {
+
+    showSpinner = false;
+    get indicatorBundleObjectApiName() {
+        return Indicator_Bundle.objectApiName.replace('__c','__mdt')
+    }
+
+    objectInfo = {};
+    @wire(getObjectInfo, { objectApiName: '$indicatorBundleObjectApiName' }) setObjectInfo({ error, data }) {
+        if (error) {
+            let message = 'Unknown error';
+            if (Array.isArray(error.body)) {
+                message = error.body.map(e => e.message).join(', ');
+            } else if (typeof error.body.message === 'string') {
+                message = error.body.message;
+            }
+            console.log(message);
+        } else if (data) {
+            console.log(data);
+            console.log(JSON.parse(JSON.stringify(data)));
+            this.objectInfo = data;
+        }
+    };
+
+
+    @track indicator_Bundle = {};
+    getdataType(fieldApiName) {
+        const fieldObject = this.objectInfo?.fields[fieldApiName] || {};
+        switch (fieldObject.dataType) {
+            case 'String': return 'text';
+            case 'Boolean': return 'checkbox-button';
+            default:
+                return "text";
+        }
+    }
+    get bundleInfo() {
+        return {
+            Label : {
+                fieldApiName : 'Label',
+                label: 'Label',
+                value: this.indicator_Bundle['Label'],
+                dataType: 'text'
+            },
+            QualifiedApiName : {
+                fieldApiName : 'QualifiedApiName',
+                label: 'QualifiedApiName',
+                value: this.indicator_Bundle['QualifiedApiName'],
+                dataType: 'text'
+            },
+            Active_FIELD : {
+                fieldApiName : Active_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Active_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Active_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Active_FIELD.fieldApiName],
+                dataType: this.getdataType(Active_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Active_FIELD.fieldApiName]?.required
+            },
+            Card_Icon_FIELD : {
+                fieldApiName : Card_Icon_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Card_Icon_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Card_Icon_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Card_Icon_FIELD.fieldApiName],
+                dataType: this.getdataType(Card_Icon_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Card_Icon_FIELD.fieldApiName]?.required
+            },
+            Card_Icon_Background_FIELD : {
+                fieldApiName : Card_Icon_Background_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Card_Icon_Background_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Card_Icon_Background_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Card_Icon_Background_FIELD.fieldApiName],
+                dataType: this.getdataType(Card_Icon_Background_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Card_Icon_Background_FIELD.fieldApiName]?.required
+            },
+            Card_Icon_Foreground_FIELD : {
+                fieldApiName : Card_Icon_Foreground_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Card_Icon_Foreground_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Card_Icon_Foreground_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Card_Icon_Foreground_FIELD.fieldApiName],
+                dataType: this.getdataType(Card_Icon_Foreground_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Card_Icon_Foreground_FIELD.fieldApiName]?.required
+            },
+            Card_Text_FIELD : {
+                fieldApiName : Card_Text_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Card_Text_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Card_Text_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Card_Text_FIELD.fieldApiName],
+                dataType: this.getdataType(Card_Text_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Card_Text_FIELD.fieldApiName]?.required
+            },
+            Card_Title_FIELD : {
+                fieldApiName : Card_Title_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Card_Title_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Card_Title_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Card_Title_FIELD.fieldApiName],
+                dataType: this.getdataType(Card_Title_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Card_Title_FIELD.fieldApiName]?.required
+            },
+            Description_FIELD : {
+                fieldApiName : Description_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[Description_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[Description_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[Description_FIELD.fieldApiName],
+                dataType: this.getdataType(Description_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[Description_FIELD.fieldApiName]?.required
+            },
+            sObject_FIELD : {
+                fieldApiName : sObject_FIELD.fieldApiName,
+                label: this.objectInfo?.fields[sObject_FIELD.fieldApiName]?.label,
+                inlineHelpText: this.objectInfo?.fields[sObject_FIELD.fieldApiName]?.inlineHelpText,
+                value: this.indicator_Bundle[sObject_FIELD.fieldApiName],
+                dataType: this.getdataType(sObject_FIELD.fieldApiName),
+                required: this.objectInfo?.fields[sObject_FIELD.fieldApiName]?.required
+            }
+        }
+    }
+
+
+    connectedCallback() {
+        console.log(this.indicatorBundleObjectApiName);
+        console.log(Active_FIELD);
+        console.log(Card_Icon_FIELD);
+        console.log(Card_Icon_Background_FIELD);
+        console.log(Card_Icon_Foreground_FIELD);
+        console.log(Card_Text_FIELD);
+        console.log(Card_Title_FIELD);
+        console.log(Description_FIELD);
+        console.log(sObject_FIELD);
+    }
+
+
+    replaceWhiteSpace(value) {
+        const returnValue = (value || '').replaceAll('_',' ')
+            .replaceAll('_',' ')
+            .replaceAll(/[\W_]+/g," ")
+            .trim()
+            .replaceAll(/  +/g,' ')
+            .replaceAll(' ','_');
+
+        return (returnValue.length > 40) ? returnValue.substring(0,40) : returnValue;
+    }
+
+    handleLabelChange(event) {
+        const value = event.detail.value;
+        this.indicator_Bundle['Label'] = (value.length > 40) ? value.substring(0,40) : value;
+        this.indicator_Bundle['QualifiedApiName'] = this.replaceWhiteSpace(value);
+    }
+    handleChange(event) {
+        const value = event.detail.value;
+        const fieldName = (event.target.dataset || {}).fieldApiName;
+        this.indicator_Bundle[fieldName] = value;
+    }
+    handleSave(event) {
+        this.showSpinner = true;
+        this.saveMetaDataRecord();
+    }
+
+
+
+    saveMetaDataRecord() {
+        deployIndicatorBundles({records: [this.indicator_Bundle]})
+            .then(result => {
+                console.log('deploymentId = result');
+            })
+            .catch(error => {
+                console.log(error);
+            })
+            .finally(() => {
+                this.showSpinner = false;
+            });
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.js-meta.xml b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.js-meta.xml
new file mode 100644
index 0000000..f20a711
--- /dev/null
+++ b/force-app/main/default/lwc/editIndicatorBundle/editIndicatorBundle.js-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>59.0</apiVersion>
+    <description>Component is used to create and edit indicator bundles</description>
+    <isExposed>false</isExposed>
+    <masterLabel>Edit Indicator Bundle</masterLabel>
+</LightningComponentBundle>
diff --git a/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.html b/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.html
new file mode 100644
index 0000000..25ac5c5
--- /dev/null
+++ b/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.html
@@ -0,0 +1,13 @@
+<!--
+ - Created by robertwright on 10/31/23.
+ -->
+
+<!-- Indicator Edit Modal -->
+<template>
+    <lightning-modal-header label={headerLabel}></lightning-modal-header>
+    <lightning-modal-body>
+        <div class="container">
+            <lwc:component lwc:is={componentConstructor} lwc:spread={componentProperties}></lwc:component>
+        </div>
+    </lightning-modal-body>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.js b/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.js
new file mode 100644
index 0000000..c4f1990
--- /dev/null
+++ b/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.js
@@ -0,0 +1,40 @@
+/**
+ * Created by robertwright on 10/31/23.
+ */
+
+import {api} from 'lwc';
+import LightningModal from 'lightning/modal';
+
+import Indicator_Bundle from "@salesforce/schema/Indicator_Bundle__mdt";
+import Indicator_Item from "@salesforce/schema/Indicator_Item__mdt";
+import Indicator_Item_Extension from "@salesforce/schema/Indicator_Item_Extension__mdt";
+
+export default class IndicatorEditModal extends LightningModal {
+    componentConstructor;
+    componentProperties = {};
+
+    @api masterLabel;
+    @api objectApiName;
+    @api isNew = false;
+
+    get headerLabel() {
+        return (this.isNew) ? `New ${this.masterLabel}` : `Update ${this.masterLabel}`;
+    }
+
+    get componentToRender() {
+        switch (this.objectApiName) {
+            case Indicator_Bundle.objectApiName:
+                return "c/editIndicatorBundle";
+                break;
+            default:
+                return "c/editIndicatorBundle";
+        }
+    }
+
+    connectedCallback() {
+        import(`${this.componentToRender}`)
+            .then(({ default: ctor }) => (this.componentConstructor = ctor))
+            .catch((err) => console.log("Error importing component"));
+    }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.js-meta.xml b/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.js-meta.xml
new file mode 100644
index 0000000..29f7cd2
--- /dev/null
+++ b/force-app/main/default/lwc/indicatorEditModal/indicatorEditModal.js-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>59.0</apiVersion>
+    <description>Used to edit indicator records</description>
+    <isExposed>false</isExposed>
+    <masterLabel>Indicator Edit Modal</masterLabel>
+    <capabilities>
+        <capability>lightning__dynamicComponent</capability>
+    </capabilities>
+</LightningComponentBundle>
diff --git a/force-app/main/default/objects/Indicator_Bundle_Item__mdt/fields/Delete__c.field-meta.xml b/force-app/main/default/objects/Indicator_Bundle_Item__mdt/fields/Delete__c.field-meta.xml
new file mode 100644
index 0000000..95b0e63
--- /dev/null
+++ b/force-app/main/default/objects/Indicator_Bundle_Item__mdt/fields/Delete__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Delete__c</fullName>
+    <defaultValue>false</defaultValue>
+    <description>Marked for Deletion</description>
+    <externalId>false</externalId>
+    <fieldManageability>SubscriberControlled</fieldManageability>
+    <label>Delete</label>
+    <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Indicator_Bundle__mdt/fields/Delete__c.field-meta.xml b/force-app/main/default/objects/Indicator_Bundle__mdt/fields/Delete__c.field-meta.xml
new file mode 100644
index 0000000..95b0e63
--- /dev/null
+++ b/force-app/main/default/objects/Indicator_Bundle__mdt/fields/Delete__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Delete__c</fullName>
+    <defaultValue>false</defaultValue>
+    <description>Marked for Deletion</description>
+    <externalId>false</externalId>
+    <fieldManageability>SubscriberControlled</fieldManageability>
+    <label>Delete</label>
+    <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Indicator_Item_Extension__mdt/fields/Delete__c.field-meta.xml b/force-app/main/default/objects/Indicator_Item_Extension__mdt/fields/Delete__c.field-meta.xml
new file mode 100644
index 0000000..95b0e63
--- /dev/null
+++ b/force-app/main/default/objects/Indicator_Item_Extension__mdt/fields/Delete__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Delete__c</fullName>
+    <defaultValue>false</defaultValue>
+    <description>Marked for Deletion</description>
+    <externalId>false</externalId>
+    <fieldManageability>SubscriberControlled</fieldManageability>
+    <label>Delete</label>
+    <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/main/default/objects/Indicator_Item__mdt/fields/Delete__c.field-meta.xml b/force-app/main/default/objects/Indicator_Item__mdt/fields/Delete__c.field-meta.xml
new file mode 100644
index 0000000..95b0e63
--- /dev/null
+++ b/force-app/main/default/objects/Indicator_Item__mdt/fields/Delete__c.field-meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Delete__c</fullName>
+    <defaultValue>false</defaultValue>
+    <description>Marked for Deletion</description>
+    <externalId>false</externalId>
+    <fieldManageability>SubscriberControlled</fieldManageability>
+    <label>Delete</label>
+    <type>Checkbox</type>
+</CustomField>