From 44bd74c6836f8f086cebd173770485e89ee01f2e Mon Sep 17 00:00:00 2001
From: "Robinson, Blake" <Blake.Robinson@VerizonWireless.com>
Date: Wed, 18 Mar 2020 11:27:37 -0400
Subject: [PATCH 01/37] Makes drawBottomCurvedShadowsOnRect more flexible by
 allowing the rect to be passed in with a non (0,0) origin

---
 MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
index 4a21b1a5..5c796417 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
@@ -260,15 +260,15 @@ static const CGFloat VertialShadowOffset = 6;
     UIBezierPath *shadowPath = [UIBezierPath bezierPath];
     
     //get the variables for frame
-    CGFloat x = 0;
-    CGFloat y = 0;
+    CGFloat x = rect.origin.x;
+    CGFloat y = rect.origin.y;
     CGFloat width = CGRectGetWidth(rect);
     CGFloat height = CGRectGetHeight(rect);
     
     [shadowPath moveToPoint:CGPointMake(x + HorizontalShadowInset, y)];
-    [shadowPath addLineToPoint:CGPointMake(width - HorizontalShadowInset, y)];
-    [shadowPath addLineToPoint:CGPointMake(width - HorizontalShadowInset, height-VertialShadowOffset/2)];
-    [shadowPath addQuadCurveToPoint:CGPointMake(x + HorizontalShadowInset, height - VertialShadowOffset/2) controlPoint:CGPointMake(width/2.f, height - VertialShadowOffset * 1.5)];
+    [shadowPath addLineToPoint:CGPointMake(x + width - HorizontalShadowInset, y)];
+    [shadowPath addLineToPoint:CGPointMake(x + width - HorizontalShadowInset, height-VertialShadowOffset/2)];
+    [shadowPath addQuadCurveToPoint:CGPointMake(x + HorizontalShadowInset, height - VertialShadowOffset/2) controlPoint:CGPointMake((x + width)/2.f, height - VertialShadowOffset * 1.5)];
     [shadowPath addLineToPoint:CGPointMake(x + HorizontalShadowInset, y)];
     [shadowPath closePath];
     

From cb6f2059948c96409d2dac881264fafec05ba4fe Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Fri, 20 Mar 2020 19:33:53 -0400
Subject: [PATCH 02/37] radio selection fix

---
 MVMCoreUI/Atoms/Views/RadioButton.swift          |  4 +---
 .../Molecules/RadioButtonSelectionHelper.swift   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/MVMCoreUI/Atoms/Views/RadioButton.swift b/MVMCoreUI/Atoms/Views/RadioButton.swift
index 7dd5976a..4158cb3f 100644
--- a/MVMCoreUI/Atoms/Views/RadioButton.swift
+++ b/MVMCoreUI/Atoms/Views/RadioButton.swift
@@ -128,9 +128,7 @@ import UIKit
         
         self.delegateObject = delegateObject
         isSelected = model.state
-        let radioButtonModel = RadioButtonSelectionHelper.setupForRadioButtonGroup(model,
-                                                                                   formValidator: delegateObject?.formHolderDelegate?.formValidator)
-        FormValidator.setupValidation(molecule: radioButtonModel, delegate: delegateObject?.formHolderDelegate)
+        RadioButtonSelectionHelper.setupForRadioButtonGroup(model, self, delegateObject: delegateObject)
     }
 
     public override func reset() {
diff --git a/MVMCoreUI/Molecules/RadioButtonSelectionHelper.swift b/MVMCoreUI/Molecules/RadioButtonSelectionHelper.swift
index 263a85a4..601588db 100644
--- a/MVMCoreUI/Molecules/RadioButtonSelectionHelper.swift
+++ b/MVMCoreUI/Molecules/RadioButtonSelectionHelper.swift
@@ -14,7 +14,7 @@ import UIKit
 
     public var fieldKey: String?
     public var groupName: String? = FormValidator.defaultGroupName
-    private var selectedRadioButton: RadioButton?
+    var selectedRadioButton: RadioButton?
     private var fieldGroupName: String?
     public var baseValue: AnyHashable?
 
@@ -22,16 +22,20 @@ import UIKit
         self.fieldKey = fieldKey
     }
     
-    public static func setupForRadioButtonGroup(_ radioButtonModel: RadioButtonModel, formValidator: FormValidator?) -> RadioButtonSelectionHelper {
+    public static func setupForRadioButtonGroup(_ radioButtonModel: RadioButtonModel, _ radioButton: RadioButton, delegateObject: MVMCoreUIDelegateObject?) {
         guard let groupName = radioButtonModel.fieldKey,
-                let formValidator = formValidator else {
-                    return RadioButtonSelectionHelper(radioButtonModel.fieldKey)
+            let formValidator = delegateObject?.formHolderDelegate?.formValidator else {
+            return
         }
         
-        let radioButtonSelectionHelper = formValidator.radioButtonsModelByGroup[groupName] ?? RadioButtonSelectionHelper(radioButtonModel.fieldKey)
+        let radioButtonSelectionHelper = formValidator.radioButtonsModelByGroup[groupName] ?? RadioButtonSelectionHelper(radioButtonModel.fieldKey)        
         radioButtonSelectionHelper.fieldGroupName = radioButtonModel.fieldKey
         formValidator.radioButtonsModelByGroup[groupName] = radioButtonSelectionHelper
-        return radioButtonSelectionHelper
+
+        if radioButtonModel.state {
+            radioButtonSelectionHelper.selectedRadioButton = radioButton
+        }
+        FormValidator.setupValidation(molecule: radioButtonSelectionHelper, delegate: delegateObject?.formHolderDelegate)
     }
     
     public func selected(_ radioButton: RadioButton) {

From cc051713320bbf07d1396d669dfd09cde9f6525e Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 09:25:47 -0400
Subject: [PATCH 03/37] for now

---
 MVMCoreUI/Atoms/TextFields/DigitEntryField.swift       | 10 ++--------
 MVMCoreUI/Atoms/TextFields/EntryField.swift            |  2 +-
 MVMCoreUI/Atoms/TextFields/TextEntryField.swift        | 10 +++++++---
 .../MVMCoreUICommonViewsUtility+Extension.swift        |  3 +++
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index b249d89f..3d0b69a5 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -207,7 +207,7 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
-        MVMCoreUICommonViewsUtility.addDismissToolbar(digitBox.digitField, delegate: self)
+        digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: self)
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox
@@ -329,18 +329,12 @@ import UIKit
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        
-        
+    
         guard let model = model as? DigitEntryFieldModel else { return }
         
         numberOfDigits = model.digits
-        
         setAsSecureTextEntry(model.secureEntry)
         
-        for digitBox in digitBoxes {
-            digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: delegateObject?.observingTextFieldDelegate ?? self)
-        }
-        
         super.set(with: model, delegateObject, additionalData)
     }
 }
diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift
index 43a15a3b..cafa91be 100644
--- a/MVMCoreUI/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift
@@ -117,7 +117,7 @@ import UIKit
             feedbackLabel.text = newFeedback
             feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true
             entryFieldContainer.refreshUI()
-            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+//            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
         }
     }
     
diff --git a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
index 33f75604..c97412a8 100644
--- a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
@@ -49,6 +49,10 @@ import UIKit
     
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
+    
+    public var textEntryFieldModel: TextEntryFieldModel? {
+        return model as? TextEntryFieldModel
+    }
 
     //--------------------------------------------------
     // MARK: - Computed Properties
@@ -87,7 +91,7 @@ import UIKit
         get { return textField.text }
         set {
             textField.text = newValue
-            (model as? TextEntryFieldModel)?.text = newValue
+            textEntryFieldModel?.text = newValue
         }
     }
     
@@ -167,7 +171,8 @@ import UIKit
             textField.heightAnchor.constraint(equalToConstant: 24),
             textField.topAnchor.constraint(equalTo: container.topAnchor, constant: 12),
             textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
-            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)])
+            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)
+        ])
         
         textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: 16)
         textFieldTrailingConstraint?.isActive = true
@@ -366,7 +371,6 @@ extension TextEntryField {
             defaultValidationBlock()
         }
         
-        
         uiTextFieldDelegate = delegateObject.uiTextFieldDelegate
         observingTextFieldDelegate = delegateObject.observingTextFieldDelegate
         MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: uiTextFieldDelegate)
diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
index 70c84d40..3ee452b0 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
@@ -9,12 +9,15 @@
 import Foundation
 
 public extension MVMCoreUICommonViewsUtility {
+    
     static func getToolbarWithDoneButton(delegate: ObservingTextFieldDelegate) -> UIToolbar {
+        
         let toolbar = self.makeEmptyToolbar()
         let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
         let button = UIBarButtonItem(barButtonSystemItem: .done, target: delegate, action: #selector(ObservingTextFieldDelegate.dismissFieldInput(sender:)))
         button.tintColor = .black
         toolbar.setItems([space, button], animated: false)
+        
         return toolbar
     }
 }

From f0870bda5d93c926afa5b242c954e18480ab2a6e Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 10:09:15 -0400
Subject: [PATCH 04/37] wip

---
 MVMCoreUI/Atoms/TextFields/EntryField.swift        |  3 +--
 .../Containers/Views/EntryFieldContainer.swift     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift
index cafa91be..551d188d 100644
--- a/MVMCoreUI/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift
@@ -116,8 +116,7 @@ import UIKit
         set (newFeedback) {
             feedbackLabel.text = newFeedback
             feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true
-            entryFieldContainer.refreshUI()
-//            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+            entryFieldContainer.refreshUI(moleculeLayoutUpdated: true)
         }
     }
     
diff --git a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
index 773721f7..3755a411 100644
--- a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
@@ -260,14 +260,22 @@ import UIKit
         refreshUI(bottomBarSize: 1)
     }
     
-    open func refreshUI(bottomBarSize: CGFloat? = nil) {
+    open func refreshUI(bottomBarSize: CGFloat? = nil, moleculeLayoutUpdated: Bool = false) {
         
         if !disableAllBorders {
             let size: CGFloat = bottomBarSize ?? (showError ? 4 : 1)
+            var heightChanged = false
+            
+            if let bottomHeight = bottomBar?.bounds.height {
+                heightChanged = size != bottomHeight
+            }
             bottomBar?.frame = CGRect(x: 0, y: bounds.height - size, width: bounds.width, height: size)
             
-            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
-            setNeedsDisplay()
+            if moleculeLayoutUpdated || heightChanged {
+                delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+                setNeedsDisplay()
+            }
+            
             layoutIfNeeded()
         }
     }

From a1d43e338cb1376514eff850b9250292e201d207 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 11:01:08 -0400
Subject: [PATCH 05/37] Flip value because it kept going true when nothing
 changed

---
 MVMCoreUI/BaseControllers/ViewController.swift    | 15 ++++++++-------
 .../Containers/Views/EntryFieldContainer.swift    |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 39226786..4bc6c159 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -27,7 +27,7 @@ import UIKit
     
     public var formValidator: FormValidator?
     
-    public var needsUpdateUI = true
+    public var needsUpdateUI = false
     private var observingForResponses = false
     private var initialLoadFinished = false
     private var previousScreenSize = CGSize.zero
@@ -36,7 +36,7 @@ import UIKit
 
     /// Checks if the screen width has changed
     open func screenSizeChanged() -> Bool {
-        return MVMCoreGetterUtility.cgfequalwiththreshold(previousScreenSize.width, view.bounds.size.width, 0.1)
+        return !MVMCoreGetterUtility.cgfequalwiththreshold(previousScreenSize.width, view.bounds.size.width, 0.1)
     }
     
     // MARK: - Response handling
@@ -276,17 +276,18 @@ import UIKit
     
     open override func viewDidLayoutSubviews() {
         // Add to fix a constraint bug where the width is zero and things get messed up.
-        guard isViewLoaded,
-            view.bounds.width > 1 else {
-                super.viewDidLayoutSubviews()
-                return
+        guard isViewLoaded, view.bounds.width > 1 else {
+            super.viewDidLayoutSubviews()
+            return
         }
+        
         if needsUpdateUI || screenSizeChanged() {
             updateViews()
             needsUpdateUI = false
         }
+        
         previousScreenSize = view.bounds.size;
-
+        
         super.viewDidLayoutSubviews()
     }
     
diff --git a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
index 3755a411..a88e7f67 100644
--- a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
@@ -273,9 +273,9 @@ import UIKit
             
             if moleculeLayoutUpdated || heightChanged {
                 delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
-                setNeedsDisplay()
             }
             
+            setNeedsDisplay()
             layoutIfNeeded()
         }
     }

From dbff191a8b1ecb262e2065e52f1daa292aa5935a Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 11:04:28 -0400
Subject: [PATCH 06/37] name change

---
 MVMCoreUI/Atoms/TextFields/EntryField.swift          | 2 +-
 MVMCoreUI/Containers/Views/EntryFieldContainer.swift | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift
index 551d188d..48214210 100644
--- a/MVMCoreUI/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift
@@ -116,7 +116,7 @@ import UIKit
         set (newFeedback) {
             feedbackLabel.text = newFeedback
             feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true
-            entryFieldContainer.refreshUI(moleculeLayoutUpdated: true)
+            entryFieldContainer.refreshUI(updateMoleculeLayout: true)
         }
     }
     
diff --git a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
index a88e7f67..494eaf5c 100644
--- a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
@@ -260,7 +260,7 @@ import UIKit
         refreshUI(bottomBarSize: 1)
     }
     
-    open func refreshUI(bottomBarSize: CGFloat? = nil, moleculeLayoutUpdated: Bool = false) {
+    open func refreshUI(bottomBarSize: CGFloat? = nil, updateMoleculeLayout: Bool = false) {
         
         if !disableAllBorders {
             let size: CGFloat = bottomBarSize ?? (showError ? 4 : 1)
@@ -271,7 +271,7 @@ import UIKit
             }
             bottomBar?.frame = CGRect(x: 0, y: bounds.height - size, width: bounds.width, height: size)
             
-            if moleculeLayoutUpdated || heightChanged {
+            if updateMoleculeLayout || heightChanged {
                 delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
             }
             

From 93bddcd94562ad6da0299f1f78165fe07d13c5d4 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 11:06:25 -0400
Subject: [PATCH 07/37] reset val

---
 MVMCoreUI/BaseControllers/ViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 4bc6c159..2603e9e7 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -27,7 +27,7 @@ import UIKit
     
     public var formValidator: FormValidator?
     
-    public var needsUpdateUI = false
+    public var needsUpdateUI = true
     private var observingForResponses = false
     private var initialLoadFinished = false
     private var previousScreenSize = CGSize.zero

From 806f28b40bd39e87f587eb5687cc6e9e8cca4d28 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 14:15:55 -0400
Subject: [PATCH 08/37] priorities, priorities, priorities...

---
 MVMCoreUI/Atoms/TextFields/DigitEntryField.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index 3d0b69a5..9ecbbe6e 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -207,7 +207,6 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
-        digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: self)
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox
@@ -335,6 +334,10 @@ import UIKit
         numberOfDigits = model.digits
         setAsSecureTextEntry(model.secureEntry)
         
+        for digitBox in digitBoxes {
+            digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: delegateObject?.observingTextFieldDelegate ?? self)
+        }
+        
         super.set(with: model, delegateObject, additionalData)
     }
 }

From 2ae19b76d1c10f7f60b4deba4897d24cf1192290 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 14:32:18 -0400
Subject: [PATCH 09/37] re

---
 MVMCoreUI/Atoms/TextFields/DigitEntryField.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index 9ecbbe6e..004651d4 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -207,6 +207,7 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
+        digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: self)
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox

From f3ed68beeda3098303dc8af1f04370a66fd93ec3 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 24 Mar 2020 15:21:21 -0400
Subject: [PATCH 10/37] accessibilty start

---
 MVMCoreUI/Atoms/Views/Checkbox.swift          |  5 +---
 MVMCoreUI/BaseClasses/Control.swift           |  4 ++-
 MVMCoreUI/BaseClasses/TableViewCell.swift     |  4 +--
 ...tLeftVariableCheckboxAllTextAndLinks.swift | 25 +++++++++++++++----
 ...tVariableRadioButtonAndPaymentMethod.swift |  5 +++-
 .../EyebrowHeadlineBodyLink.swift             | 23 +++++++++++++----
 .../HeadlineBody.swift                        |  9 +++++--
 MVMCoreUI/Organisms/Stack.swift               |  3 +++
 8 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/MVMCoreUI/Atoms/Views/Checkbox.swift b/MVMCoreUI/Atoms/Views/Checkbox.swift
index f288c4cd..cc6895db 100644
--- a/MVMCoreUI/Atoms/Views/Checkbox.swift
+++ b/MVMCoreUI/Atoms/Views/Checkbox.swift
@@ -158,6 +158,7 @@ import MVMCore
         super.init(frame: frame)
         
         accessibilityTraits = .button
+        isAccessibilityElement = true
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "checkbox_action_hint")
         updateAccessibilityLabel()
     }
@@ -198,8 +199,6 @@ import MVMCore
     open override func setupView() {
         super.setupView()
         
-        guard constraints.isEmpty else { return }
-        
         isUserInteractionEnabled = true
         translatesAutoresizingMaskIntoConstraints = false
         backgroundColor = .clear
@@ -394,8 +393,6 @@ import MVMCore
             widthConstraint?.constant = dimension
             heightConstraint?.constant = dimension
         }
-        
-        //layoutIfNeeded()
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
diff --git a/MVMCoreUI/BaseClasses/Control.swift b/MVMCoreUI/BaseClasses/Control.swift
index 265e56b3..9d6ce521 100644
--- a/MVMCoreUI/BaseClasses/Control.swift
+++ b/MVMCoreUI/BaseClasses/Control.swift
@@ -12,6 +12,7 @@ import UIKit
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    
     open var json: [AnyHashable: Any]?
     open var model: MoleculeModelProtocol?
 
@@ -78,7 +79,7 @@ extension Control: AppleGuidelinesProtocol {
 // MARK: - MVMCoreViewProtocol
 extension Control: MVMCoreViewProtocol {
     
-    open func updateView(_ size: CGFloat) {}
+    open func updateView(_ size: CGFloat) { }
     
     /// Will be called only once.
     open func setupView() {
@@ -89,6 +90,7 @@ extension Control: MVMCoreViewProtocol {
 
 // MARK: - MVMCoreUIMoleculeViewProtocol
 extension Control: MVMCoreUIMoleculeViewProtocol {
+    
     open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         self.json = json
         
diff --git a/MVMCoreUI/BaseClasses/TableViewCell.swift b/MVMCoreUI/BaseClasses/TableViewCell.swift
index ebf25a3c..510779b2 100644
--- a/MVMCoreUI/BaseClasses/TableViewCell.swift
+++ b/MVMCoreUI/BaseClasses/TableViewCell.swift
@@ -246,7 +246,7 @@ import UIKit
     
     // MARK: - MoleculeListCellProtocol
     /// For when the separator between cells shows using json and frequency. Default is type: standard, frequency: allExceptTop.
-    public func setLines(with model: LineModel?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?, indexPath: IndexPath) {
+    public func setLines(with model: LineModel?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?, indexPath: IndexPath) {
         addSeparatorsIfNeeded()
         if let model = model {
             topSeparatorView?.set(with: model, delegateObject, additionalData)
@@ -258,7 +258,7 @@ import UIKit
         setSeparatorFrequency(model?.frequency ?? .allExceptTop, indexPath: indexPath)
     }
     
-    public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
+    public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         //TODO: Use object when handleAction is rewrote to handle action model
         if let actionMap = self.listItemModel?.action?.toJSON() {
             MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
diff --git a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
index 8d7fb539..448d76e1 100644
--- a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
+++ b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
@@ -9,11 +9,18 @@
 import Foundation
 
 @objcMembers open class ListLeftVariableCheckboxAllTextAndLinks: TableViewCell {
-    public let checkbox = Checkbox(frame: .zero)
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
+    public let checkbox = Checkbox()
     public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(frame: .zero)
     public var stack: Stack<StackModel>
     
+    //--------------------------------------------------
     // MARK: - Initializers
+    //--------------------------------------------------
+    
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         stack = Stack<StackModel>.createStack(with: [(view: checkbox, model: StackItemModel(horizontalAlignment: .fill)),
                                                      (view: eyebrowHeadlineBodyLink, model: StackItemModel(horizontalAlignment: .leading))],
@@ -25,17 +32,25 @@ import Foundation
         fatalError("init(coder:) has not been implemented")
     }
    
-    // MARK: - View Lifecycle
+    //--------------------------------------------------
+    // MARK: - Life Cycle
+    //--------------------------------------------------
+    
     override open func setupView() {
         super.setupView()
         addMolecule(stack)
         stack.restack()
     }
     
-    // MARK:- MVMCoreUIMoleculeViewProtocol
-    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+    //--------------------------------------------------
+    // MARK: - MVMCoreUIMoleculeViewProtocol
+    //--------------------------------------------------
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
-        guard let model = model as? ListLeftVariableCheckboxAllTextAndLinksModel else { return}
+        
+        guard let model = model as? ListLeftVariableCheckboxAllTextAndLinksModel else { return }
+        
         checkbox.set(with: model.checkbox, delegateObject, additionalData)
         eyebrowHeadlineBodyLink.set(with: model.eyebrowHeadlineBodyLink, delegateObject, additionalData)
     }
diff --git a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
index 12ae94fe..ab5a24c0 100644
--- a/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
+++ b/MVMCoreUI/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
@@ -9,10 +9,10 @@
 import UIKit
 
 @objcMembers open class ListLeftVariableRadioButtonAndPaymentMethod: TableViewCell {
-    
     //-----------------------------------------------------
     // MARK: - Outlets
     //-----------------------------------------------------
+    
     let radioButton = RadioButton(frame: .zero)
     let leftImage = MFLoadImageView(pinnedEdges: .all)
     let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink()
@@ -21,6 +21,7 @@ import UIKit
     //-----------------------------------------------------
     // MARK: - Initializers
     //-----------------------------------------------------
+    
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         stack = Stack<StackModel>.createStack(with: [(view: radioButton, model: StackItemModel(horizontalAlignment: .fill)),
                                                      (view: leftImage, model: StackItemModel(horizontalAlignment: .fill)),
@@ -36,6 +37,7 @@ import UIKit
     //-----------------------------------------------------
     // MARK: - View Lifecycle
     //-----------------------------------------------------
+    
     override open func setupView() {
         super.setupView()
         addMolecule(stack)
@@ -53,6 +55,7 @@ import UIKit
     //----------------------------------------------------
     // MARK: - Molecule
     //----------------------------------------------------
+    
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? ListLeftVariableRadioButtonAndPaymentMethodModel else { return}
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index 49b08b44..410112ed 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -19,7 +19,7 @@ import UIKit
     public let body = Label.commonLabelB2(true)
     public let link = Link()
     
-    var casteModel: EyebrowHeadlineBodyLinkModel? {
+    var castModel: EyebrowHeadlineBodyLinkModel? {
         get { return model as? EyebrowHeadlineBodyLinkModel }
     }
     
@@ -52,6 +52,19 @@ import UIKit
         body.styleB2(true)
     }
     
+    public func eyebrow(isHidden: Bool) {
+        
+        stack.stackModel?.molecules[0].gone = isHidden
+        
+        if isHidden {
+            accessibilityElements = [headline, body, link]
+        } else {
+            accessibilityElements = [eyebrow, headline, body, link]
+        }
+        
+        stack.restack()
+    }
+    
     //--------------------------------------------------
     // MARK: - ModelMoleculeViewProtocol
     //--------------------------------------------------
@@ -59,10 +72,10 @@ import UIKit
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         
-        eyebrow.setOptional(with: casteModel?.eyebrow, delegateObject, additionalData)
-        headline.setOptional(with: casteModel?.headline, delegateObject, additionalData)
-        body.setOptional(with: casteModel?.body, delegateObject, additionalData)
-        link.setOptional(with: casteModel?.link, delegateObject, additionalData)
+        eyebrow.setOptional(with: castModel?.eyebrow, delegateObject, additionalData)
+        headline.setOptional(with: castModel?.headline, delegateObject, additionalData)
+        body.setOptional(with: castModel?.body, delegateObject, additionalData)
+        link.setOptional(with: castModel?.link, delegateObject, additionalData)
         
         // Hide labels if neeeded.
         stack.stackModel?.molecules[0].gone = !eyebrow.hasText
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBody.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBody.swift
index a120807d..9cdd9e67 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBody.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBody.swift
@@ -9,9 +9,12 @@
 import UIKit
 
 open class HeadlineBody: View {
+    
     let headlineLabel = Label.commonLabelH2(true)
     let messageLabel = Label.commonLabelB2(true)
+    
     var spaceBetweenLabelsConstant = PaddingTwo
+    
     var spaceBetweenLabels: NSLayoutConstraint?
     var leftConstraintTitle: NSLayoutConstraint?
     var rightConstraintTitle: NSLayoutConstraint?
@@ -71,8 +74,6 @@ open class HeadlineBody: View {
     
     open override func setupView() {
         super.setupView()
-        
-        guard subviews.isEmpty else { return }
     
         backgroundColor = .clear
         clipsToBounds = true
@@ -81,6 +82,10 @@ open class HeadlineBody: View {
         addSubview(view)
         NSLayoutConstraint.constraintPinSubview(toSuperview: view)
         
+        view.isAccessibilityElement = false
+        view.shouldGroupAccessibilityChildren = true
+        view.accessibilityElements = [headlineLabel, messageLabel]
+        
         view.addSubview(headlineLabel)
         view.addSubview(messageLabel)
             
diff --git a/MVMCoreUI/Organisms/Stack.swift b/MVMCoreUI/Organisms/Stack.swift
index 8e6df863..2f3b0f78 100644
--- a/MVMCoreUI/Organisms/Stack.swift
+++ b/MVMCoreUI/Organisms/Stack.swift
@@ -46,6 +46,9 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
         for (index, view) in stackItems.enumerated() {
             addView(view, stackModel.molecules[index], totalSpacing: totalSpace, lastItem: lastItemIndex == index)
         }
+    
+        isAccessibilityElement = false
+        accessibilityElements = stackItems
     }
     
     /// Removes all stack items views from the view.

From f378e66731556bf317a020d2ce722e4a437808d2 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 24 Mar 2020 19:53:03 -0400
Subject: [PATCH 11/37] update

---
 MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift | 13 +++++++++++++
 MVMCoreUI/Atomic/MoleculeObjectMapping.swift        |  6 +++---
 .../VerticalCombinationViews/HeadlineBody.swift     |  2 +-
 MVMCoreUI/Atomic/Organisms/Carousel.swift           |  4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift
index 6c9242f9..74e6efa4 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift
@@ -12,6 +12,19 @@ import Foundation
 @objcMembers public class LabelModel: MoleculeModelProtocol {
     
     public enum FontStyle: String, Codable {
+        case Title2XLarge
+        case TitleXLarge
+        case BoldTitleLarge
+        case RegularTitleLarge
+        case BoldTitleMedium
+        case RegularTitleMedium
+        case BoldBodyLarge
+        case RegularBodyLarge
+        case BoldBodySmall
+        case RegularBodySmall
+        case BoldMicro
+        case RegularMicro
+        // Legacy
         case H1
         case H2
         case H3
diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
index e6806e0c..bfa6db01 100644
--- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
@@ -18,18 +18,18 @@ import Foundation
     }
     
     /// Registers the model with the model registry and the view with the mapper.
-    func register<M: ModelProtocol, V: MoleculeViewProtocol>(viewClass: V.Type, viewModelClass: M.Type) {
+    public func register<M: ModelProtocol, V: MoleculeViewProtocol>(viewClass: V.Type, viewModelClass: M.Type) {
         try? ModelRegistry.register(viewModelClass)
         moleculeMapping.updateValue(viewClass, forKey: viewModelClass.identifier)
     }
 
     /// Returns the type of molecule view for the given model
-    func getMoleculeClass(_ model: MoleculeModelProtocol) -> MoleculeViewProtocol.Type? {
+    public func getMoleculeClass(_ model: MoleculeModelProtocol) -> MoleculeViewProtocol.Type? {
         return moleculeMapping[model.moleculeName]
     }
 
     /// Creates a molecule with the given model.
-    func createMolecule(_ model: MoleculeModelProtocol, delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> MoleculeViewProtocol? {
+    public func createMolecule(_ model: MoleculeModelProtocol, delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> MoleculeViewProtocol? {
         guard let type = moleculeMapping[model.moleculeName] else { return nil }
         return type.init(model: model, delegateObject, additionalData)
     }
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
index 810c26fb..c5a7f8c6 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
@@ -11,7 +11,7 @@ import UIKit
 open class HeadlineBody: View {
     let headlineLabel = Label.commonLabelH2(true)
     let messageLabel = Label.commonLabelB2(true)
-    var spaceBetweenLabelsConstant = PaddingTwo
+    var spaceBetweenLabelsConstant = PaddingOne
     var spaceBetweenLabels: NSLayoutConstraint?
     var leftConstraintTitle: NSLayoutConstraint?
     var rightConstraintTitle: NSLayoutConstraint?
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel.swift
index 8409cd24..a7117e33 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel.swift
@@ -28,11 +28,11 @@ open class Carousel: View {
     /// The number of pages that there are. Used for the page control and for calculations. Should not include the looping dummy cells. Be sure to set this if subclassing and not using the molecules.
     open var numberOfPages = 0
     
-    /// The json for the molecules.
+    /// The models for the molecules.
     var molecules: [MoleculeModelProtocol]?
 
     /// The horizontal alignment of the cell in the collection view. Only noticeable if the itemWidthPercent is less than 100%.
-    var itemAlignment = UICollectionView.ScrollPosition.left
+    public var itemAlignment = UICollectionView.ScrollPosition.left
     
     /// From 0-1. The item width as a percent of the carousel width.
     public var itemWidthPercent: Float = 1

From b0ae313d420154f9cf8ae4bd1a966681aefd1f65 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 24 Mar 2020 22:39:44 -0400
Subject: [PATCH 12/37] undo legacy changes

---
 MVMCoreUI/Legacy/Views/ButtonView.swift | 10 ++++++
 MVMCoreUI/Legacy/Views/PrimaryButton.h  |  4 +++
 MVMCoreUI/Legacy/Views/PrimaryButton.m  | 41 +++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/MVMCoreUI/Legacy/Views/ButtonView.swift b/MVMCoreUI/Legacy/Views/ButtonView.swift
index 4c489ae5..3bdb909b 100644
--- a/MVMCoreUI/Legacy/Views/ButtonView.swift
+++ b/MVMCoreUI/Legacy/Views/ButtonView.swift
@@ -30,6 +30,11 @@ import UIKit
         primaryButton?.isEnabled = enabled
     }
     
+    public init(withJSON json: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) {
+        super.init(frame: .zero)
+        setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+    }
+    
     // MARK: - MVMCoreViewProtocol
     open override func updateView(_ size: CGFloat) {
         super.updateView(size)
@@ -44,6 +49,11 @@ import UIKit
         alignCenterHorizontal()
     }
     
+    // MARK: - MVMCoreUIMoleculeViewProtocol
+    open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
+        primaryButton?.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+    }
+    
     // MARK: - Constraining
     open override func copyBackgroundColor() -> Bool {
         return true
diff --git a/MVMCoreUI/Legacy/Views/PrimaryButton.h b/MVMCoreUI/Legacy/Views/PrimaryButton.h
index 511519be..a93e6fc5 100644
--- a/MVMCoreUI/Legacy/Views/PrimaryButton.h
+++ b/MVMCoreUI/Legacy/Views/PrimaryButton.h
@@ -10,6 +10,7 @@
 #import <MVMCoreUI/MFCustomButton.h>
 #import <MVMCoreUI/MFTextField.h>
 #import <MVMCoreUI/MFView.h>
+@class MVMCoreUIDelegateObject;
 
 typedef enum : NSUInteger {
     PrimaryButtonTypeRed,
@@ -117,6 +118,9 @@ static CGFloat const PrimaryButtonSmallHeight = 30.0;
 - (void)resetButtonType:(PrimaryButtonType)type small:(BOOL)isSmall bordered:(BOOL)bordered;
 - (void)resetButtonType:(PrimaryButtonType)type tiny:(BOOL)isTiny bordered:(BOOL)bordered;
 
+// Convenience setter for common keys
+- (void)setWithJSON:(nullable NSDictionary *)json delegateObject:(nullable MVMCoreUIDelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
+
 #pragma mark - Handling Validations
 
 // Sets the enabled property depending on the validity checks
diff --git a/MVMCoreUI/Legacy/Views/PrimaryButton.m b/MVMCoreUI/Legacy/Views/PrimaryButton.m
index 7a235fce..ded6bac2 100644
--- a/MVMCoreUI/Legacy/Views/PrimaryButton.m
+++ b/MVMCoreUI/Legacy/Views/PrimaryButton.m
@@ -655,6 +655,47 @@
     return button;
 }
 
+- (void)setWithJSON:(NSDictionary *)json delegateObject:(MVMCoreUIDelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
+    self.primaryButtonType = PrimaryButtonTypeCustom;
+    NSString *style = [json string:@"style"];
+    if ([style isEqualToString:@"primary"]) {
+        [self setAsStandardCustom];
+    } else if ([style isEqualToString:@"secondary"]) {
+        [self setAsSecondaryCustom];
+    }
+    
+    NSString *color = [json string:@"fillColor"];
+    if (color) {
+        self.fillColor = [UIColor mfGetColorForHex:color];
+    }
+    if ((color = [json string:KeyTextColor])) {
+        self.textColor = [UIColor mfGetColorForHex:color];
+    }
+    if ((color = [json string:@"borderColor"])) {
+        self.borderColor = [UIColor mfGetColorForHex:color];
+    }
+    _bordered = self.borderColor != nil;
+    if ((color = [json string:@"disabledFillColor"])) {
+        self.disabledFillColor = [UIColor mfGetColorForHex:color];
+    }
+    if ((color = [json string:@"disabledTextColor"])) {
+        self.disabledTextColor = [UIColor mfGetColorForHex:color];
+    }
+    if ((color = [json string:@"disabledBorderColor"])) {
+        self.disabledBorderColor = [UIColor mfGetColorForHex:color];
+    }
+    
+    NSString *size = [json string:@"size"];
+    if ([size isEqualToString:@"small"]) {
+        [self setAsSmallButton:YES];
+    } else if ([size isEqualToString:@"tiny"]) {
+        [self setAsTiny:YES];
+    } else {
+        [self setAsSmallButton:NO];
+    }
+    [self setWithActionMap:json delegateObject:delegateObject additionalData:additionalData];
+}
+
 #pragma mark - Constraining Protocol
 
 - (UIStackViewAlignment)horizontalAlignment {

From 14af105ad725997358de3e9ceada36c7e7370fcb Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 09:31:40 -0400
Subject: [PATCH 13/37] fix to margins

---
 MVMCoreUI/BaseClasses/TableViewCell.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/BaseClasses/TableViewCell.swift b/MVMCoreUI/BaseClasses/TableViewCell.swift
index 36aade11..060c2319 100644
--- a/MVMCoreUI/BaseClasses/TableViewCell.swift
+++ b/MVMCoreUI/BaseClasses/TableViewCell.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-@objcMembers open class TableViewCell: UITableViewCell, MoleculeViewProtocol, MoleculeListCellProtocol {
+@objcMembers open class TableViewCell: UITableViewCell, MoleculeViewProtocol, MoleculeListCellProtocol, MVMCoreViewProtocol {
 
     open var molecule: MoleculeViewProtocol?
     open var listItemModel: ListItemModelProtocol?

From 4d07578865cf420eb7bbba321d0069b0f5e5d11b Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 09:46:50 -0400
Subject: [PATCH 14/37] typo fix

---
 MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift
index 4534a506..0c9dec3b 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift
@@ -46,7 +46,7 @@ import UIKit
     }
     
     public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        guard let moleculeModel = (model as? MoleculeContainerModel)?.molecule,
+        guard let moleculeModel = (model as? MoleculeListItemModel)?.molecule,
             let classType = MoleculeObjectMapping.shared()?.getMoleculeClass(moleculeModel),
             let height = classType.estimatedHeight(with: moleculeModel, delegateObject)
             else { return 80 }

From 809e450c15181ea81066edef15731c6da9e4d09b Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 10:00:05 -0400
Subject: [PATCH 15/37] label fix

---
 MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
index ab0a0f20..40c34b08 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
@@ -130,6 +130,7 @@ public typealias ActionBlock = () -> ()
     
     required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.init(frame: .zero)
+        setupView()
         styleB2(true)
         set(with: model, delegateObject, additionalData)
     }

From e97226fd3f04846575dd16ba34aeca914a1007ce Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 10:27:31 -0400
Subject: [PATCH 16/37] toggle update

---
 MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift b/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift
index 334ba00f..9e9e9e4a 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift
@@ -63,14 +63,14 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol, EnableableMo
         action = try typeContainer.decodeModelIfPresent(codingKey: .action)
         alternateAction = try typeContainer.decodeModelIfPresent(codingKey: .alternateAction)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
-        if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
-            self.groupName = groupName
-        }
         onTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .onTintColor)
         offTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .offTintColor)
         onKnobTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .onKnobTintColor)
         offKnobTintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .offKnobTintColor)
+        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
+        if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
+            self.groupName = groupName
+        }
     }
     
     public func encode(to encoder: Encoder) throws {
@@ -80,11 +80,13 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol, EnableableMo
         try container.encodeModelIfPresent(alternateAction, forKey: .alternateAction)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(state, forKey: .state)
-        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
-        try container.encodeIfPresent(groupName, forKey: .groupName)
+        try container.encode(animated, forKey: .animated)
+        try container.encode(enabled, forKey: .enabled)
         try container.encodeIfPresent(onTintColor, forKey: .onTintColor)
         try container.encodeIfPresent(onKnobTintColor, forKey: .onKnobTintColor)
         try container.encodeIfPresent(onKnobTintColor, forKey: .onKnobTintColor)
         try container.encodeIfPresent(offKnobTintColor, forKey: .offKnobTintColor)
+        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
+        try container.encodeIfPresent(groupName, forKey: .groupName)
     }
 }

From 60ca1be4bed89eeaadae612b303139954d7abcd6 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 25 Mar 2020 11:17:43 -0400
Subject: [PATCH 17/37] for accessibility.

---
 MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift | 3 ++-
 MVMCoreUI/Templates/MoleculeListTemplate.swift        | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
index 33229092..75f1f0d8 100644
--- a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
@@ -24,6 +24,7 @@ import UIKit
             (molecule as? ModelMoleculeViewProtocol)?.set(with: castModel.molecule, delegateObject, additionalData)
         } else if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(castModel.molecule, delegateObject, false) {
             addMolecule(moleculeView)
+            accessibilityElements = [moleculeView]
         }
         super.set(with: model, delegateObject, additionalData)
     }
@@ -37,7 +38,7 @@ import UIKit
         return "\(self)<\(moleculeName)>"
     }
     
-    public class func requiredModules(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
+    public class func requiredModules(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
         guard let moleculeJSON = json?.optionalDictionaryForKey(KeyMolecule),
             let theClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: moleculeJSON)
             else { return nil }
diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index d68a1170..1db1593b 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -215,7 +215,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     func getMoleculeInfo(with listItem: (ListItemModelProtocol & MoleculeModelProtocol)?) -> (identifier: String, class: AnyClass, molecule: ListItemModelProtocol & MoleculeModelProtocol)? {
         
         guard let listItem = listItem,
-            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem) else { return nil }
+            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem)
+            else { return nil }
+        
         let moleculeName = (moleculeClass as? ModelMoleculeViewProtocol.Type)?.nameForReuse(with: listItem, delegateObject() as? MVMCoreUIDelegateObject) ?? listItem.moleculeName
         return (moleculeName, moleculeClass, listItem)
     }

From e563c0133af0c820865f714748f166d459622e55 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 11:58:16 -0400
Subject: [PATCH 18/37] fixes production bug temporary

---
 .../ToggleMolecules/LabelToggleModel.swift    | 22 +++++++++++++++++++
 MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m    |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
index 16f292ed..29e7a609 100644
--- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
@@ -19,4 +19,26 @@ public class LabelToggleModel: MoleculeModelProtocol {
         self.label = label
         self.toggle = toggle
     }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case backgroundColor
+        case label
+        case toggle
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey:.backgroundColor)
+        label = try typeContainer.decode(LabelModel.self, forKey:.label)
+        toggle = try typeContainer.decode(ToggleModel.self, forKey:.toggle)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
+        try container.encode(label, forKey: .label)
+        try container.encode(toggle, forKey: .toggle)
+    }
 }
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
index 5a94137a..930828f6 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
@@ -86,7 +86,7 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
 
 - (void)pinATopViewController:(UIViewController *)viewController {
     self.statusBarHeightConstraint.active = NO;
-    id topGuide = viewController.view.safeAreaLayoutGuide.topAnchor;
+    id topGuide = viewController.topLayoutGuide;
     self.statusBarBottomConstraint = [NSLayoutConstraint constraintWithItem:self.statusBarView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:topGuide attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
     self.statusBarBottomConstraint.active = YES;
 }

From 9589964777876bc435981636d509546775924cb8 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 13:21:04 -0400
Subject: [PATCH 19/37] remove orig

---
 .../PageModelProtocol.swift.orig              | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift.orig

diff --git a/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift.orig b/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift.orig
deleted file mode 100644
index 9cbe5af2..00000000
--- a/MVMCoreUI/Atomic/Protocols/ModelProtocols/PageModelProtocol.swift.orig
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  PageModelProtocol.swift
-//  MVMCoreUI
-//
-//  Created by Scott Pfeil on 1/9/20.
-//  Copyright © 2020 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-public protocol PageModelProtocol {
-    var pageType: String { get set }
-    var screenHeading: String? { get set }
-<<<<<<< HEAD
-    var navigationItem: NavigationItemModelProtocol? { get set }
-=======
-    var isAtomicTabs: Bool? { get set }
-    var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set }
->>>>>>> 18f86575e604bb7b53b6bdac4fc677951979031f
-}

From c7929c509b9e68d8b693eb706d7e409a1b8c5e89 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 13:25:23 -0400
Subject: [PATCH 20/37] review fixes

---
 .../Atomic/Protocols/TemplateProtocol.swift   |  1 -
 .../ModalMoleculeListTemplate.swift.orig      | 30 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig

diff --git a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
index 347458b0..56b1a86c 100644
--- a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
@@ -20,7 +20,6 @@ public extension TemplateProtocol where Self: ViewController {
         let data = try JSONSerialization.data(withJSONObject: pageJSON)
         let decoder = JSONDecoder()
         let templateModel = try decoder.decode(TemplateModel.self, from: data)
-        print(templateModel.toJSONString() ?? "")
         self.templateModel = templateModel
         self.pageModel = templateModel as? MVMControllerModelProtocol
     }
diff --git a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig
deleted file mode 100644
index af43d0af..00000000
--- a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  ModalMoleculeListTemplate.swift
-//  MVMCoreUI
-//
-//  Created by Ryan on 3/6/20.
-//  Copyright © 2020 Verizon Wireless. All rights reserved.
-//
-
-import UIKit
-
-open class ModalMoleculeListTemplate: MoleculeListTemplate {
-    
-<<<<<<< HEAD
-    override open func handleNewData() {
-        MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
-            if let _ = self {
-                MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
-            }
-=======
-    public var closeButton: MFCustomButton?
-        
-    override open func newDataBuildScreen() {
-        super.newDataBuildScreen()
-        closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
-            self?.dismiss()
->>>>>>> develop
-        }, verticalCentered: false)
-        super.handleNewData()
-    }
-}

From 987bfcae36cd585a1e6179ba8cfbfb32f8b6defa Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 13:32:27 -0400
Subject: [PATCH 21/37] remeove

---
 .../StackPageTemplateModel.swift.orig         | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift.orig

diff --git a/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift.orig b/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift.orig
deleted file mode 100644
index 504378cd..00000000
--- a/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  StackPageTemplate.swift
-//  MVMCoreUI
-//
-//  Created by Suresh, Kamlesh on 11/22/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-
-@objcMembers public class StackPageTemplateModel: TemplateModel {
-    public override class var identifier: String {
-        return "stack"
-    }
-
-    public var header: MoleculeModelProtocol?
-    public var moleculeStack: MoleculeStackModel
-    public var footer: MoleculeModelProtocol?
-    
-    public init(pageType: String, moleculeStack: MoleculeStackModel) {
-        self.moleculeStack = moleculeStack
-        super.init(pageType: pageType)
-    }
-
-    private enum CodingKeys: String, CodingKey {
-<<<<<<< HEAD
-=======
-        case pageType
-        case template
-        case screenHeading
->>>>>>> develop
-        case header
-        case footer
-        case stack
-    }
-
-    required public init(from decoder: Decoder) throws {
-        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        moleculeStack = try typeContainer.decode(MoleculeStackModel.self, forKey: .stack)
-        header = try typeContainer.decodeModelIfPresent(codingKey: .header)
-        footer = try typeContainer.decodeModelIfPresent(codingKey: .footer)
-        try super.init(from: decoder)
-    }
-
-    public override func encode(to encoder: Encoder) throws {
-        try super.encode(to: encoder)
-        var container = encoder.container(keyedBy: CodingKeys.self)
-<<<<<<< HEAD
-=======
-        try container.encode(pageType, forKey: .pageType)
-        try container.encode(template, forKey: .template)
->>>>>>> develop
-        try container.encode(moleculeStack, forKey: .stack)
-        try container.encodeModelIfPresent(header, forKey: .header)
-        try container.encodeModelIfPresent(footer, forKey: .footer)
-    }
-}

From 7e89e58cd1186c7ecb9d4c50bfe55c8e731cca9c Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 25 Mar 2020 14:47:15 -0400
Subject: [PATCH 22/37] more accessibility stuff.

---
 MVMCoreUI/Atoms/Views/Label/Label.swift       |  2 ++
 .../Items/MoleculeTableViewCell.swift         |  5 +++-
 .../ToggleMolecules/LabelToggleModel.swift    | 24 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atoms/Views/Label/Label.swift b/MVMCoreUI/Atoms/Views/Label/Label.swift
index c7e72204..a6a7cfe1 100644
--- a/MVMCoreUI/Atoms/Views/Label/Label.swift
+++ b/MVMCoreUI/Atoms/Views/Label/Label.swift
@@ -316,6 +316,7 @@ public typealias ActionBlock = () -> ()
         text = labelModel.text
         hero = labelModel.hero
         Label.setLabel(self, withHTML: labelModel.html)
+        isAccessibilityElement = hasText
         
         let alignment = LabelAlignment(rawValue: labelModel.textAlignment ?? "")
         switch alignment {
@@ -426,6 +427,7 @@ public typealias ActionBlock = () -> ()
                     continue
                 }
             }
+    
             attributedText = attributedString
             originalAttributedString = attributedText
         }
diff --git a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
index 75f1f0d8..d04ff3b1 100644
--- a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
@@ -24,7 +24,10 @@ import UIKit
             (molecule as? ModelMoleculeViewProtocol)?.set(with: castModel.molecule, delegateObject, additionalData)
         } else if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(castModel.molecule, delegateObject, false) {
             addMolecule(moleculeView)
-            accessibilityElements = [moleculeView]
+            
+            if ((moleculeView as? Label) != nil) {
+                accessibilityElements = [moleculeView]
+            }
         }
         super.set(with: model, delegateObject, additionalData)
     }
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
index 16f292ed..64bc7e41 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
@@ -14,9 +14,31 @@ public class LabelToggleModel: MoleculeModelProtocol {
     public var backgroundColor: Color?
     public var label: LabelModel
     public var toggle: ToggleModel
-
+    
     init(_ label: LabelModel, _ toggle: ToggleModel) {
         self.label = label
         self.toggle = toggle
     }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case backgroundColor
+        case label
+        case toggle
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey:.backgroundColor)
+        label = try typeContainer.decode(LabelModel.self, forKey:.label)
+        toggle = try typeContainer.decode(ToggleModel.self, forKey:.toggle)
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
+        try container.encode(label, forKey: .label)
+        try container.encode(toggle, forKey: .toggle)
+    }
 }

From 7b857414af90d9cf560e807263f20b5d1ee12786 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 25 Mar 2020 17:14:16 -0400
Subject: [PATCH 23/37] didn't carry over

---
 .../Molecules/Items/DropDownFilterTableViewCell.swift  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
index aa581ba1..6b6f5a32 100644
--- a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
@@ -29,16 +29,16 @@ import UIKit
             guard newValue != oldValue,
                 let self = self,
                 let index = self.dropDown.pickerData.firstIndex(of: newValue),
-                let model = self.listItemModel as? DropDownListItemModel
+                let dropListItemJSON = (self.listItemModel as? DropDownListItemModel).toJSON(),
+                let json2d = dropListItemJSON.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]],
+                !json2d.isEmpty && !(json2d.first?.isEmpty ?? false)
                 else { return }
 
             if self.previousIndex != NSNotFound {
-                self.delegateObject?.moleculeDelegate?.removeMolecules(model.molecules[self.previousIndex], animation: .fade)
+                self.delegateObject?.moleculeDelegate?.removeMolecules(json2d[self.previousIndex], sender: self, animation: .fade)
             }
             
-            if let indexPath = self.delegateObject?.moleculeDelegate?.getIndexPath(for: model) {
-                self.delegateObject?.moleculeDelegate?.addMolecules(model.molecules[index], indexPath: indexPath, animation: .fade)
-            }
+            self.delegateObject?.moleculeDelegate?.addMolecules(json2d[index], sender: self, animation: .fade)
             self.previousIndex = index
         }
     }

From 60199831a35e698935b7d048194597c5c5b2618c Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 25 Mar 2020 17:21:58 -0400
Subject: [PATCH 24/37] apparent merge conflict

---
 .../Molecules/Items/DropDownFilterTableViewCell.swift    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
index 6b6f5a32..11e619c6 100644
--- a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
@@ -29,16 +29,21 @@ import UIKit
             guard newValue != oldValue,
                 let self = self,
                 let index = self.dropDown.pickerData.firstIndex(of: newValue),
+                let model = self.listItemModel as? DropDownListItemModel,
                 let dropListItemJSON = (self.listItemModel as? DropDownListItemModel).toJSON(),
                 let json2d = dropListItemJSON.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]],
                 !json2d.isEmpty && !(json2d.first?.isEmpty ?? false)
                 else { return }
 
             if self.previousIndex != NSNotFound {
-                self.delegateObject?.moleculeDelegate?.removeMolecules(json2d[self.previousIndex], sender: self, animation: .fade)
+                self.delegateObject?.moleculeDelegate?.removeMolecules(model.molecules[self.previousIndex], animation: .fade)
+//                self.delegateObject?.moleculeDelegate?.removeMolecules(json2d[self.previousIndex],  animation: .fade)
             }
             
-            self.delegateObject?.moleculeDelegate?.addMolecules(json2d[index], sender: self, animation: .fade)
+            if let indexPath = self.delegateObject?.moleculeDelegate?.getIndexPath(for: model) {
+                self.delegateObject?.moleculeDelegate?.addMolecules(model.molecules[index], indexPath: indexPath, animation: .fade)
+//                self.delegateObject?.moleculeDelegate?.addMolecules(json2d[index],  animation: .fade)
+            }
             self.previousIndex = index
         }
     }

From 3249c9d68b1c50c181a8260753472dda4c0e1724 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 25 Mar 2020 17:39:33 -0400
Subject: [PATCH 25/37] remvoed

---
 MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
index 11e619c6..307f64c9 100644
--- a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
@@ -37,12 +37,10 @@ import UIKit
 
             if self.previousIndex != NSNotFound {
                 self.delegateObject?.moleculeDelegate?.removeMolecules(model.molecules[self.previousIndex], animation: .fade)
-//                self.delegateObject?.moleculeDelegate?.removeMolecules(json2d[self.previousIndex],  animation: .fade)
             }
             
             if let indexPath = self.delegateObject?.moleculeDelegate?.getIndexPath(for: model) {
                 self.delegateObject?.moleculeDelegate?.addMolecules(model.molecules[index], indexPath: indexPath, animation: .fade)
-//                self.delegateObject?.moleculeDelegate?.addMolecules(json2d[index],  animation: .fade)
             }
             self.previousIndex = index
         }

From 874007423d0902d18a91cc0279f2bbf0f69e7781 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Thu, 26 Mar 2020 09:03:21 -0400
Subject: [PATCH 26/37] tmp

---
 MVMCoreUI/Molecules/Items/DropDownListItemModel.swift | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift
index 0cd2f5ef..071014d3 100644
--- a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift
@@ -24,6 +24,12 @@ import Foundation
         line = LineModel(type: .none)
         style = "sectionFooter"
     }
+    
+//    public func verify() throws {
+//        guard dropDown.options.count != molecules.count else {
+//            throw
+//        }
+//    }
 
     //--------------------------------------------------
     // MARK: - Initializer
@@ -32,6 +38,7 @@ import Foundation
     public init(molecules: [[ListItemModelProtocol & MoleculeModelProtocol]], dropDown: ItemDropdownEntryFieldModel) {
         self.molecules = molecules
         self.dropDown = dropDown
+//        try verify()
         super.init()
     }
     

From dd7a339a4390e10e9d47fd4b73bb1c04eaa0ac6a Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Thu, 26 Mar 2020 10:46:23 -0400
Subject: [PATCH 27/37] correction

---
 .../MoleculeModelProtocol.swift               |  6 +++++
 .../Items/DropDownFilterTableViewCell.swift   |  5 +---
 .../Items/DropDownListItemModel.swift         | 24 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
index 913c3bd0..dda19b35 100644
--- a/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
@@ -1,6 +1,12 @@
 import Foundation
 
 
+public enum MolecularError: Swift.Error {
+    case error(String)
+    case countImbalance(String)
+}
+
+
 public protocol MoleculeModelProtocol: ModelProtocol {
     var moleculeName: String { get }
     var backgroundColor: Color? { get set }
diff --git a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
index 307f64c9..aa581ba1 100644
--- a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
@@ -29,10 +29,7 @@ import UIKit
             guard newValue != oldValue,
                 let self = self,
                 let index = self.dropDown.pickerData.firstIndex(of: newValue),
-                let model = self.listItemModel as? DropDownListItemModel,
-                let dropListItemJSON = (self.listItemModel as? DropDownListItemModel).toJSON(),
-                let json2d = dropListItemJSON.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]],
-                !json2d.isEmpty && !(json2d.first?.isEmpty ?? false)
+                let model = self.listItemModel as? DropDownListItemModel
                 else { return }
 
             if self.previousIndex != NSNotFound {
diff --git a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift
index 071014d3..deb2374b 100644
--- a/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownListItemModel.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 
+
 @objcMembers public class DropDownListItemModel: ListItemModel, MoleculeModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
@@ -17,6 +18,10 @@ import Foundation
     public var molecules: [[ListItemModelProtocol & MoleculeModelProtocol]]
     public var dropDown: ItemDropdownEntryFieldModel
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     /// Defaults to set
     public override func setDefaults() {
         super.setDefaults()
@@ -25,20 +30,24 @@ import Foundation
         style = "sectionFooter"
     }
     
-//    public func verify() throws {
-//        guard dropDown.options.count != molecules.count else {
-//            throw
-//        }
-//    }
+    //--------------------------------------------------
+    // MARK: - Functions
+    //--------------------------------------------------
+    
+    public class func verify(dropdown: ItemDropdownEntryFieldModel, molecules: [[ListItemModelProtocol & MoleculeModelProtocol]]) throws {
+        guard dropdown.options.count == molecules.count else {
+            throw MolecularError.countImbalance("dropdown.options.count is not equal to molecules.count")
+        }
+    }
 
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(molecules: [[ListItemModelProtocol & MoleculeModelProtocol]], dropDown: ItemDropdownEntryFieldModel) {
+    public init(molecules: [[ListItemModelProtocol & MoleculeModelProtocol]], dropDown: ItemDropdownEntryFieldModel) throws {
         self.molecules = molecules
         self.dropDown = dropDown
-//        try verify()
+        try Self.verify(dropdown: dropDown, molecules: molecules)
         super.init()
     }
     
@@ -60,6 +69,7 @@ import Foundation
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         molecules = try typeContainer.decodeModels2DIfPresent(codingKey: .molecules) ?? [[]]
         dropDown = try typeContainer.decode(ItemDropdownEntryFieldModel.self, forKey: .dropDown)
+        try Self.verify(dropdown: dropDown, molecules: molecules)
         try super.init(from: decoder)
     }
 

From 88349bc651e3be1ed7c6a0305a509577eb28038f Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Thu, 26 Mar 2020 11:36:18 -0400
Subject: [PATCH 28/37] Adding localized string because I didn't see it there
 for existing key. Updating Toggle to handle accessibility text.

---
 MVMCoreUI/Atoms/Views/Toggle.swift            | 22 ++++++++--------
 MVMCoreUI/Atoms/Views/ToggleModel.swift       | 26 ++++++++++++++++++-
 .../Items/MoleculeTableViewCell.swift         |  7 ++---
 .../Strings/en.lproj/Localizable.strings      |  6 ++++-
 4 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/MVMCoreUI/Atoms/Views/Toggle.swift b/MVMCoreUI/Atoms/Views/Toggle.swift
index 7e45c567..e5d0c00b 100644
--- a/MVMCoreUI/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atoms/Views/Toggle.swift
@@ -190,7 +190,10 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     public override func setupView() {
         super.setupView()
         
-        guard subviews.isEmpty else { return }
+        isAccessibilityElement = true
+        accessibilityTraits = .button
+        accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccToggleHint")
+        accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: "Toggle_buttonlabel")
         
         heightConstraint = heightAnchor.constraint(equalToConstant: Self.containerSize.height)
         heightConstraint?.isActive = true
@@ -214,8 +217,6 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         knobTrailingConstraint = trailingAnchor.constraint(equalTo: knobView.trailingAnchor, constant: 1)
         knobLeadingConstraint = knobView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 1)
         knobLeadingConstraint?.isActive = true
-        
-        accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: "Toggle_buttonlabel")
     }
     
     public override func reset() {
@@ -336,16 +337,15 @@ public typealias ActionBlockConfirmation = () -> (Bool)
 
     // MARK:- ModelMoleculeViewProtocol
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        guard let toggleModel = model as? ToggleModel else {
-            return
-        }
-
-        self.model = model
         self.delegateObject = delegateObject
-        let toggleModelJSON = toggleModel.toJSON()
+        self.model = model
+        
+        guard let model = model as? ToggleModel else { return }
 
-        FormValidator.setupValidation(molecule: toggleModel, delegate: delegateObject?.formHolderDelegate)
-        setWithJSON(toggleModelJSON, delegateObject: delegateObject, additionalData: additionalData)
+        accessibilityLabel = model.accessibilityText ?? MVMCoreUIUtility.hardcodedString(withKey: "Toggle_buttonlabel")
+        
+        FormValidator.setupValidation(molecule: model, delegate: delegateObject?.formHolderDelegate)
+        setWithJSON(model.toJSON(), delegateObject: delegateObject, additionalData: additionalData)
     }
 
     //TODO: change to setWith Model
diff --git a/MVMCoreUI/Atoms/Views/ToggleModel.swift b/MVMCoreUI/Atoms/Views/ToggleModel.swift
index 5e67be8a..ce599083 100644
--- a/MVMCoreUI/Atoms/Views/ToggleModel.swift
+++ b/MVMCoreUI/Atoms/Views/ToggleModel.swift
@@ -9,16 +9,24 @@
 import UIKit
 
 public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
-
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public static var identifier: String = "toggle"
     public var backgroundColor: Color?
     public var state: Bool = true
     public var action: ActionModelProtocol?
     public var alternateAction: ActionModelProtocol?
+    public var accessibilityText: String?
     public var fieldKey: String?
     public var groupName: String? = FormValidator.defaultGroupName
     public var baseValue: AnyHashable?
     
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case state
@@ -27,16 +35,29 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         case fieldKey
         case alternateAction
         case groupName
+        case accessibilityText
     }
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     public func formFieldValue() -> AnyHashable? {
         return state
     }
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init(_ state: Bool) {
         self.state = state
     }
     
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         if let state = try typeContainer.decodeIfPresent(Bool.self, forKey: .state) {
@@ -49,6 +70,8 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         if let groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName) {
             self.groupName = groupName
         }
+        
+        accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
     }
     
     public func encode(to encoder: Encoder) throws {
@@ -60,5 +83,6 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         try container.encode(state, forKey: .state)
         try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
         try container.encodeIfPresent(groupName, forKey: .groupName)
+        try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)
     }
 }
diff --git a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
index d04ff3b1..d3c83ea7 100644
--- a/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
@@ -24,10 +24,7 @@ import UIKit
             (molecule as? ModelMoleculeViewProtocol)?.set(with: castModel.molecule, delegateObject, additionalData)
         } else if let moleculeView = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(castModel.molecule, delegateObject, false) {
             addMolecule(moleculeView)
-            
-            if ((moleculeView as? Label) != nil) {
-                accessibilityElements = [moleculeView]
-            }
+            accessibilityElements = [moleculeView]
         }
         super.set(with: model, delegateObject, additionalData)
     }
@@ -36,7 +33,7 @@ import UIKit
        guard let moleculeModel = (model as? MoleculeListItemModel)?.molecule else { return "\(self)<>" }
         
         let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moleculeModel) as? ModelMoleculeViewProtocol.Type
-        let moleculeName = className?.nameForReuse(with: moleculeModel, delegateObject) ?? moleculeModel.moleculeName ?? ""
+        let moleculeName = className?.nameForReuse(with: moleculeModel, delegateObject) ?? moleculeModel.moleculeName
         
         return "\(self)<\(moleculeName)>"
     }
diff --git a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
index b9d21b67..cbf2611a 100644
--- a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
@@ -31,6 +31,7 @@
 // Camera
 "AccCameraButton" = "Camera Button";
 "AccCameraHint" = "Double tap to launch camera for scanning";
+
 // Checkbox
 "checkbox_action_hint" = "Double tap to change state";
 "checkbox_checked_state" = "Checked";
@@ -43,14 +44,17 @@
 "radio_not_selected_state" = "Not Selected";
 "radio_desc_state" = "Option";
 
-// Switch
+// Switch / Toggle
 "mfswitch_buttonlabel" = "Switch Button";
+"Toggle_buttonlabel" = "Toggle Button"
 "AccOn" = "on";
 "AccOff" = "off";
 "AccToggleHint" = "double tap to toggle";
+
 // Carousel
 "MVMCoreUIPageControl_currentpage_index" = "page %ld of %ld";
 "MVMCoreUIPageControlslides_currentpage_index" = "slide %ld of %ld";
+
 //Styler
 "CountDownDay" = " day";
 "CountDownHour" = " hour";

From f133bad78cf9f7824d0265e33967766386ae5f87 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Thu, 26 Mar 2020 12:48:23 -0400
Subject: [PATCH 29/37] accessibile togle

---
 MVMCoreUI/Atoms/Views/Toggle.swift                             | 3 ++-
 MVMCoreUI/Atoms/Views/ToggleModel.swift                        | 3 ++-
 MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/MVMCoreUI/Atoms/Views/Toggle.swift b/MVMCoreUI/Atoms/Views/Toggle.swift
index e5d0c00b..90a5197d 100644
--- a/MVMCoreUI/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atoms/Views/Toggle.swift
@@ -127,6 +127,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     private var widthConstraint: NSLayoutConstraint?
     
     private func constrainKnob() {
+        
         knobLeadingConstraint?.isActive = !isOn
         knobTrailingConstraint?.isActive = isOn
     }
@@ -343,7 +344,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         guard let model = model as? ToggleModel else { return }
 
         accessibilityLabel = model.accessibilityText ?? MVMCoreUIUtility.hardcodedString(withKey: "Toggle_buttonlabel")
-        
+        isOn = model.state
         FormValidator.setupValidation(molecule: model, delegate: delegateObject?.formHolderDelegate)
         setWithJSON(model.toJSON(), delegateObject: delegateObject, additionalData: additionalData)
     }
diff --git a/MVMCoreUI/Atoms/Views/ToggleModel.swift b/MVMCoreUI/Atoms/Views/ToggleModel.swift
index ce599083..53244dce 100644
--- a/MVMCoreUI/Atoms/Views/ToggleModel.swift
+++ b/MVMCoreUI/Atoms/Views/ToggleModel.swift
@@ -15,7 +15,7 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
     
     public static var identifier: String = "toggle"
     public var backgroundColor: Color?
-    public var state: Bool = true
+    public var state: Bool = false
     public var action: ActionModelProtocol?
     public var alternateAction: ActionModelProtocol?
     public var accessibilityText: String?
@@ -60,6 +60,7 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        
         if let state = try typeContainer.decodeIfPresent(Bool.self, forKey: .state) {
             self.state = state
         }
diff --git a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
index cbf2611a..a7f4cdf2 100644
--- a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
@@ -46,7 +46,7 @@
 
 // Switch / Toggle
 "mfswitch_buttonlabel" = "Switch Button";
-"Toggle_buttonlabel" = "Toggle Button"
+"Toggle_buttonlabel" = "Toggle Button";
 "AccOn" = "on";
 "AccOff" = "off";
 "AccToggleHint" = "double tap to toggle";

From b6ec314d14c6749d1786ec0d12d8936f9cdde2d9 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Thu, 26 Mar 2020 15:30:44 -0400
Subject: [PATCH 30/37] replaced

---
 MVMCoreUI/Atomic/Atoms/Views/Toggle.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 8701f6b3..410c3221 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -190,7 +190,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     
     public override func setupView() {
         super.setupView()
-        
+        guard subviews.isEmpty else { return }
         isAccessibilityElement = true
         accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccToggleHint")

From c7344b166dd7d202aa5e35bfe4ace6e1baccdbc4 Mon Sep 17 00:00:00 2001
From: Kruthika KP <>
Date: Fri, 27 Mar 2020 18:23:03 +0530
Subject: [PATCH 31/37] MF-18985 - ListFourColumnDataUsageListItem

---
 MVMCoreUI.xcodeproj/project.pbxproj           |  8 +++
 MVMCoreUI/Atomic/MoleculeObjectMapping.swift  |  1 +
 .../ListFourColumnDataUsageListItem.swift     | 72 +++++++++++++++++++
 ...ListFourColumnDataUsageListItemModel.swift | 64 +++++++++++++++++
 4 files changed, 145 insertions(+)
 create mode 100644 MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
 create mode 100644 MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 03335a4d..ddf36e4b 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -130,6 +130,8 @@
 		8D24041123E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */; };
 		8D24041523E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */; };
 		8D448E5524050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */; };
+		8D4687E2242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */; };
+		8D4687E4242E2DF300802879 /* ListFourColumnDataUsageListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */; };
 		942C372E241149170066E45E /* NHaasGroteskDSStd-75Bd.otf in Resources */ = {isa = PBXBuildFile; fileRef = 942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */; };
 		942C372F241149170066E45E /* NHaasGroteskDSStd-55Rg.otf in Resources */ = {isa = PBXBuildFile; fileRef = 942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */; };
 		942C378C2412F4FA0066E45E /* ModalMoleculeListTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942C378B2412F4FA0066E45E /* ModalMoleculeListTemplate.swift */; };
@@ -514,6 +516,8 @@
 		8D24041023E7FB9E009E23BE /* ListLeftVariableIconWithRightCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaret.swift; sourceTree = "<group>"; };
 		8D24041423E7FC0B009E23BE /* ListLeftVariableIconWithRightCaretModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretModel.swift; sourceTree = "<group>"; };
 		8D448E5424050A46006211BB /* ListOneColumnFullWidthTextAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinksModel.swift; sourceTree = "<group>"; };
+		8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListFourColumnDataUsageListItemModel.swift; sourceTree = "<group>"; };
+		8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListFourColumnDataUsageListItem.swift; sourceTree = "<group>"; };
 		9402C34F23A2CEA3004B974C /* LeftRightLabelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftRightLabelModel.swift; sourceTree = "<group>"; };
 		942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-75Bd.otf"; sourceTree = "<group>"; };
 		942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-55Rg.otf"; sourceTree = "<group>"; };
@@ -919,6 +923,8 @@
 			children = (
 				525019E42406852100EED91C /* ListFourColumnDataUsageDividerModel.swift */,
 				525019E62406853600EED91C /* ListFourColumnDataUsageDivider.swift */,
+				8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */,
+				8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */,
 			);
 			path = FourColumn;
 			sourceTree = "<group>";
@@ -2029,6 +2035,7 @@
 				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
 				01EB368F23609801006832FA /* LabelModel.swift in Sources */,
 				942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */,
+				8D4687E4242E2DF300802879 /* ListFourColumnDataUsageListItem.swift in Sources */,
 				01F2A03223A4498200D954D8 /* CaretLinkModel.swift in Sources */,
 				0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */,
 				011B58F023A2AA980085F53C /* ListItemModelProtocol.swift in Sources */,
@@ -2168,6 +2175,7 @@
 				BB6C6AC924225290005F7224 /* ListOneColumnTextWithWhitespaceDividerShortModel.swift in Sources */,
 				C695A69423C9909000BFB94E /* DoughnutChartModel.swift in Sources */,
 				D29DF32421ED0DA2003B2FB9 /* TextButtonView.m in Sources */,
+				8D4687E2242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift in Sources */,
 				D29E28DD23D7404C00ACEA85 /* ContainerHelper.swift in Sources */,
 				012A88C2238D7BCA00FE3DA1 /* CarouselItemModel.swift in Sources */,
 				D29DF29E21E7AE3B003B2FB9 /* MFStyler.m in Sources */,
diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
index bfa6db01..02829367 100644
--- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
@@ -136,6 +136,7 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnCompareChanges.self, viewModelClass: ListTwoColumnCompareChangesModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnPriceDetails.self, viewModelClass: ListTwoColumnPriceDetailsModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListTwoColumnPriceDescription.self, viewModelClass: ListTwoColumnPriceDescriptionModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListFourColumnDataUsageListItem.self, viewModelClass: ListFourColumnDataUsageListItemModel.self)
 
         // Designed Section Dividers
         MoleculeObjectMapping.shared()?.register(viewClass: ListFourColumnDataUsageDivider.self, viewModelClass: ListFourColumnDataUsageDividerModel.self)
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
new file mode 100644
index 00000000..5eb0664d
--- /dev/null
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
@@ -0,0 +1,72 @@
+//
+//  ListFourColumnDataUsageListItem.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 27/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers public class ListFourColumnDataUsageListItem: TableViewCell {
+    
+    //-----------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    var stack: Stack<StackModel>
+    let label1 = Label.commonLabelB2(true)
+    let label2 = Label.commonLabelB2(true)
+    let label3 = Label.commonLabelB2(true)
+    let label4 = Label.commonLabelB2(true)
+    let arrow = Arrow(frame: .zero)
+    
+    //-----------------------------------------------------
+    // MARK: - Initializers
+    //-----------------------------------------------------
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        stack = Stack<StackModel>.createStack(with: [(view: label1, model: StackItemModel(percent: 19, horizontalAlignment: .leading)),
+                                                     (view: arrow, model: StackItemModel(percent: 4, horizontalAlignment: .leading)),
+                                                     (view: label2, model: StackItemModel(percent: 40, horizontalAlignment: .leading)),
+                                                     (view: label3, model: StackItemModel(percent:17,horizontalAlignment: .leading)),
+                                                     (view: label4, model: StackItemModel(percent:20,horizontalAlignment: .leading))],
+                                              axis: .horizontal,spacing: 2)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - View Lifecycle
+    //-----------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        addMolecule(stack)
+        arrow.pinHeightAndWidth()
+    }
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        guard let model = model as? ListFourColumnDataUsageListItemModel else { return }
+        label1.set(with: model.label1, delegateObject, additionalData)
+        label2.set(with: model.label2, delegateObject, additionalData)
+        label3.set(with: model.label3, delegateObject, additionalData)
+        label4.set(with: model.label4, delegateObject, additionalData)
+        arrow.set(with: model.arrow, delegateObject, additionalData)
+        stack.restack()
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 121
+    }
+    
+    open override func reset() {
+        super.reset()
+        label1.styleB2(true)
+        label2.styleB2(true)
+        label3.styleB2(true)
+        label4.styleB2(true)
+        arrow.reset()
+    }
+}
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift
new file mode 100644
index 00000000..dd9e8fa6
--- /dev/null
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift
@@ -0,0 +1,64 @@
+//
+//  ListFourColumnDataUsageListItemModel.swift
+//  MVMCoreUI
+//
+//  Created by Kruthika KP on 27/03/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListFourColumnDataUsageListItemModel: ListItemModel, MoleculeModelProtocol {
+    
+    public static var identifier: String = "list4C"
+    public var label1: LabelModel
+    public var label2: LabelModel
+    public var label3: LabelModel
+    public var label4: LabelModel
+    public var arrow: ArrowModel
+    
+    public init(label1:LabelModel, label2:LabelModel, label3:LabelModel,label4:LabelModel, arrow:ArrowModel) {
+        self.label1 = label1
+        self.label2 = label2
+        self.label3 = label3
+        self.label4 = label4
+        self.arrow = arrow
+        super.init()
+    }
+    
+    public override func setDefaults() {
+        super.setDefaults()
+        style = "header"
+        arrow.degrees = 50
+    }
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case label1
+        case label2
+        case label3
+        case label4
+        case arrow
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        label1 = try typeContainer.decode(LabelModel.self, forKey: .label1)
+        label2 = try typeContainer.decode(LabelModel.self, forKey: .label2)
+        label3 = try typeContainer.decode(LabelModel.self, forKey: .label3)
+        label4 = try typeContainer.decode(LabelModel.self, forKey: .label4)
+        arrow = try typeContainer.decode(ArrowModel.self, forKey: .arrow)
+        try super.init(from: decoder)
+    }
+    
+    public  override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(label1, forKey: .label1)
+        try container.encode(label2, forKey: .label2)
+        try container.encode(label3, forKey: .label3)
+        try container.encode(label4, forKey: .label4)
+        try container.encode(arrow, forKey: .arrow)
+    }
+}

From 70100791e63561556c3b1ac0aa89214566ce7b04 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Fri, 27 Mar 2020 09:13:57 -0400
Subject: [PATCH 32/37] remvoing to progess

---
 MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift b/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift
index d0267afc..0c9dec3b 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/MoleculeTableViewCell.swift
@@ -24,7 +24,6 @@ import UIKit
             molecule?.set(with: castModel.molecule, delegateObject, additionalData)
         } else if let moleculeView = MoleculeObjectMapping.shared()?.createMolecule(castModel.molecule, delegateObject: delegateObject, additionalData: additionalData) {
             addMolecule(moleculeView)
-            accessibilityElements = [moleculeView]
         }
         super.set(with: model, delegateObject, additionalData)
     }

From dcbfcf033fecd2ecef36e7461b5395a48277f316 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Mon, 30 Mar 2020 09:53:38 -0400
Subject: [PATCH 33/37] latest

---
 MVMCoreUI/Atomic/Atoms/Views/Toggle.swift     |  1 +
 .../Molecules/Items/StackItemModel.swift      | 10 +++++
 .../EyebrowHeadlineBodyLink.swift             | 24 +++++------
 MVMCoreUI/Atomic/Organisms/Stack.swift        | 16 +++++---
 MVMCoreUI/BaseClasses/Control.swift           |  1 +
 MVMCoreUI/BaseClasses/TableViewCell.swift     |  3 ++
 .../Views/Container/ContainerModel.swift      | 16 ++++++++
 .../Strings/en.lproj/Localizable.strings      | 41 +++++++++++++------
 8 files changed, 82 insertions(+), 30 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 410c3221..8ab7b07b 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -338,6 +338,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
 
     // MARK:- MoleculeViewProtocol
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
         self.delegateObject = delegateObject
 
         guard let model = model as? ToggleModel else { return }
diff --git a/MVMCoreUI/Atomic/Molecules/Items/StackItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/StackItemModel.swift
index 12254fb5..436ed9cd 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/StackItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/StackItemModel.swift
@@ -9,6 +9,10 @@
 import Foundation
 
 @objcMembers public class StackItemModel: ContainerModel, StackItemModelProtocol, MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public static var identifier: String = "simpleStackItem"
     public var moleculeName: String = StackItemModel.identifier
     public var backgroundColor: Color?
@@ -16,12 +20,18 @@ import Foundation
     public var percent: Int?
     public var gone: Bool = false
     
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public convenience init(spacing: CGFloat? = nil, percent: Int? = nil, horizontalAlignment: UIStackView.Alignment? = nil, verticalAlignment: UIStackView.Alignment? = nil, gone: Bool? = nil) {
         self.init()
+        
         self.horizontalAlignment = horizontalAlignment
         self.verticalAlignment = verticalAlignment
         self.spacing = spacing
         self.percent = percent
+        
         if let gone = gone {
             self.gone = gone
         }
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index 9672b789..ff530d92 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -52,18 +52,18 @@ import UIKit
         body.styleB2(true)
     }
     
-    public func eyebrow(isHidden: Bool) {
-        
-        stack.stackModel?.molecules[0].gone = isHidden
-        
-        if isHidden {
-            accessibilityElements = [headline, body, link]
-        } else {
-            accessibilityElements = [eyebrow, headline, body, link]
-        }
-        
-        stack.restack()
-    }
+//        public func eyebrow(isHidden: Bool) {
+//
+//            stack.stackModel?.molecules[0].gone = isHidden
+//
+//            if isHidden {
+//                accessibilityElements = [headline, body, link]
+//            } else {
+//                accessibilityElements = [eyebrow, headline, body, link]
+//            }
+//
+//            stack.restack()
+//        }
     
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
diff --git a/MVMCoreUI/Atomic/Organisms/Stack.swift b/MVMCoreUI/Atomic/Organisms/Stack.swift
index b7dab506..e957a2a6 100644
--- a/MVMCoreUI/Atomic/Organisms/Stack.swift
+++ b/MVMCoreUI/Atomic/Organisms/Stack.swift
@@ -15,10 +15,11 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
     //--------------------------------------------------
     
     open var contentView: UIView = MVMCoreUICommonViewsUtility.commonView()
+    open var stackItems: [UIView] = []
+    
     open var stackModel: T? {
         get { return model as? T }
     }
-    open var stackItems: [UIView] = []
     
     //--------------------------------------------------
     // MARK: - Helpers
@@ -37,18 +38,21 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
         guard let stackModel = stackModel else { return }
         let stackItems = self.stackItems
         self.stackItems = []
-        let lastItemIndex = stackModel.molecules.lastIndex(where: { (item) -> Bool in
-            return !item.gone
-        })
+        let lastItemIndex = stackModel.molecules.lastIndex { !$0.gone }
         
         // Adds the views
         let totalSpace = getTotalSpace()
         for (index, view) in stackItems.enumerated() {
             addView(view, stackModel.molecules[index], totalSpacing: totalSpace, lastItem: lastItemIndex == index)
         }
-    
+        
         isAccessibilityElement = false
-        accessibilityElements = stackItems
+        var accessibleViews: [Any] = []
+        for (index, view) in stackItems.enumerated() where !stackModel.molecules[index].gone {
+            accessibleViews.append(view)
+        }
+        
+        accessibilityElements = accessibleViews
     }
     
     /// Removes all stack items views from the view.
diff --git a/MVMCoreUI/BaseClasses/Control.swift b/MVMCoreUI/BaseClasses/Control.swift
index b73fcc81..ebb88977 100644
--- a/MVMCoreUI/BaseClasses/Control.swift
+++ b/MVMCoreUI/BaseClasses/Control.swift
@@ -12,6 +12,7 @@ import UIKit
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
+    
     open var model: MoleculeModelProtocol?
 
     private var initialSetupPerformed = false
diff --git a/MVMCoreUI/BaseClasses/TableViewCell.swift b/MVMCoreUI/BaseClasses/TableViewCell.swift
index 7af0b57b..dc4d270a 100644
--- a/MVMCoreUI/BaseClasses/TableViewCell.swift
+++ b/MVMCoreUI/BaseClasses/TableViewCell.swift
@@ -197,10 +197,13 @@ import UIKit
     // MARK: - Caret View
     /// Adds the standard mvm style caret to the accessory view
     @objc public func addCaretViewAccessory() {
+        
         guard accessoryView == nil else { return }
         
         let caret = CaretView(lineWidth: 1)
         caret.translatesAutoresizingMaskIntoConstraints = true
+        caret.isAccessibilityElement = true
+        caret.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
         caret.size = .small(.vertical)
         if let size = caret.size?.dimensions() {
             caret.frame = CGRect(origin: CGPoint.zero, size: size)
diff --git a/MVMCoreUI/Containers/Views/Container/ContainerModel.swift b/MVMCoreUI/Containers/Views/Container/ContainerModel.swift
index a18e8589..ec6f9769 100644
--- a/MVMCoreUI/Containers/Views/Container/ContainerModel.swift
+++ b/MVMCoreUI/Containers/Views/Container/ContainerModel.swift
@@ -9,6 +9,10 @@
 import Foundation
 
 open class ContainerModel: ContainerModelProtocol, Codable {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public var horizontalAlignment: UIStackView.Alignment?
     public var verticalAlignment: UIStackView.Alignment?
     public var useHorizontalMargins: Bool?
@@ -17,6 +21,10 @@ open class ContainerModel: ContainerModelProtocol, Codable {
     public var topMarginPadding: CGFloat?
     public var bottomMarginPadding: CGFloat?
     
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
     private enum CodingKeys: String, CodingKey {
         case verticalAlignment
         case horizontalAlignment
@@ -26,6 +34,10 @@ open class ContainerModel: ContainerModelProtocol, Codable {
         case bottomMarginPadding
     }
     
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
     public init() {}
     
     public convenience init(horizontalAlignment: UIStackView.Alignment? = nil, verticalAlignment: UIStackView.Alignment? = nil) {
@@ -33,6 +45,10 @@ open class ContainerModel: ContainerModelProtocol, Codable {
         self.horizontalAlignment = horizontalAlignment
         self.verticalAlignment = verticalAlignment
     }
+    
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
diff --git a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
index a7f4cdf2..48cbe3ce 100644
--- a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
@@ -6,56 +6,73 @@
   Copyright © 2017 myverizon. All rights reserved.
 */
 
-//// Accessibility
+// MARK: Accessibility
 "AccCloseButton" = "Close";
 "swipe_to_select_with_action_hint" = "swipe up or down to select action, then double tap to select.";
-// Tab
+
+
+// MARK: Tab
 "AccTab" = ", tab";
 "AccTabHint" = "Double tap to select.";
 "AccTabIndex" = ", %ld of %ld";
-// top alert
+
+
+// MARK: Top alert
 "toptabbar_tab_selected" = ", tab, Selected";
 "AccTopAlertClosed" = "Top alert notification is closed.";
 "top_alert_notification" = "Top alert notification";
-// Textfield
+
+
+// MARK: Textfield
 "textfield_today_string" = "Today";
 "textfield_error_message" = "%@.\n The error  message.\n %@";
 "textfield_picker_item" = " picker item";
 "textfield_regular" = " regular";
 "textfield_disabled_state" = "disabled";
-// MDNTextfield
+
+
+// MARK: MDNTextfield
 "textfield_contacts_barbutton" = "My Contacts";
 "textfield_phone_format_error_message" = "Invalid phone number format.";
-// DigitTextfield
+
+
+// MARK: DigitTextfield
 "mfdigittextfield_regular" = " regular";
-// Camera
+
+
+// MARK: Camera
 "AccCameraButton" = "Camera Button";
 "AccCameraHint" = "Double tap to launch camera for scanning";
 
-// Checkbox
+
+// MARK: Checkbox
 "checkbox_action_hint" = "Double tap to change state";
 "checkbox_checked_state" = "Checked";
 "checkbox_unchecked_state" = "Unchecked";
 "checkbox_desc_state" = "%@ CheckBox %@";
 
-// Radio Button
+
+// MARK: Radio Button
 "radio_action_hint" = "Double tap to select";
 "radio_selected_state" = "Selected";
 "radio_not_selected_state" = "Not Selected";
 "radio_desc_state" = "Option";
 
-// Switch / Toggle
+
+// MARK: Switch / Toggle
 "mfswitch_buttonlabel" = "Switch Button";
 "Toggle_buttonlabel" = "Toggle Button";
 "AccOn" = "on";
 "AccOff" = "off";
 "AccToggleHint" = "double tap to toggle";
 
-// Carousel
+
+// MARK: Carousel
 "MVMCoreUIPageControl_currentpage_index" = "page %ld of %ld";
 "MVMCoreUIPageControlslides_currentpage_index" = "slide %ld of %ld";
 
-//Styler
+
+// MARK: Styler
 "CountDownDay" = " day";
 "CountDownHour" = " hour";
 "CountDownMin" = " min";

From a38b781c117c590812f6b65e3ea1d057031925af Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Mon, 30 Mar 2020 10:42:51 -0400
Subject: [PATCH 34/37] no

---
 .../EyebrowHeadlineBodyLink.swift                   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
index ff530d92..82f83530 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
@@ -52,19 +52,6 @@ import UIKit
         body.styleB2(true)
     }
     
-//        public func eyebrow(isHidden: Bool) {
-//
-//            stack.stackModel?.molecules[0].gone = isHidden
-//
-//            if isHidden {
-//                accessibilityElements = [headline, body, link]
-//            } else {
-//                accessibilityElements = [eyebrow, headline, body, link]
-//            }
-//
-//            stack.restack()
-//        }
-    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------

From dccf576f7adf8b818b6de025532a442876f83207 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 1 Apr 2020 10:05:32 -0400
Subject: [PATCH 35/37] Minor fixs

---
 MVMCoreUI.xcodeproj/project.pbxproj                      | 8 ++++++++
 .../FourColumn/ListFourColumnDataUsageListItem.swift     | 5 ++---
 .../ListFourColumnDataUsageListItemModel.swift           | 9 +--------
 MVMCoreUI/Categories/UIStackView+Extension.swift         | 6 ++++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index ddf36e4b..227d5f92 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -1016,6 +1016,13 @@
 			path = Extensions;
 			sourceTree = "<group>";
 		};
+		D20492F12434CB5F00A5EED6 /* FourColumn */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = FourColumn;
+			sourceTree = "<group>";
+		};
 		D213347423842FE3008E41B3 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1213,6 +1220,7 @@
 		D22B38EA23F4E08B00490EF6 /* List */ = {
 			isa = PBXGroup;
 			children = (
+				D20492F12434CB5F00A5EED6 /* FourColumn */,
 				D22D8396241FDE4700D3DF69 /* TwoColumn */,
 				52267A0523FFE0A900906CBA /* OneColumn */,
 				AA4FC2A323F4F69600E251DB /* RightVariable */,
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
index 5eb0664d..8c499cac 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
@@ -29,7 +29,7 @@ import Foundation
                                                      (view: label2, model: StackItemModel(percent: 40, horizontalAlignment: .leading)),
                                                      (view: label3, model: StackItemModel(percent:17,horizontalAlignment: .leading)),
                                                      (view: label4, model: StackItemModel(percent:20,horizontalAlignment: .leading))],
-                                              axis: .horizontal,spacing: 2)
+                                              axis: .horizontal,spacing: 8)
         super.init(style: style, reuseIdentifier: reuseIdentifier)
     }
     
@@ -44,6 +44,7 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         arrow.pinHeightAndWidth()
+        stack.restack()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
@@ -54,7 +55,6 @@ import Foundation
         label3.set(with: model.label3, delegateObject, additionalData)
         label4.set(with: model.label4, delegateObject, additionalData)
         arrow.set(with: model.arrow, delegateObject, additionalData)
-        stack.restack()
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
@@ -67,6 +67,5 @@ import Foundation
         label2.styleB2(true)
         label3.styleB2(true)
         label4.styleB2(true)
-        arrow.reset()
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift
index dd9e8fa6..bf82bb5f 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift
@@ -9,13 +9,12 @@
 import Foundation
 
 public class ListFourColumnDataUsageListItemModel: ListItemModel, MoleculeModelProtocol {
-    
     public static var identifier: String = "list4C"
     public var label1: LabelModel
+    public var arrow: ArrowModel
     public var label2: LabelModel
     public var label3: LabelModel
     public var label4: LabelModel
-    public var arrow: ArrowModel
     
     public init(label1:LabelModel, label2:LabelModel, label3:LabelModel,label4:LabelModel, arrow:ArrowModel) {
         self.label1 = label1
@@ -26,12 +25,6 @@ public class ListFourColumnDataUsageListItemModel: ListItemModel, MoleculeModelP
         super.init()
     }
     
-    public override func setDefaults() {
-        super.setDefaults()
-        style = "header"
-        arrow.degrees = 50
-    }
-    
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case label1
diff --git a/MVMCoreUI/Categories/UIStackView+Extension.swift b/MVMCoreUI/Categories/UIStackView+Extension.swift
index a793635a..b88dfb51 100644
--- a/MVMCoreUI/Categories/UIStackView+Extension.swift
+++ b/MVMCoreUI/Categories/UIStackView+Extension.swift
@@ -8,13 +8,15 @@
 
 import Foundation
 
-extension UIStackView: MoleculeViewProtocol {
+extension UIStackView: MVMCoreViewProtocol {
     public func updateView(_ size: CGFloat) {
         for view in arrangedSubviews {
             (view as? MVMCoreViewProtocol)?.updateView(size)
         }
     }
-    
+}
+
+extension UIStackView: MoleculeViewProtocol {
     public func reset() {
         for view in arrangedSubviews {
             (view as? MoleculeViewProtocol)?.reset()

From df16745911b60a19f57f391099b5acac2c70b48f Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 1 Apr 2020 10:20:55 -0400
Subject: [PATCH 36/37] use another stack

---
 .../FourColumn/ListFourColumnDataUsageListItem.swift   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
index 8c499cac..2377a1f2 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
@@ -19,14 +19,19 @@ import Foundation
     let label3 = Label.commonLabelB2(true)
     let label4 = Label.commonLabelB2(true)
     let arrow = Arrow(frame: .zero)
+    let arrowAndLabel2Stack: Stack<StackModel>
     
     //-----------------------------------------------------
     // MARK: - Initializers
     //-----------------------------------------------------
     public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        arrowAndLabel2Stack = Stack<StackModel>.createStack(with: [(view: arrow, model: StackItemModel(horizontalAlignment: .fill)),
+               (view: label2, model: StackItemModel(horizontalAlignment: .leading))],
+                                                            axis: .horizontal, spacing: 4)
+        label2.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
+        label2.setContentHuggingPriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         stack = Stack<StackModel>.createStack(with: [(view: label1, model: StackItemModel(percent: 19, horizontalAlignment: .leading)),
-                                                     (view: arrow, model: StackItemModel(percent: 4, horizontalAlignment: .leading)),
-                                                     (view: label2, model: StackItemModel(percent: 40, horizontalAlignment: .leading)),
+                                                     (view: arrowAndLabel2Stack, model: StackItemModel(percent: 44, horizontalAlignment: .fill)),
                                                      (view: label3, model: StackItemModel(percent:17,horizontalAlignment: .leading)),
                                                      (view: label4, model: StackItemModel(percent:20,horizontalAlignment: .leading))],
                                               axis: .horizontal,spacing: 8)
@@ -44,6 +49,7 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         arrow.pinHeightAndWidth()
+        arrowAndLabel2Stack.restack()
         stack.restack()
     }
     

From a3f81511b6cfde863407b9b8d15f9dbfb71866f2 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 1 Apr 2020 10:21:42 -0400
Subject: [PATCH 37/37] move files

---
 MVMCoreUI.xcodeproj/project.pbxproj                           | 4 ++--
 .../FourColumn/ListFourColumnDataUsageListItem.swift          | 0
 .../FourColumn/ListFourColumnDataUsageListItemModel.swift     | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename MVMCoreUI/Atomic/Molecules/DesignedComponents/{SectionDividers => List}/FourColumn/ListFourColumnDataUsageListItem.swift (100%)
 rename MVMCoreUI/Atomic/Molecules/DesignedComponents/{SectionDividers => List}/FourColumn/ListFourColumnDataUsageListItemModel.swift (100%)

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 227d5f92..18c6317e 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -923,8 +923,6 @@
 			children = (
 				525019E42406852100EED91C /* ListFourColumnDataUsageDividerModel.swift */,
 				525019E62406853600EED91C /* ListFourColumnDataUsageDivider.swift */,
-				8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */,
-				8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */,
 			);
 			path = FourColumn;
 			sourceTree = "<group>";
@@ -1019,6 +1017,8 @@
 		D20492F12434CB5F00A5EED6 /* FourColumn */ = {
 			isa = PBXGroup;
 			children = (
+				8D4687E1242E2DE400802879 /* ListFourColumnDataUsageListItemModel.swift */,
+				8D4687E3242E2DF300802879 /* ListFourColumnDataUsageListItem.swift */,
 			);
 			path = FourColumn;
 			sourceTree = "<group>";
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItem.swift
rename to MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItemModel.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageListItemModel.swift
rename to MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItemModel.swift