Merge branch 'develop' into feature/Headers_H2_NoButtons_BodyText

# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj

MVMCoreUI.xcodeproj/project.pbxproj

@@ -115,6 +115,10 @@
 		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 */; };
+		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 */; };
+		942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942C378D2412F5B60066E45E /* ModalMoleculeStackTemplate.swift */; };
 		9432A79F23DB47BA00719041 /* EntryFieldContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */; };
 		943784F5236B77BB006A1E82 /* GraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943784F3236B77BB006A1E82 /* GraphView.swift */; };
 		943784F6236B77BB006A1E82 /* GraphViewAnimationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943784F4236B77BB006A1E82 /* GraphViewAnimationHandler.swift */; };
@@ -126,7 +130,6 @@
 		9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */; };
 		9458C3172406C8FD00930963 /* UIFont+FontWrapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9458C3152406C8FD00930963 /* UIFont+FontWrapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9458C3182406C8FD00930963 /* UIFont+FontWrapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 9458C3162406C8FD00930963 /* UIFont+FontWrapping.m */; };
-		946EE1BA237B66D80036751F /* MoleculeModelHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1B9237B66D80036751F /* MoleculeModelHelper.swift */; };
 		948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948DB67D2326DCD90011F916 /* MultiProgress.swift */; };
 		94AF4A3E23E9D13900676048 /* MFCaretButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 94AF4A3C23E9D13900676048 /* MFCaretButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		94AF4A3F23E9D13900676048 /* MFCaretButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 94AF4A3D23E9D13900676048 /* MFCaretButton.m */; };
@@ -183,6 +186,7 @@
 		D22D1F562204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = D22D1F542204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D22D1F572204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D22D1F552204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m */; };
 		D243859923A16B1800332775 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = D243859823A16B1800332775 /* Container.swift */; };
+		D256E9932412880000360572 /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = D256E9922412880000360572 /* Header.swift */; };
 		D260105323CEA61600764D80 /* ToggleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105223CEA61600764D80 /* ToggleModel.swift */; };
 		D260105523CEA7DC00764D80 /* MVMCoreUISwitch+Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105423CEA7DC00764D80 /* MVMCoreUISwitch+Model.swift */; };
 		D260105923D0A92900764D80 /* ContainerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105823D0A92900764D80 /* ContainerProtocol.swift */; };
@@ -466,6 +470,10 @@
 		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>"; };
 		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>"; };
+		942C378B2412F4FA0066E45E /* ModalMoleculeListTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalMoleculeListTemplate.swift; sourceTree = "<group>"; };
+		942C378D2412F5B60066E45E /* ModalMoleculeStackTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalMoleculeStackTemplate.swift; sourceTree = "<group>"; };
 		9432A79E23DB47BA00719041 /* EntryFieldContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntryFieldContainer.swift; sourceTree = "<group>"; };
 		943784F3236B77BB006A1E82 /* GraphView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphView.swift; sourceTree = "<group>"; };
 		943784F4236B77BB006A1E82 /* GraphViewAnimationHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphViewAnimationHandler.swift; sourceTree = "<group>"; };
@@ -477,7 +485,6 @@
 		9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MVMAnimationFramework.framework; path = ../SharedFrameworks/MVMAnimationFramework.framework; sourceTree = "<group>"; };
 		9458C3152406C8FD00930963 /* UIFont+FontWrapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIFont+FontWrapping.h"; sourceTree = "<group>"; };
 		9458C3162406C8FD00930963 /* UIFont+FontWrapping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIFont+FontWrapping.m"; sourceTree = "<group>"; };
-		946EE1B9237B66D80036751F /* MoleculeModelHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeModelHelper.swift; sourceTree = "<group>"; };
 		948DB67D2326DCD90011F916 /* MultiProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiProgress.swift; sourceTree = "<group>"; };
 		94AF4A3C23E9D13900676048 /* MFCaretButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MFCaretButton.h; sourceTree = "<group>"; };
 		94AF4A3D23E9D13900676048 /* MFCaretButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MFCaretButton.m; sourceTree = "<group>"; };
@@ -532,6 +539,7 @@
 		D22D1F542204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIStackableViewController.h; sourceTree = "<group>"; };
 		D22D1F552204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIStackableViewController.m; sourceTree = "<group>"; };
 		D243859823A16B1800332775 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = "<group>"; };
+		D256E9922412880000360572 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = "<group>"; };
 		D260105223CEA61600764D80 /* ToggleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleModel.swift; sourceTree = "<group>"; };
 		D260105423CEA7DC00764D80 /* MVMCoreUISwitch+Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MVMCoreUISwitch+Model.swift"; sourceTree = "<group>"; };
 		D260105823D0A92900764D80 /* ContainerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerProtocol.swift; sourceTree = "<group>"; };
@@ -768,7 +776,6 @@
 			isa = PBXGroup;
 			children = (
 				011B58EE23A2AA850085F53C /* ModelProtocols */,
-				946EE1B5237B663A0036751F /* Extensions */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -851,14 +858,6 @@
 			path = LockUps;
 			sourceTree = "<group>";
 		};
-		946EE1B5237B663A0036751F /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				946EE1B9237B66D80036751F /* MoleculeModelHelper.swift */,
-			);
-			path = Extensions;
-			sourceTree = "<group>";
-		};
 		94C2D9822386F3E30006CF46 /* Label */ = {
 			isa = PBXGroup;
 			children = (
@@ -1183,11 +1182,13 @@
 				012A88AC238C418100FE3DA1 /* TemplateProtocol.swift */,
 				014AA72823C5059B006F3E93 /* StackPageTemplateModel.swift */,
 				D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */,
+				942C378D2412F5B60066E45E /* ModalMoleculeStackTemplate.swift */,
 				014AA72923C5059B006F3E93 /* StackCenteredPageTemplateModel.swift */,
 				D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */,
 				D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */,
 				014AA72C23C5059B006F3E93 /* ListPageTemplateModel.swift */,
 				D2E1FAE02268E81D00AEFD8C /* MoleculeListTemplate.swift */,
+				942C378B2412F4FA0066E45E /* ModalMoleculeListTemplate.swift */,
 				014AA72A23C5059B006F3E93 /* ThreeLayerPageTemplateModel.swift */,
 				D2D6CD4122E78FAB00D701B8 /* ThreeLayerTemplate.swift */,
 			);
@@ -1222,6 +1223,7 @@
 				D224798E2316A995003FCCF9 /* HorizontalCombinationViews */,
 				D224798D2316A988003FCCF9 /* VerticalCombinationViews */,
 				01EB368C23609801006832FA /* HeaderModel.swift */,
+				D256E9922412880000360572 /* Header.swift */,
 				D2D90B41240463E100DD6EC9 /* MoleculeHeaderModel.swift */,
 				D2A514662213885800345BFB /* MoleculeHeaderView.swift */,
 				012A88EB238F084D00FE3DA1 /* FooterModel.swift */,
@@ -1507,6 +1509,8 @@
 				94CA227924058533002D6750 /* VerizonNHGeDS-Regular.otf */,
 				94CA227824058533002D6750 /* VerizonNHGeTX-Bold.otf */,
 				94CA227B24058533002D6750 /* VerizonNHGeTX-Regular.otf */,
+				942C372D241149170066E45E /* NHaasGroteskDSStd-55Rg.otf */,
+				942C372C241149170066E45E /* NHaasGroteskDSStd-75Bd.otf */,
 				D29DF31721ECECC0003B2FB9 /* OCRAExtended.ttf */,
 			);
 			path = Fonts;
@@ -1716,6 +1720,8 @@
 				0A21DB86235E06EF00C160A2 /* MFTextField.xib in Resources */,
 				94CA227D24058534002D6750 /* VerizonNHGeDS-Regular.otf in Resources */,
 				D29DF32E21EE8C3D003B2FB9 /* Media.xcassets in Resources */,
+				942C372E241149170066E45E /* NHaasGroteskDSStd-75Bd.otf in Resources */,
+				942C372F241149170066E45E /* NHaasGroteskDSStd-55Rg.otf in Resources */,
 				94CA227E24058534002D6750 /* VerizonNHGeDS-Bold.otf in Resources */,
 				D29DF31B21ECECC0003B2FB9 /* OCRAExtended.ttf in Resources */,
 			);
@@ -1761,6 +1767,7 @@
 				D2B18B7F2360913400A9AEDC /* Control.swift in Sources */,
 				0AA33B3A2398524F0067DD0F /* Toggle.swift in Sources */,
 				D29DF12F21E6851E003B2FB9 /* MVMCoreUITopAlertMainView.m in Sources */,
+				942C378C2412F4FA0066E45E /* ModalMoleculeListTemplate.swift in Sources */,
 				012A88C8238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift in Sources */,
 				0A7EF86123D8AC2500B2AAD1 /* DigitEntryFieldModel.swift in Sources */,
 				DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */,
@@ -1860,6 +1867,7 @@
 				0A7EF85D23D8A95600B2AAD1 /* TextEntryFieldModel.swift in Sources */,
 				D2D6CD4222E78FAB00D701B8 /* ThreeLayerTemplate.swift in Sources */,
 				01EB368F23609801006832FA /* LabelModel.swift in Sources */,
+				942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */,
 				0105618F224BBE7700E1557D /* FormValidator+FormParams.swift in Sources */,
 				01F2A03223A4498200D954D8 /* CaretLinkModel.swift in Sources */,
 				0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */,
@@ -1873,6 +1881,7 @@
 				D29DF18321E69E54003B2FB9 /* SeparatorView.m in Sources */,
 				D29DF17A21E69E1F003B2FB9 /* MFCustomButton.m in Sources */,
 				017BEB7B236763000024EF95 /* LineModel.swift in Sources */,
+				D256E9932412880000360572 /* Header.swift in Sources */,
 				94C2D9A523872C350006CF46 /* LabelAttributeFontModel.swift in Sources */,
 				011D95AF2407266E000E3791 /* RadioButtonModel.swift in Sources */,
 				017BEB7F23676E870024EF95 /* MoleculeObjectMapping.swift in Sources */,
@@ -1998,7 +2007,6 @@
 				D22D1F1B220341F60077CEC0 /* MVMCoreUICheckBox.m in Sources */,
 				C695A69823C990C200BFB94E /* DoughnutChartView.swift in Sources */,
 				D29DF2CB21E7BFCC003B2FB9 /* MFSizeThreshold.m in Sources */,
-				946EE1BA237B66D80036751F /* MoleculeModelHelper.swift in Sources */,
 				01509D932327ECFB00EF99AA /* ProgressBar.swift in Sources */,
 				D260106523D0CEA700764D80 /* StackModel.swift in Sources */,
 				D29770F521F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.m in Sources */,

MVMCoreUI/Atoms/Buttons/ButtonModel.swift

@@ -75,7 +75,7 @@ public class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol {
 
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         title = try typeContainer.decode(String.self, forKey: .title)
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModel(codingKey: .action)
         required = try typeContainer.decodeIfPresent(Bool.self, forKey: .required)
         requiredGroups = try typeContainer.decodeIfPresent([String].self, forKey: .requiredGroups)
         if let style = try typeContainer.decodeIfPresent(ButtonStyle.self, forKey: .style) {

MVMCoreUI/Atoms/Buttons/CaretLinkModel.swift

@@ -46,7 +46,7 @@ public class CaretLinkModel: ButtonModelProtocol, MoleculeModelProtocol {
         if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
             self.enabled = enabled
         }
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModel(codingKey: .action)
     }
 
     public func encode(to encoder: Encoder) throws {

MVMCoreUI/Atoms/Buttons/Link/LinkModel.swift

@@ -55,7 +55,7 @@ open class LinkModel: ButtonModelProtocol, MoleculeModelProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         title = try typeContainer.decode(String.self, forKey: .title)
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModel(codingKey: .action)
         
         if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
             self.enabled = enabled

MVMCoreUI/Atoms/Views/Checkbox.swift

@@ -19,9 +19,8 @@ import MVMCore
     public var sizeObject: MFSizeObject? = MFSizeObject(standardSize: Checkbox.defaultHeightWidth, standardiPadPortraitSize: Checkbox.defaultHeightWidth + 6.0)
     
     // Form Validation
-    var isRequired = false
     var fieldKey: String?
-    var fieldValue: String?
+    var fieldValue: JSONValue?
     var groupName: String?
     var delegateObject: MVMCoreUIDelegateObject?
     
@@ -398,64 +397,6 @@ import MVMCore
         //layoutIfNeeded()
     }
     
-    public override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        self.delegateObject = delegateObject
-        FormValidator.setupValidation(molecule: self, delegate: delegateObject?.formValidationProtocol)
-        
-        guard let dictionary = json else { return }
-        
-        groupName = dictionary.optionalStringForKey("groupName")
-        fieldValue = dictionary.optionalStringForKey("value")
-        if let fieldKey = dictionary[KeyFieldKey] as? String {
-            self.fieldKey = fieldKey
-        }
-        
-        if let isRequired = dictionary[KeyRequired] as? Bool {
-            self.isRequired = isRequired
-        }
-        
-        if let borderColorHex = dictionary["borderColor"] as? String {
-            layer.borderColor = UIColor.mfGet(forHex: borderColorHex).cgColor
-        }
-        
-        if let borderWidth = dictionary["borderWidth"] as? CGFloat {
-            layer.borderWidth = borderWidth
-        }
-        
-        if let checkColorHex = dictionary["checkColor"] as? String {
-            checkColor = UIColor.mfGet(forHex: checkColorHex)
-        }
-        
-        if let isChecked = dictionary["isChecked"] as? Bool, isChecked {
-            checkAndBypassAnimations(selected: isChecked)
-        }
-        
-        if let unCheckedBackgroundColorHex = dictionary["unCheckedBackgroundColor"] as? String {
-            unCheckedBackgroundColor = UIColor.mfGet(forHex: unCheckedBackgroundColorHex)
-        }
-        
-        if let checkedBackgroundColorHex = dictionary["checkedBackgroundColor"] as? String {
-            checkedBackgroundColor = UIColor.mfGet(forHex: checkedBackgroundColorHex)
-        }
-        
-        if let isAnimated = dictionary["isAnimated"] as? Bool {
-            self.isAnimated = isAnimated
-        }
-        
-        if let isRound = dictionary["isRound"] as? Bool {
-            self.isRound = isRound
-        }
-        
-        if let enabled = dictionary["isEnabled"] as? Bool {
-            isEnabled = enabled
-        }
-        
-        if let actionMap = dictionary.optionalDictionaryForKey("action") {
-            actionBlock = { MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject) }
-        }
-    }
-    
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         
@@ -465,8 +406,7 @@ import MVMCore
         FormValidator.setupValidation(molecule: self, delegate: delegateObject?.formValidationProtocol)
         
         groupName = model.groupName
-        fieldValue = model.value
+        fieldValue = model.fieldValue
-        isRequired = model.required
         
         if let fieldKey = model.fieldKey {
             self.fieldKey = fieldKey
@@ -509,7 +449,7 @@ extension Checkbox: FormValidationFormFieldProtocol {
     }
     
     public func isValidField() -> Bool {
-        return isRequired ? isSelected : true
+        return (fieldKey != nil) ? isSelected : true
     }
     
     public func formFieldName() -> String? {
@@ -517,6 +457,6 @@ extension Checkbox: FormValidationFormFieldProtocol {
     }
     
     public func formFieldValue() -> Any? {
-        return isSelected ? fieldValue : nil
+        return fieldValue ?? (isSelected ? fieldValue : nil)
     }
 }

MVMCoreUI/Atoms/Views/CheckboxModel.swift

@@ -17,22 +17,22 @@ import Foundation
     public var backgroundColor: Color?
 
     public var groupName: String?
-    public var value: String?
     public var fieldKey: String?
-    public var required: Bool = false
+    public var fieldValue: JSONValue?
-    public var borderColor: Color = Color(uiColor: .black)
+
-    public var borderWidth: CGFloat = 1
     public var isChecked: Bool = false
+    public var isEnabled: Bool = true
+    public var isAnimated: Bool = true
+    public var isRound: Bool = false
+    public var borderWidth: CGFloat = 1
+    public var borderColor: Color = Color(uiColor: .black)
     public var checkColor: Color = Color(uiColor: .black)
     public var unCheckedBackgroundColor: Color = Color(uiColor: .clear)
     public var checkedBackgroundColor: Color = Color(uiColor: .clear)
-    public var isAnimated: Bool = true
-    public var isRound: Bool = false
-    public var isEnabled: Bool = true
-    public var action: ActionModelProtocol?
     public var disabledBackgroundColor: Color = Color(uiColor: .clear)
     public var disabledBorderColor: Color = Color(uiColor: .mvmCoolGray3)
     public var disabledCheckColor: Color = Color(uiColor: .mvmCoolGray3)
+    public var action: ActionModelProtocol?
     
     //--------------------------------------------------
     // MARK: - Keys
@@ -41,21 +41,20 @@ import Foundation
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case groupName
-        case value
         case fieldKey
-        case required
+        case fieldValue
-        case borderColor
+        case isChecked = "checked"
+        case isEnabled = "enabled"
+        case isAnimated = "animated"
+        case isRound = "round"
         case borderWidth
-        case isChecked
+        case borderColor
         case checkColor
         case unCheckedBackgroundColor
         case checkedBackgroundColor
         case disabledBackgroundColor
         case disabledCheckColor
         case disabledBorderColor
-        case isAnimated
-        case isRound
-        case isEnabled
         case action
     }
     
@@ -68,9 +67,8 @@ import Foundation
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         groupName = try typeContainer.decodeIfPresent(String.self, forKey: .groupName)
-        value = try typeContainer.decodeIfPresent(String.self, forKey: .value)
+        fieldValue = try typeContainer.decodeIfPresent(JSONValue.self, forKey: .fieldValue)
         fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
-        required = try typeContainer.decodeIfPresent(Bool.self, forKey: .required) ?? false
         borderWidth = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .borderWidth) ?? 1
         borderColor = try typeContainer.decodeIfPresent(Color.self, forKey: .borderColor) ?? Color(uiColor: .black)
         checkColor = try typeContainer.decodeIfPresent(Color.self, forKey: .checkColor) ?? Color(uiColor: .black)
@@ -83,16 +81,15 @@ import Foundation
         isAnimated = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAnimated) ?? true
         isRound = try typeContainer.decodeIfPresent(Bool.self, forKey: .isRound) ?? false
         isEnabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .isEnabled) ?? true
-        action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModelIfPresent(codingKey: .action)
     }
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(groupName, forKey: .groupName)
-        try container.encodeIfPresent(value, forKey: .value)
+        try container.encodeIfPresent(fieldValue, forKey: .fieldValue)
         try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
-        try container.encodeIfPresent(required, forKey: .required)
         try container.encodeIfPresent(borderColor, forKey: .borderColor)
         try container.encode(borderWidth, forKey: .borderWidth)
         try container.encode(isChecked, forKey: .isChecked)

MVMCoreUI/Atoms/Views/Label/LabelAttributeActionModel.swift

@@ -25,7 +25,7 @@ open class LabelAttributeActionModel: LabelAttributeModel {
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModel(codingKey: .action)
         try super.init(from: decoder)
     }
     

MVMCoreUI/Atoms/Views/Label/LabelModel.swift

@@ -74,7 +74,7 @@ import Foundation
         fontName = try typeContainer.decodeIfPresent(String.self, forKey: .fontName)
         fontSize = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .fontSize)
         textAlignment = try typeContainer.decodeIfPresent(String.self, forKey: .textAlignment)
-        attributes = try typeContainer.decodeModelsIfPresent(codingKey: .attributes, typeCodingKey: AttributeTypeKey.type) as? [LabelAttributeModel]
+        attributes = try typeContainer.decodeModelsIfPresent(codingKey: .attributes)
         html = try typeContainer.decodeIfPresent(String.self, forKey: .html)
         hero = try typeContainer.decodeIfPresent(Int.self, forKey: .hero)
         makeWholeViewClickable = try typeContainer.decodeIfPresent(Bool.self, forKey: .makeWholeViewClickable)
@@ -91,10 +91,7 @@ import Foundation
         try container.encodeIfPresent(fontName, forKey: .fontName)
         try container.encodeIfPresent(fontSize, forKey: .fontSize)
         try container.encodeIfPresent(textAlignment, forKey: .textAlignment)
-        var attributeContainer = container.nestedUnkeyedContainer(forKey: .attributes)
+        try container.encodeModelsIfPresent(attributes, forKey: .attributes)
-        try attributes?.forEach { attributeModel in
-            try attributeContainer.encode(attributeModel)
-        }
         try container.encodeIfPresent(html, forKey: .html)
         try container.encodeIfPresent(hero, forKey: .hero)
         try container.encodeIfPresent(makeWholeViewClickable, forKey: .makeWholeViewClickable)

MVMCoreUI/Atoms/Views/ToggleModel.swift

@@ -36,8 +36,8 @@ public class ToggleModel: MoleculeModelProtocol {
         if let state = try typeContainer.decodeIfPresent(Bool.self, forKey: .state) {
             self.state = state
         }
-        action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModelIfPresent(codingKey: .action)
-        alternateAction = try typeContainer.decodeModelIfPresent(codingKey: .alternateAction, typeCodingKey: ActionCodingKey.actionType)
+        alternateAction = try typeContainer.decodeModelIfPresent(codingKey: .alternateAction)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         required = try typeContainer.decodeIfPresent(Bool.self, forKey: .required)
         fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)

MVMCoreUI/Containers/Views/MoleculeContainerModel.swift

@@ -22,7 +22,7 @@ public class MoleculeContainerModel: ContainerModel, MoleculeContainerModelProto
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecule = try typeContainer.decodeMolecule(codingKey: .molecule)
+        molecule = try typeContainer.decodeModel(codingKey: .molecule)
         try super.init(from: decoder)
     }
               

MVMCoreUI/Models/Extensions/MoleculeModelHelper.swift

@@ -1,53 +0,0 @@
-//
-//  MoleculeModelHelper.swift
-//  MVMCoreUI
-//
-//  Created by Ryan on 11/12/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-import Foundation
-
-
-extension KeyedDecodingContainer where Key: CodingKey {
-    
-    private enum TypeCodingKey: String, CodingKey {
-        case moleculeName
-    }
-    
-    /// Decodes the molecule model with the given coding key based on moleculeName
-    public func decodeMolecule(codingKey: KeyedDecodingContainer<K>.Key) throws -> MoleculeModelProtocol {
-        return try decodeModel(codingKey: codingKey, typeCodingKey: TypeCodingKey.moleculeName)
-    }
-    
-    /// Decodes the molecule model with the given coding key based on moleculeName, optional
-    public func decodeMoleculeIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> MoleculeModelProtocol? {
-        return try decodeModelIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.moleculeName)
-    }
-    
-    /// Decodes the list of molecule models with the given coding key based on moleculeName
-    public func decodeMolecules(codingKey: KeyedDecodingContainer<K>.Key) throws -> [MoleculeModelProtocol] {
-        guard let models = try decodeModels(codingKey: codingKey, typeCodingKey: TypeCodingKey.moleculeName) as? [MoleculeModelProtocol] else {
-            throw ModelRegistry.Error.decoderError
-        }
-        return models
-    }
-    
-    /// Decodes the list of molecule models with the given coding key based on moleculeName, optional
-    public func decodeMoleculesIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> [MoleculeModelProtocol]? {
-        return try decodeModelsIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.moleculeName) as? [MoleculeModelProtocol]
-    }
-    
-    /// Decodes an array with arrays of molecules based on the identifiers, optional.
-    public func decodeMolecules2DIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> [[MoleculeModelProtocol]]? {
-        return try decodeModels2DIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.moleculeName) as? [[MoleculeModelProtocol]]
-    }
-    
-    /// Decodes an array with arrays of models based on the identifiers.
-    public func decodeMolecules2D(codingKey: KeyedDecodingContainer<K>.Key) throws -> [[MoleculeModelProtocol]] {
-        guard let models = try decodeModels2D(codingKey: codingKey, typeCodingKey: TypeCodingKey.moleculeName) as? [[MoleculeModelProtocol]] else {
-            throw ModelRegistry.Error.decoderError
-        }
-        return models
-    }
-}

MVMCoreUI/Molecules/Header.swift

@@ -0,0 +1,63 @@
+//
+//  Header.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 3/6/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+open class HeaderView: Container {
+    public let line = Line()
+    
+    /// Convenience for doing some default setting
+    open var molecule: (UIView & MVMCoreUIMoleculeViewProtocol)?
+
+    var headerModel: HeaderModel? {
+        get { return model as? HeaderModel }
+    }
+    
+    /// Convenience function to add a molecule to the view.
+    open func addMolecule(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) {
+        addSubview(molecule)
+        containerHelper.constrainView(molecule)
+        self.molecule = molecule
+    }
+    
+    // MARK: - MVMCoreViewProtocol
+    open override func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        line.updateView(size)
+        molecule?.updateView(size)
+    }
+    
+    public override func setupView() {
+        super.setupView()
+        line.setStyle(.heavy)
+        addSubview(line)
+        NSLayoutConstraint.pinViewBottom(toSuperview: line, useMargins: false, constant: 0).isActive = true
+        NSLayoutConstraint.pinViewLeft(toSuperview: line, useMargins: true, constant: 0).isActive = true
+        NSLayoutConstraint.pinViewRight(toSuperview: line, useMargins: true, constant: 0).isActive = true
+    }
+    
+    // MARK: - MVMCoreUIMoleculeViewProtocol
+    open override func reset() {
+        super.reset()
+        line.setStyle(.heavy)
+        molecule?.reset?()
+    }
+
+    // MARK: - ModelMoleculeViewProtocol
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        guard let headerModel = headerModel else { return }
+        if let lineModel = headerModel.line {
+            line.set(with: lineModel, delegateObject, additionalData)
+        }
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return PaddingDefaultVerticalSpacing + PaddingDefaultVerticalSpacing
+    }
+}

MVMCoreUI/Molecules/Items/AccordionListItemModel.swift

@@ -29,10 +29,7 @@ class AccordionListItemModel: MoleculeListItemModel {
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        guard let molecules = try typeContainer.decodeMolecules(codingKey: .molecules) as? [ListItemModelProtocol & MoleculeModelProtocol] else {
+        molecules = try typeContainer.decodeModels(codingKey: .molecules)
-            throw DecodingError.typeMismatch([ListItemModelProtocol & MoleculeModelProtocol].self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "Casting failed"))
-        }
-        self.molecules = molecules
         if let hideLine = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideLineWhenExpanded) {
             hideLineWhenExpanded = hideLine
         }

MVMCoreUI/Molecules/Items/DropDownListItemModel.swift

@@ -51,7 +51,7 @@ import Foundation
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as? [[ListItemModelProtocol & MoleculeModelProtocol]] ?? [[]]
+        molecules = try typeContainer.decodeModels2D(codingKey: .molecules)
         dropDown = try typeContainer.decode(ItemDropdownEntryFieldModel.self, forKey: .dropDown)
         try super.init(from: decoder)
     }

MVMCoreUI/Molecules/Items/ListItemModel.swift

@@ -65,7 +65,7 @@ import Foundation
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        action = try typeContainer.decodeModelIfPresent(codingKey: .action)
         hideArrow = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideArrow)
         line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
         style = try typeContainer.decodeIfPresent(String.self, forKey: .style)

MVMCoreUI/Molecules/Items/MoleculeListItemModel.swift

@@ -27,7 +27,7 @@ import MVMCore
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecule = try typeContainer.decodeMolecule(codingKey: .molecule)
+        molecule = try typeContainer.decodeModel(codingKey: .molecule)
         try super.init(from: decoder)
     }
 

MVMCoreUI/Molecules/Items/TabsListItemModel.swift

@@ -37,7 +37,7 @@ public class TabsListItemModel: ListItemModel, MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         tabs = try typeContainer.decode(TabsModel.self, forKey: .tabs)
-        molecules = try typeContainer.decodeMolecules2D(codingKey: .molecules) as! [[ListItemModelProtocol & MoleculeModelProtocol]]
+        molecules = try typeContainer.decodeModels2D(codingKey: .molecules)
         try super.init(from: decoder)
     }
               

MVMCoreUI/Molecules/LeftRightViews/CornerLabelsModel.swift

@@ -34,7 +34,7 @@ public class CornerLabelsModel: MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        molecule = try typeContainer.decodeMoleculeIfPresent(codingKey: .molecule)
+        molecule = try typeContainer.decodeModelIfPresent(codingKey: .molecule)
         topLeftLabel = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .topLeftLabel)
         topRightLabel = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .topRightLabel)
         bottomLeftLabel = try typeContainer.decodeIfPresent(LabelModel.self, forKey: .bottomLeftLabel)

MVMCoreUI/Molecules/MoleculeHeaderModel.swift

@@ -24,7 +24,7 @@ import Foundation
 
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        molecule = try typeContainer.decodeMolecule(codingKey: .molecule)
+        molecule = try typeContainer.decodeModel(codingKey: .molecule)
         try super.init(from: decoder)
     }
     

MVMCoreUI/Molecules/VerticalCombinationViews/Lists/NumberedListModel.swift

@@ -23,7 +23,7 @@ import Foundation
     public required init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
 
-        let list = try typeContainer.decodeMolecules(codingKey: .list)
+        let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list)
         var models: [MoleculeStackItemModel] = []
         for (index, molecule) in list.enumerated() {
             models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: "\(index+1).", molecule: molecule)))

MVMCoreUI/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeModel.swift

@@ -30,7 +30,7 @@ public class StringAndMoleculeModel: MoleculeModelProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         string = try typeContainer.decode(String.self, forKey: .string)
-        molecule = try typeContainer.decodeMolecule(codingKey: .molecule)
+        molecule = try typeContainer.decodeModel(codingKey: .molecule)
     }
     
     public func encode(to encoder: Encoder) throws {

MVMCoreUI/Molecules/VerticalCombinationViews/Lists/UnOrderedListModel.swift

@@ -28,7 +28,7 @@ import Foundation
             self.bulletChar = bulletChar
         }
 
-        let list = try typeContainer.decodeMolecules(codingKey: .list)
+        let list: [MoleculeModelProtocol] = try typeContainer.decodeModels(codingKey: .list)
         var models: [MoleculeStackItemModel] = []
         for molecule in list {
             models.append(MoleculeStackItemModel(with: StringAndMoleculeModel(string: bulletChar, molecule: molecule)))

MVMCoreUI/Organisms/CarouselModel.swift

@@ -48,7 +48,7 @@ import UIKit
         self.height = try typeContainer.decode(Float.self, forKey: .height)
         self.itemWidthPercent = try typeContainer.decode(Float.self, forKey: .itemWidthPercent)
         self.itemAlignment = try typeContainer.decode(String.self, forKey: .itemAlignment)
-        self.pagingMolecule = try typeContainer.decodeMoleculeIfPresent(codingKey: .pagingMolecule) as? CarouselPagingModelProtocol
+        self.pagingMolecule = try typeContainer.decodeModelIfPresent(codingKey: .pagingMolecule)
    }
 
    public func encode(to encoder: Encoder) throws {

MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m

@@ -22,7 +22,9 @@
                                    @"stack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackTemplate class]],
                                    @"centerMoleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackCenteredTemplate class]],
                                    @"list" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeListTemplate class]],
-                                   @"threeLayer" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ThreeLayerTemplate class]]
+                                   @"threeLayer" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ThreeLayerTemplate class]],
+                                   @"stackModal" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ModalMoleculeStackTemplate class]],
+                                   @"listModal" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ModalMoleculeListTemplate class]]
                                    } mutableCopy];
     });
     return viewControllerMapping;

MVMCoreUI/Templates/ListPageTemplateModel.swift

@@ -57,10 +57,10 @@ import Foundation
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         pageType = try typeContainer.decode(String.self, forKey: .pageType)
         screenHeading = try typeContainer.decodeIfPresent(String.self, forKey: .screenHeading)
-        molecules = try typeContainer.decodeMoleculesIfPresent(codingKey: .molecules) as? [ListItemModelProtocol & MoleculeModelProtocol]
+        molecules = try typeContainer.decodeModelsIfPresent(codingKey: .molecules)
         isAtomicTabs = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAtomicTabs)
-        header = try typeContainer.decodeMoleculeIfPresent(codingKey: .header)
+        header = try typeContainer.decodeModelIfPresent(codingKey: .header)
-        footer = try typeContainer.decodeMoleculeIfPresent(codingKey: .footer)
+        footer = try typeContainer.decodeModelIfPresent(codingKey: .footer)
         line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
     }
 

MVMCoreUI/Templates/ModalMoleculeListTemplate.swift

@@ -0,0 +1,20 @@
+//
+//  ModalMoleculeListTemplate.swift
+//  MVMCoreUI
+//
+//  Created by Ryan on 3/6/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+open class ModalMoleculeListTemplate: MoleculeListTemplate {
+    
+    override open func newDataBuildScreen() {
+        super.newDataBuildScreen()
+        MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
+            self?.dismiss()
+        }, verticalCentered: false)
+    }
+
+}

MVMCoreUI/Templates/ModalMoleculeStackTemplate.swift

@@ -0,0 +1,20 @@
+//
+//  ModalMoleculeStackTemplate.swift
+//  MVMCoreUI
+//
+//  Created by Ryan on 3/6/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+open class ModalMoleculeStackTemplate: MoleculeStackTemplate {
+    
+    override open func newDataBuildScreen() {
+        super.newDataBuildScreen()
+        MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
+            self?.dismiss()
+        }, verticalCentered: false)
+    }
+
+}

MVMCoreUI/Templates/StackPageTemplateModel.swift

@@ -40,8 +40,8 @@ import Foundation
         moleculeStack = try typeContainer.decode(MoleculeStackModel.self, forKey: .stack)
         screenHeading = try typeContainer.decodeIfPresent(String.self, forKey: .screenHeading)
         isAtomicTabs = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAtomicTabs)
-        header = try typeContainer.decodeMoleculeIfPresent(codingKey: .header)
+        header = try typeContainer.decodeModelIfPresent(codingKey: .header)
-        footer = try typeContainer.decodeMoleculeIfPresent(codingKey: .footer)
+        footer = try typeContainer.decodeModelIfPresent(codingKey: .footer)
     }
 
     public func encode(to encoder: Encoder) throws {

MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift

@@ -40,9 +40,9 @@ import Foundation
         pageType = try typeContainer.decode(String.self, forKey: .pageType)
         screenHeading = try typeContainer.decodeIfPresent(String.self, forKey: .screenHeading)
         isAtomicTabs = try typeContainer.decodeIfPresent(Bool.self, forKey: .isAtomicTabs)
-        header = try typeContainer.decodeMoleculeIfPresent(codingKey: .header)
+        header = try typeContainer.decodeModelIfPresent(codingKey: .header)
-        middle = try typeContainer.decodeMoleculeIfPresent(codingKey: .middle)
+        middle = try typeContainer.decodeModelIfPresent(codingKey: .middle)
-        footer = try typeContainer.decodeMoleculeIfPresent(codingKey: .footer)
+        footer = try typeContainer.decodeModelIfPresent(codingKey: .footer)
     }
 
     public func encode(to encoder: Encoder) throws {

MVMCoreUI/Utility/MFFonts.h

@@ -14,6 +14,9 @@ extern NSString * _Nonnull const DSBold;
 extern NSString * _Nonnull const DSRegular;
 extern NSString * _Nonnull const TXBold;
 extern NSString * _Nonnull const TXRegular;
+//2.0 font
+extern NSString * _Nonnull const DS75Bd;
+extern NSString * _Nonnull const DS55Rg;
 
 @interface MFFonts : NSObject
 

MVMCoreUI/Utility/MFFonts.m

@@ -17,6 +17,10 @@ NSString * const DSRegular = @"VerizonNHGeDS-Regular";
 NSString * const TXBold = @"VerizonNHGeTX-Bold";
 NSString * const TXRegular = @"VerizonNHGeTX-Regular";
 
+//2.0 font
+NSString * const DS75Bd = @"NHaasGroteskDSStd-75Bd";
+NSString * const DS55Rg = @"NHaasGroteskDSStd-55Rg";
+
 
 @implementation MFFonts
 
@@ -27,6 +31,8 @@ NSString * const TXRegular = @"VerizonNHGeTX-Regular";
         [MFFonts loadFont:DSRegular type:@"otf"];
         [MFFonts loadFont:TXBold type:@"otf"];
         [MFFonts loadFont:TXRegular type:@"otf"];
+        [MFFonts loadFont:DS75Bd type:@"otf"];
+        [MFFonts loadFont:DS55Rg type:@"otf"];
         [MFFonts loadFont:@"OCRAExtended" type:@"ttf"];
     });
 }
@@ -49,50 +55,44 @@ NSString * const TXRegular = @"VerizonNHGeTX-Regular";
 }
 
 + (nonnull UIFont *)mfFontDSBold:(CGFloat)size {
+    [self loadMVMFonts];
     UIFont *font = [UIFont fontWithName:DSBold size:size];
     [self validFont:font fontName:DSBold];
     return font ?: [UIFont boldSystemFontOfSize:size];
 }
 
 + (nonnull UIFont *)mfFontDSRegular:(CGFloat)size {
+    [self loadMVMFonts];
     UIFont *font = [UIFont fontWithName:DSRegular size:size];
     [self validFont:font fontName:DSRegular];
     return font ?: [UIFont systemFontOfSize:size];
 }
 
 + (nonnull UIFont *)mfFontTXBold:(CGFloat)size {
+    [self loadMVMFonts];
     UIFont *font = [UIFont fontWithName:TXBold size:size];
     [self validFont:font fontName:TXBold];
     return font ?: [UIFont boldSystemFontOfSize:size];
 }
 
 + (nonnull UIFont *)mfFontTXRegular:(CGFloat)size {
+    [self loadMVMFonts];
     UIFont *font = [UIFont fontWithName:TXRegular size:size];
     [self validFont:font fontName:TXRegular];
     return font ?: [UIFont systemFontOfSize:size];
 }
 
 
-+ (UIFont *)mfFont75Bd:(CGFloat)size {
++ (nonnull UIFont *)mfFont75Bd:(CGFloat)size {
     [self loadMVMFonts];
-    UIFont *font;
+    UIFont *font = [UIFont fontWithName:DS75Bd size:size];
-    if (size >= 15) {
+    return font ?: [UIFont boldSystemFontOfSize:size];
-        font = [self mfFontDSBold:size];
-    } else {
-        font = [self mfFontTXBold:size];
-    }
-    return font;
 }
 
-+ (UIFont *)mfFont55Rg:(CGFloat)size {
++ (nonnull UIFont *)mfFont55Rg:(CGFloat)size {
     [self loadMVMFonts];
-    UIFont *font;
+    UIFont *font = [UIFont fontWithName:DS55Rg size:size];
-    if (size >= 15) {
+    return font ?: [UIFont systemFontOfSize:size];
-        font = [self mfFontDSRegular:size];
-    } else {
-        font = [self mfFontTXRegular:size];
-    }
-    return font;
 }
 
 + (nullable UIFont *)mfFontOcratxt:(CGFloat)size {