diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 8a2e4453..1f3e1d53 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -157,6 +157,7 @@
 		D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; };
 		D2C5001821F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h in Headers */ = {isa = PBXBuildFile; fileRef = D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D2C5001921F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */; };
+		D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */; };
 		DBC4391822442197001AB423 /* CaretView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391622442196001AB423 /* CaretView.swift */; };
 		DBC4391922442197001AB423 /* DashLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391722442197001AB423 /* DashLine.swift */; };
 		DBC4391B224421A0001AB423 /* CaretButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391A224421A0001AB423 /* CaretButton.swift */; };
@@ -317,6 +318,7 @@
 		D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeLayerViewController.swift; sourceTree = "<group>"; };
 		D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewControllerMappingObject.h; sourceTree = "<group>"; };
 		D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIViewControllerMappingObject.m; sourceTree = "<group>"; };
+		D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIDelegateObject.swift; sourceTree = "<group>"; };
 		DBC4391622442196001AB423 /* CaretView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretView.swift; sourceTree = "<group>"; };
 		DBC4391722442197001AB423 /* DashLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DashLine.swift; sourceTree = "<group>"; };
 		DBC4391A224421A0001AB423 /* CaretButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretButton.swift; sourceTree = "<group>"; };
@@ -634,6 +636,7 @@
 		D29DF27021E79B2C003B2FB9 /* OtherHandlers */ = {
 			isa = PBXGroup;
 			children = (
+				D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */,
 				D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */,
 				D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */,
 				D29DF27721E7A533003B2FB9 /* MVMCoreUISession.h */,
@@ -865,6 +868,7 @@
 				D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */,
 				DBC4391922442197001AB423 /* DashLine.swift in Sources */,
 				D29DF29621E7ADB8003B2FB9 /* StackableViewController.m in Sources */,
+				D2E1FADB2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift in Sources */,
 				D22D1F1F220343560077CEC0 /* MVMCoreUICheckMarkView.m in Sources */,
 				D282AAB4223FDDAE00C46919 /* MFLoadImageView.swift in Sources */,
 				D29DF11721E6805F003B2FB9 /* UIColor+MFConvenience.m in Sources */,
diff --git a/MVMCoreUI/Atoms/Buttons/CaretButton.swift b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
index 7d67afb1..0849ed26 100644
--- a/MVMCoreUI/Atoms/Buttons/CaretButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
@@ -106,15 +106,15 @@ open class CaretButton: MFCustomButton {
     //------------------------------------------------------
     
     // Default values for view.
-    @objc open override func setAsMolecule() {
+    @objc open func setAsMolecule() {
         
         backgroundColor = .clear
         setTitleColor(enabledColor, for: .normal)
         setTitleColor(disabledColor, for: .disabled)
     }
     
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegate: NSObject?, additionalData: [AnyHashable: Any]?) {
-        setWithActionMap(json, delegate: delegate as? (MVMCoreActionDelegateProtocol & NSObjectProtocol), additionalData: additionalData)
+    open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        setWithActionMap(json, delegateObject: delegateObject, additionalData: additionalData)
         
         guard let dictionary = json else { return }
         
diff --git a/MVMCoreUI/Atoms/Buttons/MFCustomButton.h b/MVMCoreUI/Atoms/Buttons/MFCustomButton.h
index 21236e70..9d08883d 100644
--- a/MVMCoreUI/Atoms/Buttons/MFCustomButton.h
+++ b/MVMCoreUI/Atoms/Buttons/MFCustomButton.h
@@ -11,14 +11,14 @@
 #import <MVMCoreUI/ButtonDelegateProtocol.h>
 #import <MVMCoreUI/MFButtonProtocol.h>
 #import <MVMCoreUI/MVMCoreUIMoleculeViewProtocol.h>
-@import MVMCore.MVMCoreViewProtocol;
+@class DelegateObject;
 
 typedef void (^ButtonTapBlock)(id _Nonnull sender);
 
 extern CGFloat const CloseButtonHeight;
 extern CGFloat const CloseButtonWidth;
 
-@interface MFCustomButton : UIButton <MFButtonProtocol, MVMCoreUIMoleculeViewProtocol>
+@interface MFCustomButton : UIButton <MFButtonProtocol>
 
 @property (nullable, nonatomic, strong) NSDictionary *actionMap;
 @property (nullable, nonatomic, weak) id <ButtonDelegateProtocol> buttonDelegate;
@@ -28,14 +28,19 @@ extern CGFloat const CloseButtonWidth;
 - (void)addBlock:(nonnull ButtonTapBlock)buttonTapBlock forControlEvents:(UIControlEvents)event;
 
 // Sets up the button with the passed in action map. Will set the title and set the action to use the action handler.
-- (void)setWithActionMap:(nullable NSDictionary *)actionMap delegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)delegate additionalData:(nullable NSDictionary *)additionalData;
-
-// Sets up the button with the passed in action map. Will set the title and set the action to use the action handler. Also pass in the button delegate
-- (void)setWithActionMap:(nullable NSDictionary *)actionMap actionDelegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)actionDelegate additionalData:(nullable NSDictionary *)additionalData buttonDelegate:(nullable id <ButtonDelegateProtocol>)buttonDelegate;
+- (void)setWithActionMap:(nullable NSDictionary *)actionMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
 
 //accessibility
 - (void)addAccessibilityForCameraControl;
 
 - (nonnull UIAccessibilityCustomAction *)accessibilityCustomAction;
 
+#pragma mark - Deprecated
+
+// Sets up the button with the passed in action map. Will set the title and set the action to use the action handler.
+- (void)setWithActionMap:(nullable NSDictionary *)actionMap delegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)delegate additionalData:(nullable NSDictionary *)additionalData __deprecated;
+
+// Sets up the button with the passed in action map. Will set the title and set the action to use the action handler. Also pass in the button delegate
+- (void)setWithActionMap:(nullable NSDictionary *)actionMap actionDelegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)actionDelegate additionalData:(nullable NSDictionary *)additionalData buttonDelegate:(nullable id <ButtonDelegateProtocol>)buttonDelegate __deprecated;
+
 @end
diff --git a/MVMCoreUI/Atoms/Buttons/MFCustomButton.m b/MVMCoreUI/Atoms/Buttons/MFCustomButton.m
index 0a78856c..1610f42b 100644
--- a/MVMCoreUI/Atoms/Buttons/MFCustomButton.m
+++ b/MVMCoreUI/Atoms/Buttons/MFCustomButton.m
@@ -13,6 +13,7 @@
 @import MVMCore.NSDictionary_MFConvenience;
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
+#import <MVMCoreUI/MVMCoreUI-Swift.h>
 
 CGFloat const CloseButtonHeight = 40.0f;
 CGFloat const CloseButtonWidth = 40.0f;
@@ -37,6 +38,54 @@ CGFloat const CloseButtonWidth = 40.0f;
     }
 }
 
+- (void)setWithActionMap:(nullable NSDictionary *)actionMap delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData {
+
+    self.actionMap = actionMap;
+    self.titleLabel.numberOfLines = 0;
+    self.titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
+    [self setTitle:[actionMap stringForKey:KeyTitle] forState:UIControlStateNormal];
+    
+    [self setEnabled:![actionMap[KeyDisableButton]boolValue]];
+    
+    if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
+        self.buttonDelegate = ((MVMCoreUIDelegateObject *)delegateObject).buttonDelegate;
+    }
+    __weak MFCustomButton *weakSelf = self;
+    [self addBlock:^(id  _Nonnull sender) {
+        
+        BOOL performAction = YES;
+        if (weakSelf.buttonDelegate && [weakSelf.buttonDelegate respondsToSelector:@selector(button:shouldPerformActionWithMap:additionalData:)]) {
+            performAction = [weakSelf.buttonDelegate button:weakSelf shouldPerformActionWithMap:actionMap additionalData:additionalData];
+        }
+        
+        if (performAction) {
+            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegateObject:delegateObject];
+        }
+    } forControlEvents:UIControlEventTouchUpInside];
+}
+
+//accessibility
+-(void)addAccessibilityForCameraControl{
+    self.accessibilityLabel = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCameraButton"];
+    self.accessibilityHint = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCameraHint"];
+    self.accessibilityTraits = UIAccessibilityTraitNone;
+}
+
+
+- (UIAccessibilityCustomAction *)accessibilityCustomAction {
+    NSString *name = self.accessibilityLabel ?: self.titleLabel.text;
+    return [[UIAccessibilityCustomAction alloc] initWithName:name target:self selector:@selector(performAccessibilityAction:)];
+}
+
+- (BOOL)performAccessibilityAction:(UIAccessibilityCustomAction *)action {
+    if (self.buttonTapBlock) {
+        self.buttonTapBlock(self);
+    }
+    return YES;
+}
+
+#pragma mark - Deprecated
+
 - (void)setWithActionMap:(nullable NSDictionary *)actionMap delegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)delegate additionalData:(nullable NSDictionary *)additionalData {
     
     self.actionMap = actionMap;
@@ -53,11 +102,11 @@ CGFloat const CloseButtonWidth = 40.0f;
 }
 
 - (void)setWithActionMap:(nullable NSDictionary *)actionMap actionDelegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)actionDelegate additionalData:(nullable NSDictionary *)additionalData buttonDelegate:(nullable id <ButtonDelegateProtocol>)buttonDelegate {
-
+    
     if (!buttonDelegate) {
         [self setWithActionMap:actionMap delegate:actionDelegate additionalData:additionalData];
     } else {
-    
+        
         self.actionMap = actionMap;
         self.titleLabel.numberOfLines = 0;
         self.titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
@@ -86,24 +135,4 @@ CGFloat const CloseButtonWidth = 40.0f;
     }
 }
 
-//accessibility
--(void)addAccessibilityForCameraControl{
-    self.accessibilityLabel = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCameraButton"];
-    self.accessibilityHint = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCameraHint"];
-    self.accessibilityTraits = UIAccessibilityTraitNone;
-}
-
-
-- (UIAccessibilityCustomAction *)accessibilityCustomAction {
-    NSString *name = self.accessibilityLabel ?: self.titleLabel.text;
-    return [[UIAccessibilityCustomAction alloc] initWithName:name target:self selector:@selector(performAccessibilityAction:)];
-}
-
-- (BOOL)performAccessibilityAction:(UIAccessibilityCustomAction *)action {
-    if (self.buttonTapBlock) {
-        self.buttonTapBlock(self);
-    }
-    return YES;
-}
-
 @end
diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton.m b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
index ff4c372c..0a72eee7 100644
--- a/MVMCoreUI/Atoms/Buttons/MFTextButton.m
+++ b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
@@ -128,12 +128,12 @@
 
 #pragma mark - MVMCoreUIMoleculeViewProtocol
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     NSString *color = [json string:KeyTextColor];
     if (color) {
         [self setTitleColor:[UIColor mfGetColorForHex:color] forState:UIControlStateNormal];
     }
-    [self setWithActionMap:json actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) additionalData:additionalData buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
+    [self setWithActionMap:json delegateObject:delegateObject additionalData:additionalData];
     if ([self titleForState:UIControlStateNormal].length == 0) {
         self.heightConstraint.constant = 0;
     } else {
diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
index fd7ad2b9..2085b5c8 100644
--- a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
+++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
@@ -648,10 +648,11 @@
     [self setAsStandardCustom];
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData {
-        
-    [FormValidator setupValidationWithMolecule:self delegate:(id<FormValidationProtocol>)delegate];
-    
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+    if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
+        [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+    }
+
     self.primaryButtonType = PrimaryButtonTypeCustom;
     NSString *color = [json string:@"fillColor"];
     if (color) {
@@ -676,7 +677,7 @@
     self.validationRequired = [json boolForKey:@"validationRequired"];
     
     [self setAsSmallButton:[json boolForKey:@"small"]];
-    [self setWithActionMap:json actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) additionalData:additionalData buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
+    [self setWithActionMap:json delegateObject:delegateObject additionalData:additionalData];
 }
 
 #pragma mark - Handling Validations
diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m
index 565e086c..77509325 100644
--- a/MVMCoreUI/Atoms/TextFields/MFTextField.m
+++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m
@@ -116,7 +116,7 @@
 + (nullable instancetype)mfTextFieldWithMap:(nullable NSDictionary *)map bothDelegates:(nullable id<UITextFieldDelegate, MFTextFieldDelegate>)delegate {
     MFTextField *textField = [self mfTextField];
     textField.translatesAutoresizingMaskIntoConstraints = NO;
-    [textField setWithJSON:map delegate:delegate additionalData:nil];
+    [textField setWithJSON:map delegateObject:[MVMCoreUIDelegateObject createWithDelegateForAll:delegate] additionalData:nil];
     return textField;
 }
 
@@ -558,10 +558,12 @@
     self.isMolecule = YES;
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(nullable id<UITextFieldDelegate, MFTextFieldDelegate>)delegate additionalData:(NSDictionary *)additionalData {
-    [FormValidator setupValidationWithMolecule:self delegate:(id<FormValidationProtocol>)delegate];
-    FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:(id<FormValidationProtocol>)delegate];
-    [self setWithMap:json bothDelegates:formValidator];
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+    if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
+        [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+        FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+        [self setWithMap:json bothDelegates:formValidator];
+    }
 }
 
 #pragma mark - FormValidationProtocol
diff --git a/MVMCoreUI/Atoms/Views/CaretView.swift b/MVMCoreUI/Atoms/Views/CaretView.swift
index 563dc2d1..eb3a4c4b 100644
--- a/MVMCoreUI/Atoms/Views/CaretView.swift
+++ b/MVMCoreUI/Atoms/Views/CaretView.swift
@@ -94,10 +94,9 @@ open class CaretView: MFView {
         
         defaultState()
     }
-    
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegate: NSObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
-        
+
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         // Configure class properties with JSON values
         guard let jsonDictionary = json else { return }
         
diff --git a/MVMCoreUI/Atoms/Views/DashLine.swift b/MVMCoreUI/Atoms/Views/DashLine.swift
index 9b3e7f52..82c05b27 100644
--- a/MVMCoreUI/Atoms/Views/DashLine.swift
+++ b/MVMCoreUI/Atoms/Views/DashLine.swift
@@ -68,8 +68,8 @@ open class DashLine: MFView {
         isHidden = false
     }
     
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegate: NSObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         
         // Configure class properties with JSON values
         guard let jsonDictionary = json else { return }
diff --git a/MVMCoreUI/Atoms/Views/LabelView.m b/MVMCoreUI/Atoms/Views/LabelView.m
index f1d7b2f0..15915cec 100644
--- a/MVMCoreUI/Atoms/Views/LabelView.m
+++ b/MVMCoreUI/Atoms/Views/LabelView.m
@@ -72,9 +72,9 @@
     }
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
-    [super setWithJSON:json delegate:delegate additionalData:additionalData];
-    [self.label setWithJSON:json delegate:delegate additionalData:additionalData];
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+    [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
+    [self.label setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
 }
 
 - (void)alignLeft {
diff --git a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
index 42661311..60121c3a 100644
--- a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
+++ b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
@@ -556,8 +556,7 @@ extension LabelWithInternalButton: MVMCoreUIMoleculeViewProtocol {
         
     }
     
-    @objc open func setWithJSON(_ json: [AnyHashable: Any]?, delegate: NSObject?, additionalData: [AnyHashable: Any]?) {
-        
+    @objc open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
         // Configure class properties with JSON values
         guard let dictionary = json else { return }
         
diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h
index 22308465..7dc4fd8d 100644
--- a/MVMCoreUI/Atoms/Views/MFLabel.h
+++ b/MVMCoreUI/Atoms/Views/MFLabel.h
@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import <MVMCoreUI/MFView.h>
 @class MFSizeObject;
+@class DelegateObject;
 
 @interface MFLabel : UILabel <MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol>
 
@@ -49,7 +50,7 @@
 
 // Setters
 + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html;
-+ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData;
++ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
 
 - (void)styleH1:(BOOL)scale;
 - (void)styleH2:(BOOL)scale;
diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m
index 66b434e5..5fb19037 100644
--- a/MVMCoreUI/Atoms/Views/MFLabel.m
+++ b/MVMCoreUI/Atoms/Views/MFLabel.m
@@ -170,7 +170,7 @@
     }
 }
 
-+ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData {
++ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData {
     if (label) {
         label.text = [json string:KeyText];
         [self setLabel:label withHTML:[json string:@"html"]];
@@ -232,8 +232,8 @@
     }
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
-    [MFLabel setUILabel:self withJSON:json delegate:delegate additionalData:additionalData];
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+    [MFLabel setUILabel:self withJSON:json delegateObject:delegateObject additionalData:additionalData];
     self.originalAttributedString = self.attributedText;
 }
 
diff --git a/MVMCoreUI/Atoms/Views/MFLoadImageView.swift b/MVMCoreUI/Atoms/Views/MFLoadImageView.swift
index 257fe041..b08dc249 100644
--- a/MVMCoreUI/Atoms/Views/MFLoadImageView.swift
+++ b/MVMCoreUI/Atoms/Views/MFLoadImageView.swift
@@ -203,8 +203,8 @@ import UIKit
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol functions
-    open override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let backgroundColorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = UIColor.mfGet(forHex: backgroundColorString)
         }
diff --git a/MVMCoreUI/Atoms/Views/MFView.m b/MVMCoreUI/Atoms/Views/MFView.m
index 1ab4cda1..4bd73485 100644
--- a/MVMCoreUI/Atoms/Views/MFView.m
+++ b/MVMCoreUI/Atoms/Views/MFView.m
@@ -7,6 +7,7 @@
 //
 
 #import "MFView.h"
+@import MVMCore.Swift;
 
 @implementation MFView
 
@@ -43,7 +44,7 @@
 
 #pragma mark - MVMCoreUIMoleculeViewProtocol
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData {
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     self.json = json;
 }
 
diff --git a/MVMCoreUI/Atoms/Views/SeparatorView.m b/MVMCoreUI/Atoms/Views/SeparatorView.m
index 73cd84ff..95fe8bb8 100644
--- a/MVMCoreUI/Atoms/Views/SeparatorView.m
+++ b/MVMCoreUI/Atoms/Views/SeparatorView.m
@@ -95,8 +95,8 @@
     }
 }
 
-- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
-    [super setWithJSON:json delegate:delegate additionalData:additionalData];
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+    [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
     if (json) {
         self.hidden = NO;
         NSString *type = [json string:KeyType];
diff --git a/MVMCoreUI/BaseControllers/MFViewController.h b/MVMCoreUI/BaseControllers/MFViewController.h
index 8d5c6678..8c1d5766 100644
--- a/MVMCoreUI/BaseControllers/MFViewController.h
+++ b/MVMCoreUI/BaseControllers/MFViewController.h
@@ -31,6 +31,7 @@
 @class MainMenuViewController;
 @class MVMCoreUITabBarPageControlViewController;
 @class MVMAnimationManager;
+@class DelegateObject;
 
 @interface MFViewController : UIViewController <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol, MVMCoreActionDelegateProtocol, UITextFieldDelegate, UITextViewDelegate, MFTextFieldDelegate, ButtonDelegateProtocol, MVMCoreViewControllerProtocol, MVMCoreViewManagerViewControllerProtocol, MVMCoreUIDetailViewProtocol>
 
diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m
index c4ee3756..c378391a 100644
--- a/MVMCoreUI/BaseControllers/MFViewController.m
+++ b/MVMCoreUI/BaseControllers/MFViewController.m
@@ -138,7 +138,7 @@
     
     // Creates an initial load object if needed.
     if (!self.loadObject) {
-        self.loadObject = [[MVMCoreLoadObject alloc] initWithDelegate:self];
+        self.loadObject = [[MVMCoreLoadObject alloc] initWithDelegateObject:[self delegateObject]];
     }
     
     // Avoid the setter so we are only setting the bool and wait for view will appear to update the navigation bar.
@@ -180,6 +180,10 @@
     return YES;
 }
 
+- (nullable DelegateObject *)delegateObject {
+    return [MVMCoreUIDelegateObject createWithDelegateForAll:self];
+}
+
 #pragma mark - Response Handling
 
 - (void)observeForResponseJSONUpdates {
@@ -339,7 +343,7 @@
     if (rightPanelLinkDict) {
         [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict
                                                                 additionalData:nil
-                                                                      delegate:self];
+                                                                      delegateObject:[self delegateObject]];
         return YES;
     } else {
         return NO;
@@ -603,7 +607,7 @@
     [self.formValidator addFormParamsWithRequestParameters:requestParameters];
     requestParameters.parentPageType = [self.loadObject.pageJSON stringForKey:@"parentPageType"];
     
-    [[MVMCoreLoadHandler sharedGlobal] loadRequest:requestParameters dataForPage:additionalData delegate:self];
+    [[MVMCoreLoadHandler sharedGlobal] loadRequest:requestParameters dataForPage:additionalData delegateObject:[self delegateObject]];
 }
 
 - (void)handleBackAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {
@@ -658,7 +662,7 @@
 
 - (void)handleUnknownActionType:(nullable NSString *)actionType actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {
     
-    [MVMCoreActionHandler defaultHandleUnknownActionType:actionType actionInformation:actionInformation additionalData:additionalData delegate:self];
+    [MVMCoreActionHandler defaultHandleUnknownActionType:actionType actionInformation:actionInformation additionalData:additionalData delegateObject:[self delegateObject]];
 }
 
 - (void)handleActionError:(nonnull MVMCoreErrorObject *)error additionalData:(nullable NSDictionary *)additionalData {
@@ -685,7 +689,7 @@
 }
 
 - (nullable MVMCoreAlertObject *)alertObjectToShow:(nonnull MVMCoreLoadObject *)loadObject error:(nullable MVMCoreErrorObject *)errorObject {
-    return [MVMCoreAlertObject alertObjectForLoadObject:loadObject error:errorObject actionDelegate:self];
+    return [MVMCoreAlertObject alertObjectForLoadObject:loadObject error:errorObject delegateObject:[self delegateObject]];
 }
 
 - (void)handleFieldErrors:(nullable NSArray *)fieldErrors loadObject:(nonnull MVMCoreLoadObject *)loadObject {
diff --git a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m
index 489a4696..d06ca5f4 100644
--- a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m
+++ b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m
@@ -394,7 +394,7 @@
             if (customAdditionalData) {
                 [additionalData addEntriesFromDictionary:customAdditionalData];
             }
-            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegate:self];
+            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegateObject:[self delegateObject]];
         }
     }
     return NO;
diff --git a/MVMCoreUI/FormUIHelpers/FormValidator+FormParams.swift b/MVMCoreUI/FormUIHelpers/FormValidator+FormParams.swift
index 2f1e9f99..17da0e72 100644
--- a/MVMCoreUI/FormUIHelpers/FormValidator+FormParams.swift
+++ b/MVMCoreUI/FormUIHelpers/FormValidator+FormParams.swift
@@ -9,11 +9,11 @@
 import Foundation
 
 @objc public extension FormValidator {
-    @objc public func addFormParams(requestParameters: MVMCoreRequestParameters)  {
+    @objc func addFormParams(requestParameters: MVMCoreRequestParameters)  {
         requestParameters.add(self.getFormParams())
     }
     
-    @objc public func getFormParams() -> [String: Any] {
+    @objc func getFormParams() -> [String: Any] {
         var extraParam: [String: Any] = [:]
         MVMCoreDispatchUtility.performSyncBlock(onMainThread: {
             for molecule in self.molecules {
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m
index 7a16405b..ca75b778 100644
--- a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m
+++ b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m
@@ -117,7 +117,7 @@
 		// Sets up the buttons/button.
 		NSDictionary *primaryButtonDictionary = [self primaryButtonMap];
 		NSDictionary *secondaryButtonDictionary = [self secondaryButtonMap];
-        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary actionDelegate:self additionalData:nil buttonDelegate:self];
+        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary delegateObject:[self delegateObject] additionalData:nil];
         self.secondaryButton = buttonView.secondaryButton;
         self.primaryButton = buttonView.primaryButton;
 
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
index be14e149..149b399c 100644
--- a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
+++ b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
@@ -127,7 +127,7 @@
         // Sets up the buttons/button.
         NSDictionary *primaryButtonDictionary = [self primaryButtonMap];
         NSDictionary *secondaryButtonDictionary = [self secondaryButtonMap];
-        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary actionDelegate:self additionalData:nil buttonDelegate:self];
+        TwoButtonView *buttonView = [[TwoButtonView alloc] initWithPrimaryButtonMap:primaryButtonDictionary secondaryButtonMap:secondaryButtonDictionary delegateObject:[self delegateObject] additionalData:nil];
         self.secondaryButton = buttonView.secondaryButton;
         self.primaryButton = buttonView.primaryButton;
         bottomView = buttonView;
diff --git a/MVMCoreUI/Molecules/ButtonView.swift b/MVMCoreUI/Molecules/ButtonView.swift
index f48044dd..8958887c 100644
--- a/MVMCoreUI/Molecules/ButtonView.swift
+++ b/MVMCoreUI/Molecules/ButtonView.swift
@@ -33,9 +33,9 @@ import UIKit
         primaryButton?.isEnabled = enabled
     }
     
-    public init(withJSON json: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate: NSObject?, buttonDelegate: Any?) {
+    public init(withJSON json: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         super.init(frame: .zero)
-        setWithJSON(json, delegate: actionDelegate, additionalData: additionalData)
+        setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
     }
     
     // MARK: - MVMCoreViewProtocol
@@ -58,9 +58,9 @@ import UIKit
         primaryButton?.setAsMolecule()
     }
 
-    open override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
-        primaryButton?.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+        primaryButton?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
     }
     
     // MARK: - Constraining
diff --git a/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h b/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h
index 3dd8de67..ac92e0a1 100644
--- a/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h
+++ b/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h
@@ -7,11 +7,12 @@
 //
 
 #import <UIKit/UIKit.h>
+@class DelegateObject;
 
 @protocol MVMCoreUIMoleculeViewProtocol <NSObject>
 
 // Sets up the ui based on the json
-- (void)setWithJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData;
+- (void)setWithJSON:(nullable NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
 
 @optional
 
diff --git a/MVMCoreUI/Molecules/MoleculeStackView.swift b/MVMCoreUI/Molecules/MoleculeStackView.swift
index 1c70d6eb..57b0108c 100644
--- a/MVMCoreUI/Molecules/MoleculeStackView.swift
+++ b/MVMCoreUI/Molecules/MoleculeStackView.swift
@@ -17,13 +17,13 @@ public class MoleculeStackView: MFView {
         super.init(frame: frame)
     }
     
-    public init(withJSON json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
+    public init(withJSON json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable : Any]?) {
         super.init(frame: CGRect.zero)
-        setWithJSON(json, delegate: delegate, additionalData: additionalData)
+        setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
     }
     
-    public convenience init(withJSON json: [AnyHashable : Any]?, delegate: NSObject?, spacingBlock: ((Any) -> UIEdgeInsets)?) {
-        self.init(withJSON: json, delegate: delegate, additionalData: nil)
+    public convenience init(withJSON json: [AnyHashable: Any]?, delegateObject: DelegateObject?, spacingBlock: ((Any) -> UIEdgeInsets)?) {
+        self.init(withJSON: json, delegateObject: delegateObject, additionalData: nil)
         self.spacingBlock = spacingBlock
     }
     
@@ -48,8 +48,8 @@ public class MoleculeStackView: MFView {
         }
     }
     
-    public override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         guard let molecules = json?.arrayForKey("molecules") as? [[String: Any]] else {
             return
         }
@@ -58,7 +58,7 @@ public class MoleculeStackView: MFView {
         var moleculesArray = [] as [UIView]
         for moleculeJSON in molecules {
             if let name = moleculeJSON.optionalStringForKey("moleculeName"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForName(name) {
-                molecule.setWithJSON(moleculeJSON, delegate: delegate, additionalData: additionalData)
+                molecule.setWithJSON(moleculeJSON, delegateObject: delegateObject, additionalData: additionalData)
                 moleculesArray.append(molecule)
             }
         }
diff --git a/MVMCoreUI/Molecules/StandardFooterView.swift b/MVMCoreUI/Molecules/StandardFooterView.swift
index 99880b9b..a170d023 100644
--- a/MVMCoreUI/Molecules/StandardFooterView.swift
+++ b/MVMCoreUI/Molecules/StandardFooterView.swift
@@ -103,12 +103,12 @@ public class StandardFooterView: ViewConstrainingView {
         rightConstraintTextButton?.constant = constant
     }
     
-    public override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let colorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = .mfGet(forHex: colorString)
         }
-        twoButtonView.setWithJSON(json?.optionalDictionaryForKey("twoButtonView"), delegate: delegate, additionalData: additionalData)
-        textButton.setWithJSON(json?.optionalDictionaryForKey("textButton"), delegate: delegate, additionalData: additionalData)
+        twoButtonView.setWithJSON(json?.optionalDictionaryForKey("twoButtonView"), delegateObject: delegateObject, additionalData: additionalData)
+        textButton.setWithJSON(json?.optionalDictionaryForKey("textButton"), delegateObject: delegateObject, additionalData: additionalData)
     }
 }
diff --git a/MVMCoreUI/Molecules/StandardHeaderView.swift b/MVMCoreUI/Molecules/StandardHeaderView.swift
index 8c05a4c6..488e31c1 100644
--- a/MVMCoreUI/Molecules/StandardHeaderView.swift
+++ b/MVMCoreUI/Molecules/StandardHeaderView.swift
@@ -110,8 +110,8 @@ public class StandardHeaderView: ViewConstrainingView {
         separatorView?.rightPin?.constant = constant
     }
     
-    public override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let colorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = .mfGet(forHex: colorString)
         }
@@ -123,11 +123,11 @@ public class StandardHeaderView: ViewConstrainingView {
         }
         
         let headlineJSON = json?.optionalDictionaryForKey("headline")
-        headlineLabel.setWithJSON(headlineJSON, delegate: delegate, additionalData: additionalData)
+        headlineLabel.setWithJSON(headlineJSON, delegateObject: delegateObject, additionalData: additionalData)
         let bodyJSON = json?.optionalDictionaryForKey("body")
-        messageLabel.setWithJSON(bodyJSON, delegate: delegate, additionalData: additionalData)
+        messageLabel.setWithJSON(bodyJSON, delegateObject: delegateObject, additionalData: additionalData)
         let separatorJSON = json?.optionalDictionaryForKey("separator")
-        separatorView?.setWithJSON(separatorJSON, delegate: delegate, additionalData: additionalData)
+        separatorView?.setWithJSON(separatorJSON, delegateObject: delegateObject, additionalData: additionalData)
         
         if separatorView?.isHidden ?? true {
             bottomPin?.constant = 0
diff --git a/MVMCoreUI/Molecules/TwoButtonView.swift b/MVMCoreUI/Molecules/TwoButtonView.swift
index c56d82bf..66b7210a 100644
--- a/MVMCoreUI/Molecules/TwoButtonView.swift
+++ b/MVMCoreUI/Molecules/TwoButtonView.swift
@@ -39,14 +39,14 @@ import UIKit
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol
-    open override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
-        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         if let backgroundColorString = json?.optionalStringForKey(KeyBackgroundColor) {
             backgroundColor = UIColor.mfGet(forHex: backgroundColorString)
         }
         let primaryButtonMap = json?.optionalDictionaryForKey("primaryButton")
         let secondaryButtonMap = json?.optionalDictionaryForKey("secondaryButton")
-        set(primaryButtonJSON: primaryButtonMap, secondaryButtonJSON: secondaryButtonMap, actionDelegate: delegate, additionalData: additionalData, buttonDelegate: delegate)
+        set(primaryButtonJSON: primaryButtonMap, secondaryButtonJSON: secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
     }
     
     // MARK: - Constraining
@@ -142,32 +142,24 @@ import UIKit
         }
     }
     
-    open func set(primaryButtonJSON: [AnyHashable: Any]?, secondaryButtonJSON: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
+    open func set(primaryButtonJSON: [AnyHashable: Any]?, secondaryButtonJSON: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
         setupUI(withPrimaryButtonMap: primaryButtonJSON, secondaryButtonMap: secondaryButtonJSON, legacy: false)
         setDefaultCustom()
-        primaryButton?.setWithJSON(primaryButtonJSON, delegate: actionDelegate as? NSObject, additionalData: additionalData)
-        secondaryButton?.setWithJSON(secondaryButtonJSON, delegate: actionDelegate as? NSObject, additionalData: additionalData)
+        primaryButton?.setWithJSON(primaryButtonJSON, delegateObject: delegateObject, additionalData: additionalData)
+        secondaryButton?.setWithJSON(secondaryButtonJSON, delegateObject: delegateObject, additionalData: additionalData)
     }
     
     // MARK: - Legacy
-    open func setup(withButtonMap buttonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
-        let secondaryButtonMap = buttonMap?.optionalDictionaryForKey(KeySecondaryButton)
-        let primaryButtonMap = buttonMap?.optionalDictionaryForKey(KeyPrimaryButton)
-        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, actionDelegate: actionDelegate, additionalData: additionalData, buttonDelegate: buttonDelegate)
+    public convenience init(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        self.init()
+        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
     }
     
-    open func setup(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
-        setupUI(withPrimaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, legacy: true)
-        if primaryButtonMap != nil, secondaryButtonMap != nil {
-            primaryButton?.setWithActionMap(primaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
-            secondaryButton?.setWithActionMap(secondaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
-        } else if primaryButtonMap != nil {
-            primaryButton?.setWithActionMap(primaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
-            primaryButton?.bordered = false
-        } else if secondaryButtonMap != nil {
-            primaryButton?.setWithActionMap(secondaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
-            primaryButton?.bordered = true
-        }
+    public convenience init(buttonSmall small: Bool, buttonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: AnyHashable]?) {
+        self.init()
+        setup(withButtonMap: buttonMap, delegateObject: delegateObject, additionalData: additionalData)
+        primaryButton?.setAsSmall(small)
+        secondaryButton?.setAsSmall(small)
     }
     
     public convenience init(buttonSmall small: Bool, enabled: Bool) {
@@ -178,16 +170,24 @@ import UIKit
         primaryButton?.isEnabled = enabled
     }
     
-    public convenience init(buttonSmall small: Bool, buttonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: AnyHashable]?, buttonDelegate: Any?) {
-        self.init()
-        setup(withButtonMap: buttonMap, actionDelegate: actionDelegate, additionalData: additionalData, buttonDelegate: buttonDelegate)
-        primaryButton?.setAsSmall(small)
-        secondaryButton?.setAsSmall(small)
+    open func setup(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        setupUI(withPrimaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, legacy: true)
+        if primaryButtonMap != nil, secondaryButtonMap != nil {
+            primaryButton?.setWithActionMap(primaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+            secondaryButton?.setWithActionMap(secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+        } else if primaryButtonMap != nil {
+            primaryButton?.setWithActionMap(primaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+            primaryButton?.bordered = false
+        } else if secondaryButtonMap != nil {
+            primaryButton?.setWithActionMap(secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
+            primaryButton?.bordered = true
+        }
     }
     
-    public convenience init(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
-        self.init()
-        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, actionDelegate: actionDelegate, additionalData: additionalData, buttonDelegate: buttonDelegate)
+    open func setup(withButtonMap buttonMap: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        let secondaryButtonMap = buttonMap?.optionalDictionaryForKey(KeySecondaryButton)
+        let primaryButtonMap = buttonMap?.optionalDictionaryForKey(KeyPrimaryButton)
+        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, delegateObject: delegateObject, additionalData: additionalData)
     }
     
     public func hidePrimaryLeftButton() {
@@ -229,3 +229,42 @@ import UIKit
         secondaryButton?.isHidden = true
     }
 }
+
+// MARK: - Deprecate
+extension TwoButtonView {
+    @available(*, deprecated)
+    open func setup(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
+        setupUI(withPrimaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, legacy: true)
+        if primaryButtonMap != nil, secondaryButtonMap != nil {
+            primaryButton?.setWithActionMap(primaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
+            secondaryButton?.setWithActionMap(secondaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
+        } else if primaryButtonMap != nil {
+            primaryButton?.setWithActionMap(primaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
+            primaryButton?.bordered = false
+        } else if secondaryButtonMap != nil {
+            primaryButton?.setWithActionMap(secondaryButtonMap, actionDelegate: actionDelegate as? MVMCoreActionDelegateProtocol & NSObjectProtocol, additionalData: additionalData, buttonDelegate: buttonDelegate as? ButtonDelegateProtocol)
+            primaryButton?.bordered = true
+        }
+    }
+    
+    @available(*, deprecated)
+    open func setup(withButtonMap buttonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
+        let secondaryButtonMap = buttonMap?.optionalDictionaryForKey(KeySecondaryButton)
+        let primaryButtonMap = buttonMap?.optionalDictionaryForKey(KeyPrimaryButton)
+        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, actionDelegate: actionDelegate, additionalData: additionalData, buttonDelegate: buttonDelegate)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(buttonSmall small: Bool, buttonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: AnyHashable]?, buttonDelegate: Any?) {
+        self.init()
+        setup(withButtonMap: buttonMap, actionDelegate: actionDelegate, additionalData: additionalData, buttonDelegate: buttonDelegate)
+        primaryButton?.setAsSmall(small)
+        secondaryButton?.setAsSmall(small)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(primaryButtonMap: [AnyHashable: Any]?, secondaryButtonMap: [AnyHashable: Any]?, actionDelegate: NSObjectProtocol?, additionalData: [AnyHashable: Any]?, buttonDelegate: Any?) {
+        self.init()
+        setup(primaryButtonMap: primaryButtonMap, secondaryButtonMap: secondaryButtonMap, actionDelegate: actionDelegate, additionalData: additionalData, buttonDelegate: buttonDelegate)
+    }
+}
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift b/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift
new file mode 100644
index 00000000..eaf892fb
--- /dev/null
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIDelegateObject.swift
@@ -0,0 +1,20 @@
+//
+//  DelegateObject.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 4/12/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+open class MVMCoreUIDelegateObject: DelegateObject {
+    public weak var formValidationProtocol: FormValidationProtocol?
+    public weak var buttonDelegate: ButtonDelegateProtocol?
+
+    open override func setAll(withDelegate delegate: Any) {
+        super.setAll(withDelegate: delegate)
+        formValidationProtocol = delegate as? FormValidationProtocol
+        buttonDelegate = delegate as? ButtonDelegateProtocol
+    }
+}
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h b/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h
index 56bb60a2..003d67f8 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h
@@ -7,7 +7,6 @@
 //
 
 @import MVMCore.MVMCoreLoggingHandler;
-@class MVMCoreTopAlertObject;
 @class MFViewController;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.h b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.h
index 7d229bbe..a79ca208 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.h
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.h
@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import <MVMCoreUI/MVMCoreUIMoleculeViewProtocol.h>
+@class DelegateObject;
 
 @interface MVMCoreUIMoleculeMappingObject : NSObject
 
@@ -19,6 +20,6 @@
 
 // Returns the molecule for the given name.
 - (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForName:(nonnull NSString *)name;
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForJSON:(nonnull NSDictionary *)json delegate:(nullable NSObject *)delegate;
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject;
 
 @end
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index 0936f9df..c1d7a36d 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -55,13 +55,13 @@
     return nil;
 }
 
-- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForJSON:(nonnull NSDictionary *)json delegate:(nullable NSObject *)delegate {
+- (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForJSON:(nonnull NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject {
     NSString *moleculeName = [json string:@"moleculeName"];
     if (!moleculeName) {
         return nil;
     }
     UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [self getMoleculeForName:moleculeName];
-    [molecule setWithJSON:json delegate:delegate additionalData:nil];        
+    [molecule setWithJSON:json delegateObject:delegateObject additionalData:nil];
     return molecule;
 }
 
diff --git a/MVMCoreUI/Templates/MoleculeStackCenteredTemplate.swift b/MVMCoreUI/Templates/MoleculeStackCenteredTemplate.swift
index ab7b6dec..bdd187fe 100644
--- a/MVMCoreUI/Templates/MoleculeStackCenteredTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeStackCenteredTemplate.swift
@@ -12,13 +12,13 @@ public class MoleculeStackCenteredTemplate: ThreeLayerViewController {
     
     public override func viewForMiddle() -> UIView? {
         let molecule = loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack")
-        let moleculeStack = MoleculeStackView(withJSON: molecule, delegate: self, additionalData: nil)
+        let moleculeStack = MoleculeStackView(withJSON: molecule, delegateObject: delegateObject(), additionalData: nil)
         return moleculeStack
     }
 
     public override func viewForTop() -> UIView? {
         guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"),
-            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegate: self) else {
+            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegateObject: delegateObject()) else {
             return nil
         }
         return molecule
@@ -26,7 +26,7 @@ public class MoleculeStackCenteredTemplate: ThreeLayerViewController {
     
     override public func viewForBottom() -> UIView? {
         guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"),
-            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegate: self) else {
+            let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegateObject: delegateObject()) else {
             return nil
         }
         return molecule
diff --git a/MVMCoreUI/Templates/MoleculeStackTemplate.swift b/MVMCoreUI/Templates/MoleculeStackTemplate.swift
index 2910782d..dfcef277 100644
--- a/MVMCoreUI/Templates/MoleculeStackTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeStackTemplate.swift
@@ -16,7 +16,7 @@ public class MoleculeStackTemplate: ThreeLayerViewController {
     }
     
     public override func viewForTop() -> UIView? {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegate: self) else {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegateObject: delegateObject()) else {
             return nil
         }
         return molecule
@@ -26,11 +26,11 @@ public class MoleculeStackTemplate: ThreeLayerViewController {
         guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack") else {
             return nil
         }
-        return MoleculeStackView(withJSON: moleculeJSON, delegate: self, additionalData: nil)
+        return MoleculeStackView(withJSON: moleculeJSON, delegateObject: delegateObject(), additionalData: nil)
     }
     
     override public func viewForBottom() -> UIView? {
-        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegate: self) else {
+        guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeForJSON(moleculeJSON, delegateObject: delegateObject()) else {
             return nil
         }
         return molecule
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.h b/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.h
index 9391356c..46b392b7 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.h
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.h
@@ -10,7 +10,6 @@
 #import <MVMCore/MVMCoreTopAlertAnimationDelegateProtocol.h>
 #import <MVMCoreUI/MFView.h>
 
-@class MVMCoreTopAlertObject;
 @class MFCustomButton;
 
 @interface MVMCoreUITopAlertBaseView : MFView
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.m
index 4b19c49c..fe8d940b 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.m
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.m
@@ -19,6 +19,8 @@
 #import "MVMCoreUICommonViewsUtility.h"
 #import "MFStyler.h"
 #import "MVMCoreUISession.h"
+#import <MVMCoreUI/MVMCoreUI-Swift.h>
+
 @import MVMCore.MVMCoreTopAlertDelegateProtocol;
 
 @implementation MVMCoreUITopAlertBaseView
@@ -35,7 +37,7 @@
         }
         
         if (performAction) {
-            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegate:[MVMCoreUISession sharedGlobal].topAlertView];
+            [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionMap additionalData:additionalData delegateObject:[MVMCoreUIDelegateObject createWithDelegateForAll:[MVMCoreUISession sharedGlobal].topAlertView]];
         }
     } forControlEvents:UIControlEventTouchUpInside];
 }
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.h b/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.h
index 6ebd1026..50dd9b26 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.h
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.h
@@ -11,6 +11,7 @@
 #import <MVMCore/MVMCoreTopAlertAnimationDelegateProtocol.h>
 
 @class PrimaryButton;
+@class MVMCoreTopAlertObject;
 
 @interface MVMCoreUITopAlertMainView : MVMCoreUITopAlertBaseView