merging fix

MVMCoreUI.xcodeproj/project.pbxproj

@@ -35,11 +35,10 @@
 		012A88C2238D7BCA00FE3DA1 /* CarouselItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88C1238D7BCA00FE3DA1 /* CarouselItemModel.swift */; };
 		012A88C4238D86E600FE3DA1 /* CarouselItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88C3238D86E600FE3DA1 /* CarouselItemModelProtocol.swift */; };
 		012A88C6238DA34000FE3DA1 /* ModuleMoleculeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88C5238DA34000FE3DA1 /* ModuleMoleculeModel.swift */; };
-		012A88C8238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88C7238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift */; };
+		012A88C8238DB02000FE3DA1 /* MoleculeDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88C7238DB02000FE3DA1 /* MoleculeDelegateProtocol.swift */; };
 		012A88DB238ED45900FE3DA1 /* CarouselModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88AE238C626E00FE3DA1 /* CarouselModel.swift */; };
 		012A88EC238F084D00FE3DA1 /* FooterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88EB238F084D00FE3DA1 /* FooterModel.swift */; };
 		012A88F123985E0100FE3DA1 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A88F023985E0100FE3DA1 /* Color.swift */; };
-		012CA99E2385A2D3003F810F /* MFView+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */; };
 		013F801923FB4A8E00AD8013 /* UIContentMode+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013F801823FB4A8E00AD8013 /* UIContentMode+Extension.swift */; };
 		014AA72423C501E2006F3E93 /* MoleculeContainerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014AA72123C501E2006F3E93 /* MoleculeContainerModel.swift */; };
 		014AA72523C501E2006F3E93 /* ContainerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014AA72223C501E2006F3E93 /* ContainerModel.swift */; };
@@ -54,10 +53,7 @@
 		01509D952327ED1900EF99AA /* HeadlineBodyLinkToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01509D942327ED1900EF99AA /* HeadlineBodyLinkToggle.swift */; };
 		017BEB382360C6AC0024EF95 /* RadioButtonLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB372360C6AC0024EF95 /* RadioButtonLabel.swift */; };
 		017BEB3C2361EA1D0024EF95 /* MFViewController+Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB3B2361EA1D0024EF95 /* MFViewController+Model.swift */; };
-		017BEB4023620A230024EF95 /* TextFieldModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB3F23620A230024EF95 /* TextFieldModel.swift */; };
-		017BEB442362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB432362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift */; };
 		017BEB48236230DB0024EF95 /* MoleculeViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB47236230DB0024EF95 /* MoleculeViewProtocol.swift */; };
-		017BEB4A236235BA0024EF95 /* ModelMoleculeViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB49236235BA0024EF95 /* ModelMoleculeViewProtocol.swift */; };
 		017BEB7B236763000024EF95 /* LineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB7A236763000024EF95 /* LineModel.swift */; };
 		017BEB7F23676E870024EF95 /* MoleculeObjectMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017BEB7E23676E870024EF95 /* MoleculeObjectMapping.swift */; };
 		0198F7A62256A80B0066C936 /* MFRadioButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 0198F7A02256A80A0066C936 /* MFRadioButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -196,6 +192,8 @@
 		C7192E7D23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7192E7C23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift */; };
 		C7F8012123E8303200396FBD /* ListRVWheel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7F8012023E8303200396FBD /* ListRVWheel.swift */; };
 		C7F8012323E846C300396FBD /* ListRVWheelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7F8012223E846C300396FBD /* ListRVWheelModel.swift */; };
+		D202AFE4242A5F5E00E5BEDF /* NSTextAlignment+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D202AFE3242A5F5E00E5BEDF /* NSTextAlignment+Extension.swift */; };
+		D202AFE6242A6A9C00E5BEDF /* UICollectionViewScrollPosition+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D202AFE5242A6A9C00E5BEDF /* UICollectionViewScrollPosition+Extension.swift */; };
 		D20A9A5E2243D3E300ADE781 /* TwoButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */; };
 		D20FB165241A5D75004AFC3A /* NavigationItemModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20FB164241A5D75004AFC3A /* NavigationItemModelProtocol.swift */; };
 		D213347723843825008E41B3 /* Line.swift in Sources */ = {isa = PBXBuildFile; fileRef = D213347623843825008E41B3 /* Line.swift */; };
@@ -221,7 +219,6 @@
 		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 */; };
 		D260105B23D0BB7100764D80 /* StackModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105A23D0BB7100764D80 /* StackModelProtocol.swift */; };
 		D260105D23D0BCD400764D80 /* Stack.swift in Sources */ = {isa = PBXBuildFile; fileRef = D260105C23D0BCD400764D80 /* Stack.swift */; };
@@ -242,7 +239,6 @@
 		D282AAB4223FDDAE00C46919 /* MFLoadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */; };
 		D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */; };
 		D282AACB2243C61700C46919 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D282AACA2243C61700C46919 /* ButtonView.swift */; };
-		D28A837723C79FC600DFE4FC /* MFCustomButton+ActionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837623C79FC600DFE4FC /* MFCustomButton+ActionModel.swift */; };
 		D28A837923C7D5BC00DFE4FC /* PageModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */; };
 		D28A837B23C928DA00DFE4FC /* MoleculeListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */; };
 		D28A837D23CCA86A00DFE4FC /* TabsListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */; };
@@ -252,7 +248,6 @@
 		D28A838523CCCA8900DFE4FC /* ScrollerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838423CCCA8900DFE4FC /* ScrollerModel.swift */; };
 		D28A838923CCCFCB00DFE4FC /* LinkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838823CCCFCB00DFE4FC /* LinkModel.swift */; };
 		D28A838B23CCDA6B00DFE4FC /* ButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838A23CCDA6B00DFE4FC /* ButtonModel.swift */; };
-		D28A838D23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838C23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift */; };
 		D28A838F23CCDEDE00DFE4FC /* TwoButtonViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */; };
 		D28A839123CD4FD400DFE4FC /* CornerLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A839023CD4FD400DFE4FC /* CornerLabelsModel.swift */; };
 		D28A839323CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */; };
@@ -357,9 +352,6 @@
 		D29E28D823D21AB800ACEA85 /* StringAndMoleculeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D29E28D723D21AB800ACEA85 /* StringAndMoleculeView.swift */; };
 		D29E28DA23D21AFA00ACEA85 /* StringAndMoleculeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D29E28D923D21AFA00ACEA85 /* StringAndMoleculeModel.swift */; };
 		D29E28DD23D7404C00ACEA85 /* ContainerHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D29E28DC23D7404C00ACEA85 /* ContainerHelper.swift */; };
-		D2A514582211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.h in Headers */ = {isa = PBXBuildFile; fileRef = D2A514562211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D2A514592211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A514572211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m */; };
-		D2A5145D2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D2A5145C2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D2A5145F2211DDC100345BFB /* MoleculeStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5145E2211DDC100345BFB /* MoleculeStackView.swift */; };
 		D2A5146122121FBF00345BFB /* MoleculeStackTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */; };
 		D2A514632213643100345BFB /* MoleculeStackCenteredTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */; };
@@ -437,10 +429,9 @@
 		012A88C1238D7BCA00FE3DA1 /* CarouselItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselItemModel.swift; sourceTree = "<group>"; };
 		012A88C3238D86E600FE3DA1 /* CarouselItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselItemModelProtocol.swift; sourceTree = "<group>"; };
 		012A88C5238DA34000FE3DA1 /* ModuleMoleculeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModuleMoleculeModel.swift; sourceTree = "<group>"; };
-		012A88C7238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMoleculeDelegateProtocol.swift; sourceTree = "<group>"; };
+		012A88C7238DB02000FE3DA1 /* MoleculeDelegateProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeDelegateProtocol.swift; sourceTree = "<group>"; };
 		012A88EB238F084D00FE3DA1 /* FooterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterModel.swift; sourceTree = "<group>"; };
 		012A88F023985E0100FE3DA1 /* Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
-		012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFView+ModelExtension.swift"; sourceTree = "<group>"; };
 		013F801823FB4A8E00AD8013 /* UIContentMode+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIContentMode+Extension.swift"; sourceTree = "<group>"; };
 		014AA72123C501E2006F3E93 /* MoleculeContainerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoleculeContainerModel.swift; sourceTree = "<group>"; };
 		014AA72223C501E2006F3E93 /* ContainerModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContainerModel.swift; sourceTree = "<group>"; };
@@ -455,10 +446,7 @@
 		01509D942327ED1900EF99AA /* HeadlineBodyLinkToggle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeadlineBodyLinkToggle.swift; sourceTree = "<group>"; };
 		017BEB372360C6AC0024EF95 /* RadioButtonLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioButtonLabel.swift; sourceTree = "<group>"; };
 		017BEB3B2361EA1D0024EF95 /* MFViewController+Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFViewController+Model.swift"; sourceTree = "<group>"; };
-		017BEB3F23620A230024EF95 /* TextFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldModel.swift; sourceTree = "<group>"; };
-		017BEB432362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MVMCoreUIMoleculeMappingObject+ModelExtension.swift"; sourceTree = "<group>"; };
 		017BEB47236230DB0024EF95 /* MoleculeViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeViewProtocol.swift; sourceTree = "<group>"; };
-		017BEB49236235BA0024EF95 /* ModelMoleculeViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMoleculeViewProtocol.swift; sourceTree = "<group>"; };
 		017BEB7A236763000024EF95 /* LineModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineModel.swift; sourceTree = "<group>"; };
 		017BEB7E23676E870024EF95 /* MoleculeObjectMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeObjectMapping.swift; sourceTree = "<group>"; };
 		0198F7A02256A80A0066C936 /* MFRadioButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFRadioButton.h; sourceTree = "<group>"; };
@@ -570,8 +558,8 @@
 		AAA74A182410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2NoButtonsBodyTextModel.swift; sourceTree = "<group>"; };
 		BB47A585241615EF002BB23C /* ListOneColumnFullWidthTextDividerSubsectionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextDividerSubsectionModel.swift; sourceTree = "<group>"; };
 		BB47A587241615FA002BB23C /* ListOneColumnFullWidthTextDividerSubsection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextDividerSubsection.swift; sourceTree = "<group>"; };
-		BB6C6ABE242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTallModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListOneColumnTextWithWhitespaceDividerTallModel.swift; path = MVMCoreUI/Molecules/DesignedComponents/List/OneColumn/ListOneColumnTextWithWhitespaceDividerTallModel.swift; sourceTree = SOURCE_ROOT; };
+		BB6C6ABE242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTallModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerTallModel.swift; sourceTree = "<group>"; };
-		BB6C6ABF242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListOneColumnTextWithWhitespaceDividerTall.swift; path = MVMCoreUI/Molecules/DesignedComponents/List/OneColumn/ListOneColumnTextWithWhitespaceDividerTall.swift; sourceTree = SOURCE_ROOT; };
+		BB6C6ABF242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerTall.swift; sourceTree = "<group>"; };
 		BB6C6AC62422528F005F7224 /* ListOneColumnTextWithWhitespaceDividerShort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerShort.swift; sourceTree = "<group>"; };
 		BB6C6AC72422528F005F7224 /* ListOneColumnTextWithWhitespaceDividerShortModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListOneColumnTextWithWhitespaceDividerShortModel.swift; sourceTree = "<group>"; };
 		C003506023AA94CD00B6AC29 /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
@@ -587,6 +575,8 @@
 		C7192E7C23C301750050C2A0 /* HeadLineBodyCaretLinkImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadLineBodyCaretLinkImage.swift; sourceTree = "<group>"; };
 		C7F8012023E8303200396FBD /* ListRVWheel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListRVWheel.swift; sourceTree = "<group>"; };
 		C7F8012223E846C300396FBD /* ListRVWheelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRVWheelModel.swift; sourceTree = "<group>"; };
+		D202AFE3242A5F5E00E5BEDF /* NSTextAlignment+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTextAlignment+Extension.swift"; sourceTree = "<group>"; };
+		D202AFE5242A6A9C00E5BEDF /* UICollectionViewScrollPosition+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionViewScrollPosition+Extension.swift"; sourceTree = "<group>"; };
 		D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoButtonView.swift; sourceTree = "<group>"; };
 		D20FB164241A5D75004AFC3A /* NavigationItemModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationItemModelProtocol.swift; sourceTree = "<group>"; };
 		D213347623843825008E41B3 /* Line.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Line.swift; sourceTree = "<group>"; };
@@ -612,7 +602,6 @@
 		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>"; };
 		D260105A23D0BB7100764D80 /* StackModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackModelProtocol.swift; sourceTree = "<group>"; };
 		D260105C23D0BCD400764D80 /* Stack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stack.swift; sourceTree = "<group>"; };
@@ -632,7 +621,6 @@
 		D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFLoadImageView.swift; sourceTree = "<group>"; };
 		D282AAB9224131D100C46919 /* MFTransparentGIFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MFTransparentGIFView.swift; sourceTree = "<group>"; };
 		D282AACA2243C61700C46919 /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = "<group>"; };
-		D28A837623C79FC600DFE4FC /* MFCustomButton+ActionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MFCustomButton+ActionModel.swift"; sourceTree = "<group>"; };
 		D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageModelProtocol.swift; sourceTree = "<group>"; };
 		D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeListCellProtocol.swift; sourceTree = "<group>"; };
 		D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsListItemModel.swift; sourceTree = "<group>"; };
@@ -642,7 +630,6 @@
 		D28A838423CCCA8900DFE4FC /* ScrollerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollerModel.swift; sourceTree = "<group>"; };
 		D28A838823CCCFCB00DFE4FC /* LinkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkModel.swift; sourceTree = "<group>"; };
 		D28A838A23CCDA6B00DFE4FC /* ButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonModel.swift; sourceTree = "<group>"; };
-		D28A838C23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PrimaryButton+MoleculeProtocolExtension.swift"; sourceTree = "<group>"; };
 		D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoButtonViewModel.swift; sourceTree = "<group>"; };
 		D28A839023CD4FD400DFE4FC /* CornerLabelsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerLabelsModel.swift; sourceTree = "<group>"; };
 		D28A839223CE828900DFE4FC /* HeadlineBodyCaretLinkImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyCaretLinkImageModel.swift; sourceTree = "<group>"; };
@@ -762,9 +749,6 @@
 		D29E28D723D21AB800ACEA85 /* StringAndMoleculeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringAndMoleculeView.swift; sourceTree = "<group>"; };
 		D29E28D923D21AFA00ACEA85 /* StringAndMoleculeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringAndMoleculeModel.swift; sourceTree = "<group>"; };
 		D29E28DC23D7404C00ACEA85 /* ContainerHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerHelper.swift; sourceTree = "<group>"; };
-		D2A514562211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIMoleculeMappingObject.h; sourceTree = "<group>"; };
-		D2A514572211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIMoleculeMappingObject.m; sourceTree = "<group>"; };
-		D2A5145C2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIMoleculeViewProtocol.h; sourceTree = "<group>"; };
 		D2A5145E2211DDC100345BFB /* MoleculeStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackView.swift; sourceTree = "<group>"; };
 		D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackTemplate.swift; sourceTree = "<group>"; };
 		D2A514622213643100345BFB /* MoleculeStackCenteredTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoleculeStackCenteredTemplate.swift; sourceTree = "<group>"; };
@@ -827,6 +811,7 @@
 		011B58EE23A2AA850085F53C /* ModelProtocols */ = {
 			isa = PBXGroup;
 			children = (
+				D2E2A9A023E095AB000B42E6 /* ButtonModelProtocol.swift */,
 				014AA72323C501E2006F3E93 /* ContainerModelProtocol.swift */,
 				012A88C3238D86E600FE3DA1 /* CarouselItemModelProtocol.swift */,
 				012A88B0238C880100FE3DA1 /* CarouselPagingModelProtocol.swift */,
@@ -863,14 +848,6 @@
 			path = CustomPrimitives;
 			sourceTree = "<group>";
 		};
-		01509D96232803B200EF99AA /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				011B58EE23A2AA850085F53C /* ModelProtocols */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
 		01C74D87224298E2009C25A3 /* FormUIHelpers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1021,6 +998,18 @@
 			path = RightVariable;
 			sourceTree = "<group>";
 		};
+		D202AFE2242A5F1400E5BEDF /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				D202AFE3242A5F5E00E5BEDF /* NSTextAlignment+Extension.swift */,
+				0A209CD223A7E2810068F8B0 /* UIStackViewAlignment+Extension.swift */,
+				D21EE53B23AD3AD4003D1A30 /* NSLayoutConstraintAxis+Extension.swift */,
+				D202AFE5242A6A9C00E5BEDF /* UICollectionViewScrollPosition+Extension.swift */,
+				013F801823FB4A8E00AD8013 /* UIContentMode+Extension.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 		D213347423842FE3008E41B3 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1049,6 +1038,7 @@
 		D213347523842FF5008E41B3 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */,
 				94FB966023D797DA003D482B /* MFTextButton.h */,
 				94FB966123D797DA003D482B /* MFTextButton.m */,
 				D29DF17E21E69E2E003B2FB9 /* MFView.h */,
@@ -1096,7 +1086,6 @@
 				D29DF24321E6A176003B2FB9 /* MFDigitTextField.h */,
 				D29DF24821E6A177003B2FB9 /* MFDigitTextField.m */,
 				D29DF24A21E6A177003B2FB9 /* MFDigitTextField.xib */,
-				D2A5145C2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h */,
 				D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */,
 				D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */,
 				94F217B423E0BF6100A47C06 /* PrimaryButtonView.h */,
@@ -1149,6 +1138,8 @@
 				D28A838E23CCDEDE00DFE4FC /* TwoButtonViewModel.swift */,
 				D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */,
 				D28A837E23CCA96400DFE4FC /* TabsModel.swift */,
+				011D9625240EBB16000E3791 /* RadioButtonLabelModel.swift */,
+				017BEB372360C6AC0024EF95 /* RadioButtonLabel.swift */,
 			);
 			path = HorizontalCombinationViews;
 			sourceTree = "<group>";
@@ -1310,7 +1301,7 @@
 		D29DF0CE21E404D4003B2FB9 /* MVMCoreUI */ = {
 			isa = PBXGroup;
 			children = (
-				01509D96232803B200EF99AA /* Models */,
+				D2C78CD324252F4E00B69FDE /* Atomic */,
 				012A88EF23985E0100FE3DA1 /* CustomPrimitives */,
 				D2B18B7D236090D500A9AEDC /* BaseClasses */,
 				01C74D87224298E2009C25A3 /* FormUIHelpers */,
@@ -1324,10 +1315,6 @@
 				D29DF10F21E67A7D003B2FB9 /* BaseControllers */,
 				D29DF11E21E6851E003B2FB9 /* TopAlert */,
 				94C01508242155FE005811A9 /* Actions */,
-				D29DF10D21E67A70003B2FB9 /* Atoms */,
-				D29DF10E21E67A77003B2FB9 /* Molecules */,
-				D22479902316A9CB003FCCF9 /* Organisms */,
-				D29DF0DF21E418B2003B2FB9 /* Templates */,
 				D29DF0CF21E404D4003B2FB9 /* MVMCoreUI.h */,
 				D29DF0D021E404D4003B2FB9 /* Info.plist */,
 			);
@@ -1337,7 +1324,6 @@
 		D29DF0DF21E418B2003B2FB9 /* Templates */ = {
 			isa = PBXGroup;
 			children = (
-				012A88AC238C418100FE3DA1 /* TemplateProtocol.swift */,
 				D22D8392241C27B100D3DF69 /* TemplateModel.swift */,
 				014AA72823C5059B006F3E93 /* StackPageTemplateModel.swift */,
 				D2A5146022121FBF00345BFB /* MoleculeStackTemplate.swift */,
@@ -1387,15 +1373,10 @@
 				D2A514662213885800345BFB /* MoleculeHeaderView.swift */,
 				012A88EB238F084D00FE3DA1 /* FooterModel.swift */,
 				D274CA322236A78900B01B62 /* FooterView.swift */,
-				0116A4E4228B19640094F3ED /* RadioButtonSelectionHelper.swift */,
 				012A88C5238DA34000FE3DA1 /* ModuleMoleculeModel.swift */,
 				D29B770F22C281F400D6ACE0 /* ModuleMolecule.swift */,
 				D28A838423CCCA8900DFE4FC /* ScrollerModel.swift */,
 				D2D6CD3F22E78C1A00D701B8 /* Scroller.swift */,
-				011D9625240EBB16000E3791 /* RadioButtonLabelModel.swift */,
-				017BEB372360C6AC0024EF95 /* RadioButtonLabel.swift */,
-				017BEB47236230DB0024EF95 /* MoleculeViewProtocol.swift */,
-				017BEB49236235BA0024EF95 /* ModelMoleculeViewProtocol.swift */,
 				D260105723CF9CC500764D80 /* Doughnut */,
 				D20FB164241A5D75004AFC3A /* NavigationItemModelProtocol.swift */,
 			);
@@ -1421,7 +1402,6 @@
 		D29DF11021E6805F003B2FB9 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
-				013F801823FB4A8E00AD8013 /* UIContentMode+Extension.swift */,
 				D29DF11121E6805F003B2FB9 /* UIColor+MFConvenience.h */,
 				D29DF11321E6805F003B2FB9 /* UIColor+MFConvenience.m */,
 				D29DF11221E6805F003B2FB9 /* NSLayoutConstraint+MFConvenience.h */,
@@ -1486,8 +1466,6 @@
 				D29DF2A721E7B2F9003B2FB9 /* MVMCoreUIConstants.h */,
 				D29DF2A821E7B2F9003B2FB9 /* MVMCoreUIConstants.m */,
 				0A41BA6D2344FCD400D4C0BC /* CATransaction+Extension.swift */,
-				0A209CD223A7E2810068F8B0 /* UIStackViewAlignment+Extension.swift */,
-				D21EE53B23AD3AD4003D1A30 /* NSLayoutConstraintAxis+Extension.swift */,
 			);
 			path = Utility;
 			sourceTree = "<group>";
@@ -1511,8 +1489,9 @@
 				DBC4391A224421A0001AB423 /* CaretLink.swift */,
 				D28A838A23CCDA6B00DFE4FC /* ButtonModel.swift */,
 				D2E2A99E23E07F8A000B42E6 /* PillButton.swift */,
-				D28A838C23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift */,
+				0116A4E4228B19640094F3ED /* RadioButtonSelectionHelper.swift */,
-				D28A837623C79FC600DFE4FC /* MFCustomButton+ActionModel.swift */,
+				011D95AE2407266E000E3791 /* RadioButtonModel.swift */,
+				01004F2F22721C3800991ECC /* RadioButton.swift */,
 			);
 			path = Buttons;
 			sourceTree = "<group>";
@@ -1535,21 +1514,16 @@
 				D282AAB3223FDDAE00C46919 /* MFLoadImageView.swift */,
 				017BEB7A236763000024EF95 /* LineModel.swift */,
 				D213347623843825008E41B3 /* Line.swift */,
-				DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */,
 				94C2D9822386F3E30006CF46 /* Label */,
 				31BE15CA23D8924C00452370 /* CheckboxModel.swift */,
 				0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
 				31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */,
 				0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */,
-				011D95AE2407266E000E3791 /* RadioButtonModel.swift */,
-				01004F2F22721C3800991ECC /* RadioButton.swift */,
 				D28A838223CCBD3F00DFE4FC /* CircleProgressModel.swift */,
 				943784F3236B77BB006A1E82 /* GraphView.swift */,
 				943784F4236B77BB006A1E82 /* GraphViewAnimationHandler.swift */,
 				D260105223CEA61600764D80 /* ToggleModel.swift */,
 				0AA33B392398524F0067DD0F /* Toggle.swift */,
-				D260105423CEA7DC00764D80 /* MVMCoreUISwitch+Model.swift */,
-				012CA99D2385A2D3003F810F /* MFView+ModelExtension.swift */,
 				0AE98BB623FF18E9004C5109 /* ArrowModel.swift */,
 				0AE98BB423FF18D2004C5109 /* Arrow.swift */,
 			);
@@ -1574,7 +1548,6 @@
 				0ABD136C237CAD1E0081388D /* DateDropdownEntryField.swift */,
 				0A7EF86423D8AFFF00B2AAD1 /* ItemDropdownEntryFieldModel.swift */,
 				0ABD1370237DB0450081388D /* ItemDropdownEntryField.swift */,
-				017BEB3F23620A230024EF95 /* TextFieldModel.swift */,
 			);
 			path = TextFields;
 			sourceTree = "<group>";
@@ -1610,11 +1583,6 @@
 				D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */,
 				D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */,
 				D296E14622A597490051EBE7 /* MVMCoreUIViewConstrainingProtocol.h */,
-				012A88C7238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift */,
-				D2A514562211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.h */,
-				D2A514572211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m */,
-				017BEB432362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift */,
-				017BEB7E23676E870024EF95 /* MoleculeObjectMapping.swift */,
 			);
 			path = OtherHandlers;
 			sourceTree = "<group>";
@@ -1715,7 +1683,6 @@
 		D2B18B7D236090D500A9AEDC /* BaseClasses */ = {
 			isa = PBXGroup;
 			children = (
-				D2E2A9A023E095AB000B42E6 /* ButtonModelProtocol.swift */,
 				C003506023AA94CD00B6AC29 /* Button.swift */,
 				D2B18B7E2360913400A9AEDC /* Control.swift */,
 				D2B18B802360945C00A9AEDC /* View.swift */,
@@ -1726,6 +1693,31 @@
 			path = BaseClasses;
 			sourceTree = "<group>";
 		};
+		D2C78CD324252F4E00B69FDE /* Atomic */ = {
+			isa = PBXGroup;
+			children = (
+				017BEB7E23676E870024EF95 /* MoleculeObjectMapping.swift */,
+				D202AFE2242A5F1400E5BEDF /* Extensions */,
+				D2C78CD424252F5D00B69FDE /* Protocols */,
+				D29DF10D21E67A70003B2FB9 /* Atoms */,
+				D29DF10E21E67A77003B2FB9 /* Molecules */,
+				D22479902316A9CB003FCCF9 /* Organisms */,
+				D29DF0DF21E418B2003B2FB9 /* Templates */,
+			);
+			path = Atomic;
+			sourceTree = "<group>";
+		};
+		D2C78CD424252F5D00B69FDE /* Protocols */ = {
+			isa = PBXGroup;
+			children = (
+				012A88C7238DB02000FE3DA1 /* MoleculeDelegateProtocol.swift */,
+				017BEB47236230DB0024EF95 /* MoleculeViewProtocol.swift */,
+				012A88AC238C418100FE3DA1 /* TemplateProtocol.swift */,
+				011B58EE23A2AA850085F53C /* ModelProtocols */,
+			);
+			path = Protocols;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -1746,7 +1738,6 @@
 				D29DF29B21E7ADB9003B2FB9 /* StackableViewController.h in Headers */,
 				D29770F421F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.h in Headers */,
 				D29DF15421E69760003B2FB9 /* MVMCoreUIPanelButtonProtocol.h in Headers */,
-				D2A514582211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.h in Headers */,
 				9458C3172406C8FD00930963 /* UIFont+FontWrapping.h in Headers */,
 				D29DF0D121E404D4003B2FB9 /* MVMCoreUI.h in Headers */,
 				D29DF29A21E7ADB8003B2FB9 /* MFProgrammaticTableViewController.h in Headers */,
@@ -1780,7 +1771,6 @@
 				0A21DB88235E06EF00C160A2 /* MFMdnTextField.h in Headers */,
 				D29DF13121E6851E003B2FB9 /* MVMCoreUITopAlertExpandableView.h in Headers */,
 				D29DF2C421E7BF57003B2FB9 /* MFTabBarSwipeAnimator.h in Headers */,
-				D2A5145D2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h in Headers */,
 				D29DF2CA21E7BFC8003B2FB9 /* MFSizeThreshold.h in Headers */,
 				D29DF28021E7AA51003B2FB9 /* MVMCoreUIDetailViewProtocol.h in Headers */,
 				D29DF2BD21E7BEA4003B2FB9 /* MVMCoreUITabBarPageControlViewController.h in Headers */,
@@ -1929,14 +1919,14 @@
 				D29DF12F21E6851E003B2FB9 /* MVMCoreUITopAlertMainView.m in Sources */,
 				942C378C2412F4FA0066E45E /* ModalMoleculeListTemplate.swift in Sources */,
 				BB47A588241615FA002BB23C /* ListOneColumnFullWidthTextDividerSubsection.swift in Sources */,
-				012A88C8238DB02000FE3DA1 /* ModelMoleculeDelegateProtocol.swift in Sources */,
+				012A88C8238DB02000FE3DA1 /* MoleculeDelegateProtocol.swift in Sources */,
 				0A7EF86123D8AC2500B2AAD1 /* DigitEntryFieldModel.swift in Sources */,
 				DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */,
 				D224798C231450C8003FCCF9 /* HeadlineBodyToggle.swift in Sources */,
-				017BEB442362192F0024EF95 /* MVMCoreUIMoleculeMappingObject+ModelExtension.swift in Sources */,
 				9458C3182406C8FD00930963 /* UIFont+FontWrapping.m in Sources */,
 				522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */,
 				9445890C2385BCE300DE9FD4 /* ProgressBarModel.swift in Sources */,
+				D202AFE4242A5F5E00E5BEDF /* NSTextAlignment+Extension.swift in Sources */,
 				9445891F2385D2E900DE9FD4 /* CaretViewModel.swift in Sources */,
 				01C851D323CF9E740021F976 /* LabelToggleModel.swift in Sources */,
 				D29DF2C521E7BF57003B2FB9 /* MFTabBarSwipeAnimator.m in Sources */,
@@ -1961,7 +1951,6 @@
 				0A21DB91235E0EDB00C160A2 /* DigitBox.swift in Sources */,
 				D22D1F572204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m in Sources */,
 				D28A838B23CCDA6B00DFE4FC /* ButtonModel.swift in Sources */,
-				D28A838D23CCDCC200DFE4FC /* PrimaryButton+MoleculeProtocolExtension.swift in Sources */,
 				D2A5145F2211DDC100345BFB /* MoleculeStackView.swift in Sources */,
 				C7F8012323E846C300396FBD /* ListRVWheelModel.swift in Sources */,
 				D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */,
@@ -1976,10 +1965,10 @@
 				52B201D324081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift in Sources */,
 				525239C02407BCFF00454969 /* ListTwoColumnPriceDetailsModel.swift in Sources */,
 				D2E2A99A23D8D6B4000B42E6 /* HeadlineBodyButtonModel.swift in Sources */,
+				D202AFE6242A6A9C00E5BEDF /* UICollectionViewScrollPosition+Extension.swift in Sources */,
 				8D084AD22410BF7600951227 /* ListOneColumnFullWidthTextBodyText.swift in Sources */,
 				94C0150C2421564A005811A9 /* ActionCollapseNotificationModel.swift in Sources */,
 				014AA73123C5059B006F3E93 /* ListPageTemplateModel.swift in Sources */,
-				017BEB4023620A230024EF95 /* TextFieldModel.swift in Sources */,
 				D29DF2A221E7AF4E003B2FB9 /* MVMCoreUIUtility.m in Sources */,
 				D29DF12B21E6851E003B2FB9 /* MVMCoreUITopAlertExpandableView.m in Sources */,
 				94C2D9A723872DA90006CF46 /* LabelAttributeColorModel.swift in Sources */,
@@ -1989,13 +1978,11 @@
 				014AA72623C501E2006F3E93 /* ContainerModelProtocol.swift in Sources */,
 				AA11A42123F15D7000D7962F /* ListRightVariablePaymentsModel.swift in Sources */,
 				01EB369223609801006832FA /* MoleculeStackModel.swift in Sources */,
-				012CA99E2385A2D3003F810F /* MFView+ModelExtension.swift in Sources */,
 				011D9626240EBB16000E3791 /* RadioButtonLabelModel.swift in Sources */,
 				AAA74A192410C05800080241 /* HeadersH2NoButtonsBodyTextModel.swift in Sources */,
 				D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */,
 				944589232385DA9600DE9FD4 /* ImageViewModel.swift in Sources */,
 				D213347723843825008E41B3 /* Line.swift in Sources */,
-				D28A837723C79FC600DFE4FC /* MFCustomButton+ActionModel.swift in Sources */,
 				D2E2A99C23D8D975000B42E6 /* ImageHeadlineBodyModel.swift in Sources */,
 				525019DE2406430800EED91C /* ListProgressBarData.swift in Sources */,
 				D28A837F23CCA96400DFE4FC /* TabsModel.swift in Sources */,
@@ -2013,7 +2000,6 @@
 				D2A92886241ACD99004E01C6 /* ProgrammaticTableViewController.swift in Sources */,
 				01509D952327ED1900EF99AA /* HeadlineBodyLinkToggle.swift in Sources */,
 				31BE15CB23D8924D00452370 /* CheckboxLabelModel.swift in Sources */,
-				D260105523CEA7DC00764D80 /* MVMCoreUISwitch+Model.swift in Sources */,
 				D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */,
 				5248BFEC23F12E350059236A /* ListThreeColumnPlanDataDivider.swift in Sources */,
 				0ABD136D237CAD1E0081388D /* DateDropdownEntryField.swift in Sources */,
@@ -2114,7 +2100,6 @@
 				0AE14F64238315D2005417F8 /* TextField.swift in Sources */,
 				D29DF17B21E69E1F003B2FB9 /* PrimaryButton.m in Sources */,
 				D2C78CD224228BBD00B69FDE /* ActionOpenPanelModel.swift in Sources */,
-				017BEB4A236235BA0024EF95 /* ModelMoleculeViewProtocol.swift in Sources */,
 				C695A68123C9830D00BFB94E /* NumberedListModel.swift in Sources */,
 				01EB3684236097C0006832FA /* MoleculeModelProtocol.swift in Sources */,
 				D27CD4102339057800C1DC07 /* EyebrowHeadlineBodyLink.swift in Sources */,
@@ -2186,7 +2171,6 @@
 				D29E28DD23D7404C00ACEA85 /* ContainerHelper.swift in Sources */,
 				012A88C2238D7BCA00FE3DA1 /* CarouselItemModel.swift in Sources */,
 				D29DF29E21E7AE3B003B2FB9 /* MFStyler.m in Sources */,
-				D2A514592211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m in Sources */,
 				94C661D923CCF4B400D9FE5B /* LeftRightLabelModel.swift in Sources */,
 				011D95AB2405C553000E3791 /* FormItemProtocol.swift in Sources */,
 				D21EE53C23AD3AD4003D1A30 /* NSLayoutConstraintAxis+Extension.swift in Sources */,

MVMCoreUI/Atomic/Atoms/Buttons/CaretLink.swift

@@ -35,6 +35,27 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
     
     private var caretSpacingConstraint: NSLayoutConstraint?
     
+    //------------------------------------------------------
+    // MARK: - Inits
+    //------------------------------------------------------
+    
+    // Default values for view.
+    public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(frame: .zero)
+        backgroundColor = .clear
+        translatesAutoresizingMaskIntoConstraints = false
+        setTitleColor(enabledColor, for: .normal)
+        setTitleColor(disabledColor, for: .disabled)
+    }
+    
+    public override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+    
+    public required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
     //------------------------------------------------------
     // MARK: - Lifecycle
     //------------------------------------------------------
@@ -115,16 +136,6 @@ open class CaretLink: Button, MVMCoreUIViewConstrainingProtocol {
     //------------------------------------------------------
     // MARK: - Atomization
     //------------------------------------------------------
-    
-    // Default values for view.
-    @objc open func setAsMolecule() {
-        
-        backgroundColor = .clear
-        translatesAutoresizingMaskIntoConstraints = false
-        setTitleColor(enabledColor, for: .normal)
-        setTitleColor(disabledColor, for: .disabled)
-    }
-    
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let caretLinkModel = model as? CaretLinkModel else { return }
         if let color = caretLinkModel.backgroundColor {

MVMCoreUI/Atomic/Atoms/Buttons/Link/ExternalLink.swift

@@ -17,7 +17,7 @@ open class ExternalLink: Link {
     public var exportImageView: UIImageView?
     
     //--------------------------------------------------
-    // MARK: - ModelMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift

@@ -44,7 +44,7 @@ import UIKit
     }
     
     //--------------------------------------------------
-    // MARK: - ModelMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift

@@ -118,7 +118,7 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
         return CGSize(width: max(width, getMinimumWidth()), height: getHeight())
     }
     
-    // MARK: - ModelMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         // The button will get styled in the enable check in super.
         super.set(with: model, delegateObject, additionalData)

MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift

@@ -128,9 +128,7 @@ import UIKit
         
         self.delegateObject = delegateObject
         isSelected = model.state
-        let radioButtonModel = RadioButtonSelectionHelper.setupForRadioButtonGroup(model,
+        RadioButtonSelectionHelper.setupForRadioButtonGroup(model, self, delegateObject: delegateObject)
-                                                                                   formValidator: delegateObject?.formHolderDelegate?.formValidator)
-        FormValidator.setupValidation(molecule: radioButtonModel, delegate: delegateObject?.formHolderDelegate)
     }
 
     public override func reset() {

MVMCoreUI/Atomic/Atoms/Buttons/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 {
+            let formValidator = delegateObject?.formHolderDelegate?.formValidator else {
-                    return RadioButtonSelectionHelper(radioButtonModel.fieldKey)
+            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) {

MVMCoreUI/Atomic/Atoms/TextFields/BaseDropdownEntryField.swift

@@ -52,6 +52,10 @@ import UIKit
         fatalError("DropdownEntryField does not support xib.")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(model: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Setup
     //--------------------------------------------------
@@ -77,15 +81,3 @@ import UIKit
         dropDownCaretView.setOptional(with: model.caretView, delegateObject, additionalData)
     }
 }
-
-// MARK: - MVMCoreUIMoleculeViewProtocol
-extension BaseDropdownEntryField {
-    
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json, !dictionary.isEmpty else { return }
-        
-        dropDownCaretView.setWithJSON(dictionary, delegateObject: delegateObject, additionalData: additionalData)
-    }
-}

MVMCoreUI/Atomic/Atoms/TextFields/DateDropdownEntryField.swift

@@ -58,6 +58,10 @@ import UIKit
         fatalError("DateDropdownEntryField init(coder:) has not been implemented")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(model: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Methods
     //--------------------------------------------------
@@ -119,17 +123,3 @@ import UIKit
         dateFormat = model.dateFormat
     }
 }
-
-// MARK: - MVMCoreUIMoleculeViewProtocol
-extension DateDropdownEntryField {
-    
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json, !dictionary.isEmpty else { return }
-        
-        if let dateFormat = dictionary["dateFormat"] as? String {
-            self.dateFormat = dateFormat
-        }
-    }
-}

MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift

@@ -193,6 +193,10 @@ import UIKit
         fatalError("DigitEntryField xib has not been implemented")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(model: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Setup
     //--------------------------------------------------
@@ -341,6 +345,10 @@ import UIKit
         
         super.set(with: model, delegateObject, additionalData)
     }
+    
+    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 115
+    }
 }
 
 // MARK: - TextField Delegate
@@ -438,29 +446,3 @@ extension DigitEntryField {
         return proprietorTextDelegate?.textFieldShouldEndEditing?(textField) ?? true
     }
 }
-
-// MARK: - MVMCoreUIMoleculeViewProtocol
-extension DigitEntryField {
-    
-    @objc open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json else { return }
-        
-        numberOfDigits = dictionary["digits"] as? Int ?? 4
-        
-        if let _ = dictionary["secureEntry"] as? Bool {
-            setAsSecureTextEntry(true)
-        }
-        
-        if !dictionary.isEmpty{
-            for digitBox in digitBoxes {
-                MVMCoreUICommonViewsUtility.addDismissToolbar(digitBox.digitField, delegate: delegateObject as? UITextFieldDelegate)
-            }
-        }
-    }
-    
-    @objc open override class func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return 115
-    }
-}

MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift

@@ -160,6 +160,11 @@ import UIKit
         fatalError("EntryField does not support xib.")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(frame: .zero)
+        set(with: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
@@ -225,6 +230,9 @@ import UIKit
         entryFieldContainer.updateView(size)
     }
     
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
     @objc open override func reset() {
         super.reset()
         
@@ -257,45 +265,8 @@ import UIKit
             self.isSelected = isSelected
         }
     }
-}
 
-// MARK: - MVMCoreUIMoleculeViewProtocol
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-extension EntryField {
-    
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        self.delegateObject = delegateObject
-        
-        guard let dictionary = json, !dictionary.isEmpty else { return }
-        
-        entryFieldContainer.setWithJSON(dictionary, delegateObject: delegateObject, additionalData: additionalData)
-        
-        if let titleText = dictionary[KeyTitle] as? String {
-            title = titleText
-        }
-        
-        if let disable = dictionary[KeyDisable] as? String, disable.isEqual(StringY) || dictionary.boolForKey(KeyDisable) {
-            isEnabled = false
-        }
-        
-        if let feedback = dictionary["feedback"] as? String {
-            self.standardMessage = feedback
-        }
-        
-        if let errMessage = dictionary[KeyErrorMessage] as? String {
-            errorMessage = errMessage
-        }
-        
-        if let isLocked = dictionary["isLocked"] as? Bool {
-            self.isLocked = isLocked
-        }
-        
-        if let isSelected = dictionary["isSelected"] as? Bool {
-            self.isSelected = isSelected
-        }
-    }
-    
-    @objc open class func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
         return 115
     }
 }

MVMCoreUI/Atomic/Atoms/TextFields/ItemDropdownEntryField.swift

@@ -51,6 +51,10 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
         fatalError("ItemDropdownEntryField init(coder:) has not been implemented")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(model: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Methods
     //--------------------------------------------------
@@ -135,21 +139,6 @@ extension ItemDropdownEntryField: UIPickerViewDelegate, UIPickerViewDataSource {
     }
 }
 
-// MARK: - MVMCoreUIMoleculeViewProtocol
-extension ItemDropdownEntryField {
-    
-    @objc override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json, !dictionary.isEmpty else { return }
-        
-        if let options = dictionary["options"] as? [String] {
-            pickerData = options
-            setPickerDelegates(delegate: self)
-        }
-    }
-}
-
 // MARK: - Accessibility
 extension ItemDropdownEntryField {
     

MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift

@@ -65,6 +65,10 @@ import MVMCore
         fatalError("MdnEntryField xib not supported.")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(model: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Setup
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift

@@ -158,6 +158,10 @@ import UIKit
         fatalError("TextEntryField does not support xib.")
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(model: model, delegateObject, additionalData)
+    }
+    
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
@@ -292,15 +296,12 @@ import UIKit
         placeholder = model.placeholder
         
         switch model.type {
-        case "password":
+        case .password:
             textField.isSecureTextEntry = true
-            
+        case .number:
-        case "number":
             textField.keyboardType = .numberPad
-            
+        case .email:
-        case "email":
             textField.keyboardType = .emailAddress
-            
         default:
             break
         }
@@ -320,63 +321,6 @@ import UIKit
     }
 }
 
-// MARK: - MVMCoreUIMoleculeViewProtocol
-extension TextEntryField {
-    
-    @objc open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let delegateObject = delegateObject,
-            let dictionary = json
-            else { return }
-
-        if let enabledTextColorHex = dictionary["enabledTextColor"] as? String {
-            textColor.enabled = UIColor.mfGet(forHex: enabledTextColorHex)
-        }
-        
-        if let disabledTextColorHex = dictionary["disabledTextColor"] as? String {
-            textColor.disabled = UIColor.mfGet(forHex: disabledTextColorHex)
-        }
-        
-        if let text = dictionary[KeyText] as? String {
-            self.text = text
-        }
-        
-        if let placeholder = dictionary[placeholder] as? String {
-            self.placeholder = placeholder
-        }
-        
-        switch dictionary.stringForkey(KeyType) {
-        case "password":
-            textField.isSecureTextEntry = true
-            
-        case "number":
-            textField.keyboardType = .numberPad
-            
-        case "email":
-            textField.keyboardType = .emailAddress
-            
-        default:
-            break
-        }
-        
-        let regex = dictionary.stringForkey("regex")
-        
-        if !regex.isEmpty {
-            validationBlock = { enteredValue in
-                guard let value = enteredValue else { return false }
-                return MVMCoreUIUtility.validate(value, withRegularExpression: regex)
-            }
-        } else {
-            defaultValidationBlock()
-        }
-        
-        uiTextFieldDelegate = delegateObject.uiTextFieldDelegate
-        observingTextFieldDelegate = delegateObject.observingTextFieldDelegate
-        MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: uiTextFieldDelegate)
-    }
-}
-
 // MARK: - Accessibility
 extension TextEntryField {
     

MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift

@@ -8,6 +8,13 @@
 
 
 @objcMembers public class TextEntryFieldModel: EntryFieldModel {
+    
+    public enum EntryType: String, Codable {
+        case password
+        case number
+        case email
+    }
+    
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -19,7 +26,7 @@
     public var placeholder: String?
     public var enabledTextColor: Color?
     public var disabledTextColor: Color?
-    public var type: String?
+    public var type: EntryType?
     public var regex: String?
     
     //--------------------------------------------------
@@ -47,7 +54,7 @@
         placeholder = try typeContainer.decodeIfPresent(String.self, forKey: .placeholder)
         enabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .enabledTextColor)
         disabledTextColor = try typeContainer.decodeIfPresent(Color.self, forKey: .disabledTextColor)
-        type = try typeContainer.decodeIfPresent(String.self, forKey: .type)
+        type = try typeContainer.decodeIfPresent(EntryType.self, forKey: .type)
         regex = try typeContainer.decodeIfPresent(String.self, forKey: .regex)
     }
     

MVMCoreUI/Atomic/Atoms/Views/CaretView.swift

@@ -178,16 +178,12 @@ open class CaretView: View {
     //------------------------------------------------------
     
     // Default values for view.
-    @objc open override func setAsMolecule() {
+    public required init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
+        super.init(frame: .zero)
         defaultState()
-    }
-    
-    public override func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        guard let json = json, let model = try? Self.decodeJSONToModel(json: json, type: CaretViewModel.self) else { return }
         set(with: model, delegateObject, additionalData)
     }
     
-    //MARK: - MVMCoreMoleculeViewProtocol
     override public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let caretModel = model as? CaretViewModel else {

MVMCoreUI/Atomic/Atoms/Views/Checkbox.swift

@@ -381,11 +381,7 @@ import MVMCore
         checkWidth = 2.0
         checkAndBypassAnimations(selected: false)
     }
-    
+
-    open func setAsMolecule() {
-        setupView()
-    }
-    
     public override func updateView(_ size: CGFloat) {
         super.updateView(size)
         

MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift

@@ -65,6 +65,14 @@
         alignCheckbox(.center)
     }
     
+    @objc override open func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        
+        label.updateView(size)
+        checkbox.updateView(size)
+        layoutIfNeeded()
+    }
+    
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -115,6 +123,9 @@
         }
     }
     
+    //--------------------------------------------------
+    // MARK: - Atomic
+    //--------------------------------------------------
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let checkBoxWithLabelModel = model as? CheckboxLabelModel else { return  }
 
@@ -125,23 +136,11 @@
         checkbox.set(with: checkBoxWithLabelModel.checkbox, delegateObject, additionalData)
         label.set(with: checkBoxWithLabelModel.label, delegateObject, additionalData)
     }
-}
-
-// MARK: - Molecular
-extension CheckboxLabel {
     
-    open class func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 200
     }
     
-    @objc override open func updateView(_ size: CGFloat) {
-        super.updateView(size)
-        
-        label.updateView(size)
-        checkbox.updateView(size)
-        layoutIfNeeded()
-    }
-    
     open override func reset() {
         super.reset()
         
@@ -149,17 +148,4 @@ extension CheckboxLabel {
         checkbox.reset()
         alignCheckbox(.center)
     }
-    
-    override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json else { return }
-        
-        if let checkboxAlignment = dictionary["checkboxAlignment"] as? String, let position = CheckboxPosition(rawValue: checkboxAlignment) {
-            alignCheckbox(position)
-        }
-        
-        checkbox.setWithJSON(dictionary.dictionaryForKey("checkbox"), delegateObject: delegateObject, additionalData: additionalData)
-        label.setWithJSON(dictionary.dictionaryForKey("label"), delegateObject: delegateObject, additionalData: additionalData)
-    }
 }

MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift

@@ -16,8 +16,8 @@ public enum CheckboxPosition: String, Codable {
 
 @objcMembers public class CheckboxLabelModel: MoleculeModelProtocol {
     public static var identifier: String = "checkboxLabel"
+    public var moleculeName: String
     public var backgroundColor: Color?
-
     public var checkboxAlignment: CheckboxPosition?
     public var checkbox: CheckboxModel
     public var label: LabelModel

MVMCoreUI/Atomic/Atoms/Views/DashLine.swift

@@ -87,12 +87,6 @@ open class DashLine: View {
         isHidden = false
     }
     
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        guard let json = json, let model = try? Self.decodeJSONToModel(json: json, type: DashLineModel.self) else { return }
-        set(with: model, delegateObject, additionalData)
-    }
-    
-    //MARK: - MVMCoreMoleculeViewProtocol
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let dashLineModel = dashModel else {

MVMCoreUI/Atomic/Atoms/Views/GraphView.swift

@@ -32,11 +32,6 @@ import UIKit
         createGraphCircle(model)
         rotationAnimation(model)
     }
-
-    override open func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        guard let json = json, let model = try? Self.decodeJSONToModel(json: json, type: CircleProgressModel.self) else { return }
-        set(with: model, delegateObject, additionalData)
-    }
     
     class func getAngle(_ piValue: Double) -> Double {
         return piValue / (2.0 * Double.pi) * 360.0

MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift

@@ -12,7 +12,7 @@ import MVMCore
 public typealias ActionBlock = () -> ()
 
 
-@objcMembers open class Label: UILabel, MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol, MVMCoreUIViewConstrainingProtocol, MFButtonProtocol, ModelMoleculeViewProtocol {
+@objcMembers open class Label: UILabel, MVMCoreViewProtocol, MoleculeViewProtocol, MVMCoreUIViewConstrainingProtocol, MFButtonProtocol {
     
     //------------------------------------------------------
     // MARK: - Properties
@@ -128,6 +128,13 @@ 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)
+    }
+    
     //------------------------------------------------------
     // MARK: - Factory Functions
     //------------------------------------------------------
@@ -318,14 +325,11 @@ public typealias ActionBlock = () -> ()
         Label.setLabel(self, withHTML: labelModel.html)
         isAccessibilityElement = hasText
         
-        let alignment = LabelAlignment(rawValue: labelModel.textAlignment ?? "")
+        switch labelModel.textAlignment {
-        switch alignment {
         case .center:
             textAlignment = .center
-            
         case .right:
             textAlignment = .right
-            
         default:
             textAlignment = .left
         }
@@ -339,8 +343,7 @@ public typealias ActionBlock = () -> ()
             accessibilityLabel = accessibilityText
         }
         
-        if let fontStyle = labelModel.fontStyle {
+        if let fontStyle = labelModel.fontStyle?.rawValue {
-            MFStyler.styleLabel(self, withStyle: fontStyle)
             MFStyler.styleLabel(self, withStyle: fontStyle, genericScaling: false)
             standardFontSize = font.pointSize
         } else {
@@ -373,9 +376,9 @@ public typealias ActionBlock = () -> ()
                     attributedString.addAttribute(.baselineOffset, value: 0, range: range)
                     
                 case let colorAtt as LabelAttributeColorModel:
-                    if let colorHex = colorAtt.textColor, !colorHex.isEmpty {
+                    if let colorHex = colorAtt.textColor {
                         attributedString.removeAttribute(.foregroundColor, range: range)
-                        attributedString.addAttribute(.foregroundColor, value: UIColor.mfGet(forHex: colorHex), range: range)
+                        attributedString.addAttribute(.foregroundColor, value: colorHex.uiColor, range: range)
                     }
                     
                 case let imageAtt as LabelAttributeImageModel:
@@ -396,7 +399,7 @@ public typealias ActionBlock = () -> ()
                     attributedString.insert(mutableString, at: imageAtt.location)
                     
                 case let fontAtt as LabelAttributeFontModel:
-                    if let fontStyle = fontAtt.style {
+                    if let fontStyle = fontAtt.style?.rawValue {
                         let styles = MFStyler.styleGetAttributedString("0", withStyle: fontStyle)
                         attributedString.removeAttribute(.font, range: range)
                         attributedString.removeAttribute(.foregroundColor, range: range)
@@ -872,16 +875,6 @@ extension Label {
         accessibilityTraits = .staticText
     }
     
-    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        clauses = []
-        Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData)
-        hero = json?["hero"] as? Int
-    }
-    
-    public func setAsMolecule() {
-        styleB2(true)
-    }
-    
     public func needsToBeConstrained() -> Bool {
         return true
     }

MVMCoreUI/Atomic/Atoms/Views/Label/LabelAttributeColorModel.swift

@@ -17,7 +17,7 @@ import UIKit
         return "color"
     }
     
-    var textColor: String?
+    var textColor: Color?
     
     //--------------------------------------------------
     // MARK: - Keys
@@ -33,7 +33,7 @@ import UIKit
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        textColor = try typeContainer.decodeIfPresent(String.self, forKey: .textColor)
+        textColor = try typeContainer.decodeIfPresent(Color.self, forKey: .textColor)
         try super.init(from: decoder)
     }
     

MVMCoreUI/Atomic/Atoms/Views/Label/LabelAttributeFontModel.swift

@@ -18,7 +18,7 @@ import UIKit
         return "font"
     }
     
-    var style: String?
+    var style: LabelModel.FontStyle?
     var name: String?
     var size: CGFloat?
     
@@ -38,7 +38,7 @@ import UIKit
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        style = try typeContainer.decodeIfPresent(String.self, forKey: .style)
+        style = try typeContainer.decodeIfPresent(LabelModel.FontStyle.self, forKey: .style)
         name = try typeContainer.decodeIfPresent(String.self, forKey: .name)
         size = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .size)
         try super.init(from: decoder)

MVMCoreUI/Atomic/Atoms/Views/Label/LabelModel.swift

@@ -10,6 +10,31 @@
 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
+        case H32
+        case B1
+        case B2
+        case B3
+        case B20
+    }
+    
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -19,10 +44,10 @@ import Foundation
     public var text: String
     public var accessibilityText: String?
     public var textColor: Color?
-    public var fontStyle: String?
+    public var fontStyle: FontStyle?
     public var fontName: String?
     public var fontSize: CGFloat?
-    public var textAlignment: String?
+    public var textAlignment: NSTextAlignment?
     public var attributes: [LabelAttributeModel]?
     public var html: String?
     public var hero: Int?
@@ -70,10 +95,10 @@ import Foundation
         accessibilityText = try typeContainer.decodeIfPresent(String.self, forKey: .accessibilityText)
         textColor = try typeContainer.decodeIfPresent(Color.self, forKey: .textColor)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        fontStyle = try typeContainer.decodeIfPresent(String.self, forKey: .fontStyle)
+        fontStyle = try typeContainer.decodeIfPresent(FontStyle.self, forKey: .fontStyle)
         fontName = try typeContainer.decodeIfPresent(String.self, forKey: .fontName)
         fontSize = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .fontSize)
-        textAlignment = try typeContainer.decodeIfPresent(String.self, forKey: .textAlignment)
+        textAlignment = try typeContainer.decodeIfPresent(NSTextAlignment.self, forKey: .textAlignment)
         attributes = try typeContainer.decodeModelsIfPresent(codingKey: .attributes)
         html = try typeContainer.decodeIfPresent(String.self, forKey: .html)
         hero = try typeContainer.decodeIfPresent(Int.self, forKey: .hero)

MVMCoreUI/Atomic/Atoms/Views/LeftRightLabelView.swift

@@ -40,11 +40,6 @@ import Foundation
         super.init(coder: aDecoder)
     }
     
-    public convenience init(json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
-        self.init()
-        setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-    }
-    
     override open func setupView() {
         super.setupView()
         
@@ -162,23 +157,6 @@ import Foundation
     // MARK: - Atomization
     //------------------------------------------------------
     
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject as? MVMCoreUIDelegateObject, additionalData: additionalData)
-        
-        guard let dictionary = json else { return }
-        
-        leftTextLabel.setWithJSON(dictionary.optionalDictionaryForKey("leftText"), delegateObject: delegateObject as? MVMCoreUIDelegateObject, additionalData: additionalData)
-        rightTextLabel.setWithJSON(dictionary.optionalDictionaryForKey("rightText"), delegateObject: delegateObject as? MVMCoreUIDelegateObject, additionalData: additionalData)
-        
-        if !leftTextLabel.hasText {
-            constrainRightLabel()
-        } else if !rightTextLabel.hasText {
-            constrainLeftLabel()
-        }
-    }
-    
-    //MARK: - MVMCoreMoleculeViewProtocol
-    
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let leftRightLabelModel = model as? LeftRightLabelModel else {

MVMCoreUI/Atomic/Atoms/Views/Line.swift

@@ -54,22 +54,10 @@ import UIKit
         setStyle(.standard)
     }
     
-    // MARK: - MVMCoreUIMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
-    open override func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
-
-        // If no type, default to standard.
-        if let typeString = json?.optionalStringForKey(KeyType), let type = LineModel.Style.init(rawValue: typeString) {
-            setStyle(type)
-        } else {
-            setStyle(.standard)
-        }
-        
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-    }
-    
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         if let lineModel = model as? LineModel {
-            setStyle(lineModel.type ?? .standard)
+            setStyle(lineModel.type)
         }
         super.set(with: model, delegateObject, additionalData)
     }
@@ -78,13 +66,9 @@ import UIKit
         setStyle(.standard)
     }
     
-    open func copyBackgroundColor() -> Bool {
+    public override static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        return false
+        guard let type = (model as? LineModel)?.type else { return 1 }
-    }
+        switch type {
-    
-    public static func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        guard let type = json?.optionalStringForKey(KeyType), let style = LineModel.Style(rawValue: type) else { return 1 }
-        switch style {
         case .none:
             return 0
         case .medium:
@@ -101,4 +85,8 @@ extension Line: MVMCoreUIViewConstrainingProtocol {
     open func needsToBeConstrained() -> Bool {
         return true
     }
+    
+    open func copyBackgroundColor() -> Bool {
+        return false
+    }
 }

MVMCoreUI/Atomic/Atoms/Views/MFLoadImageView.swift

@@ -8,7 +8,8 @@
 
 import UIKit
 
-@objcMembers open class MFLoadImageView: ViewConstrainingView, ModelMoleculeViewProtocol {
+// TODO: Change to container instead of ViewConstraining without breaking legacy stack.
+@objcMembers open class MFLoadImageView: ViewConstrainingView, MoleculeViewProtocol {
     public let loadingSpinner = MFLoadingSpinner(frame: .zero)
     public let imageView = MFTransparentGIFView(frame: .zero)
     public var addSizeConstraintsForAspectRatio = false
@@ -46,6 +47,13 @@ import UIKit
         super.init(coder: aDecoder)
     }
     
+    required public init(model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.init(frame: .zero)
+        addSizeConstraintsForAspectRatio = true
+        pinEdges(.all)
+        set(with: model, delegateObject, additionalData)
+    }
+    
     public func pinEdges(_ edge: UIRectEdge) {
         edges = edge
         if edge == UIRectEdge.all {
@@ -211,11 +219,7 @@ import UIKit
     
     public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         self.delegateObject = delegateObject
-        // TODO: Temporary, should be moved to init once we have type erasure ready.
+        guard let imageModel = model as? ImageViewModel else { return }
-        setAsMolecule()
-        guard let imageModel = model as? ImageViewModel else {
-            return
-        }
         if let accessibilityString = imageModel.accessibilityText {
             imageView.accessibilityLabel = accessibilityString
             imageView.accessibilityTraits = .staticText
@@ -241,40 +245,6 @@ import UIKit
         }
     }
     
-    // MARK: - MVMCoreUIMoleculeViewProtocol functions
-    open override func setAsMolecule() {
-        addSizeConstraintsForAspectRatio = true
-        pinEdges(.all)
-    }
-    
-    public override class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return json?.optionalCGFloatForKey("height") ?? 0
-    }
-    
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        self.delegateObject = delegateObject
-        if let accessibilityString = json?.optionalStringForKey("accessibilityText") {
-            imageView.accessibilityLabel = accessibilityString
-            imageView.accessibilityTraits = .staticText
-            imageView.isAccessibilityElement = true
-        }
-        let width = json?.optionalCGFloatForKey("width") ?? imageWidth
-        let height = json?.optionalCGFloatForKey("height") ?? imageHeight
-        // For smoother transitions, set constraints that we know immediately.
-        if let width = width, addSizeConstraintsForAspectRatio {
-            setWidth(width)
-        }
-        if let height = height, addSizeConstraintsForAspectRatio {
-            setHeight(height)
-        }
-        if let imageName = json?.optionalStringForKey("image"), shouldLoadImage(withName: imageName, width: width, height: height) {
-            imageView.image = nil
-            imageView.animatedImage = nil
-            loadImage(withName: imageName, format: json?.optionalStringForKey("imageFormat"), width: width as NSNumber?, height: height as NSNumber?, customFallbackImage: json?.optionalStringForKey("fallbackImage"))
-        }
-    }
-    
     // MARK: - load functions
     public func loadImage(withName imageName: String?, format: String? = nil, width: NSNumber? = nil, height: NSNumber? = nil, customFallbackImage: String? = nil, allowServerParameters: Bool = false, localBundle: Bundle? = nil, completionHandler: MVMCoreGetImageBlock? = nil) {
         

MVMCoreUI/Atomic/Atoms/Views/MultiProgress.swift

@@ -63,7 +63,7 @@ import UIKit
         }
     }
     
-    //MARK: - MVMCoreMoleculeViewProtocol
+    //MARK: - MoleculeViewProtocol
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let multiProgressModel = multiProgressModel else {
@@ -81,8 +81,7 @@ import UIKit
         progressList = nil
     }
     
-    public override func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
+    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        guard let json = json, let model = try? Self.decodeJSONToModel(json: json, type: MultiProgressBarModel.self) else { return }
+        return (model as? MultiProgressBarModel)?.thickness ?? 8
-        set(with: model, delegateObject, additionalData)
     }
 }

MVMCoreUI/Atomic/Atoms/Views/ProgressBar.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-@objcMembers open class ProgressBar: UIProgressView, MVMCoreViewProtocol, ModelMoleculeViewProtocol, MVMCoreUIMoleculeViewProtocol {
+@objcMembers open class ProgressBar: UIProgressView, MVMCoreViewProtocol, MoleculeViewProtocol {
     var progressBarModel: ProgressBarModel?
     
     var thickness: CGFloat = 8.0 {
@@ -32,7 +32,7 @@ import Foundation
         setupView()
     }
     
-    init() {
+    public init() {
         super.init(frame: .zero)
         setupView()
     }
@@ -50,7 +50,7 @@ import Foundation
     public func updateView(_ size: CGFloat) {
     }
     
-    //MARK: - MVMCoreMoleculeViewProtocol
+    //MARK: - MoleculeViewProtocol
     public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let progressBarModel = model as? ProgressBarModel else {
             return
@@ -63,12 +63,6 @@ import Foundation
         }
     }
     
-    // MARK: - MVMCoreUIMoleculeViewProtocol
-    public func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        guard let json = json, let model = try? Self.decodeJSONToModel(json: json, type: ProgressBarModel.self) else { return }
-        set(with: model, delegateObject, additionalData)
-    }
-    
     public func reset() {
         thickness = 8
         progress = 0
@@ -76,7 +70,7 @@ import Foundation
         trackTintColor = UIColor.mfLightSilver()
     }
     
-    public class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+    public static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 8
     }
 }

MVMCoreUI/Atomic/Atoms/Views/Toggle.swift

@@ -336,56 +336,37 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         }
     }
 
-    // MARK:- ModelMoleculeViewProtocol
+    // MARK:- MoleculeViewProtocol
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         self.delegateObject = delegateObject
-        self.model = model
+
-        
         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)
+        
-    }
+        if let color = model.onTintColor?.uiColor {
-
+            containerTintColor?.on = color
-    //TODO: change to setWith Model
-    public override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-
-        guard let dictionary = json else { return }
-
-        if let color = dictionary["onTintColor"] as? String {
-            containerTintColor?.on = UIColor.mfGet(forHex: color)
         }
 
-        if let color = dictionary["offTintColor"] as? String {
+        if let color = model.offTintColor?.uiColor {
-            containerTintColor?.off = UIColor.mfGet(forHex: color)
+            containerTintColor?.off = color
         }
 
-        if let color = dictionary["onKnobTintColor"] as? String {
+        if let color = model.onKnobTintColor?.uiColor {
-            knobTintColor?.on = UIColor.mfGet(forHex: color)
+            knobTintColor?.on = color
         }
 
-        if let color = dictionary["offKnobTintColor"] as? String {
+        if let color = model.offKnobTintColor?.uiColor {
-            knobTintColor?.off = UIColor.mfGet(forHex: color)
+            knobTintColor?.off = color
         }
 
-        if let state = dictionary["state"] as? Bool {
+        changeStateNoAnimation(model.state)
-            changeStateNoAnimation(state)
+        isAnimated = model.animated
-        }
+        isEnabled = model.enabled
 
-        if let actionMap = dictionary.optionalDictionaryForKey("action") {
+        if let actionMap = model.action?.toJSON() {
             didToggleAction = { MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject) }
         }
-
-        if let isAnimated = dictionary["isAnimated"] as? Bool {
-            self.isAnimated = isAnimated
-        }
-
-        if let isEnabled = dictionary["isEnabled"] as? Bool{
-            self.isEnabled = isEnabled
-        }
     }
     
     public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
@@ -393,13 +374,8 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     }
 }
 
-// MARK: - MVMCoreUIMoleculeViewProtocol
+// MARK: - MVMCoreUIViewConstrainingProtocol
 extension Toggle {
-
-    
-    public class func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
-        return Self.getContainerHeight()
-    }
     
     public func needsToBeConstrained() -> Bool {
         return true

MVMCoreUI/Atomic/Atoms/Views/ToggleModel.swift

@@ -8,20 +8,23 @@
 
 import UIKit
 
-public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
+public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol, EnableableModelProtocol {
-    //--------------------------------------------------
+
-    // MARK: - Properties
-    //--------------------------------------------------
-    
     public static var identifier: String = "toggle"
     public var backgroundColor: Color?
     public var state: Bool = false
+    public var animated: Bool = true
+    public var enabled: 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?
+    public var onTintColor: Color?
+    public var offTintColor: Color?
+    public var onKnobTintColor: Color?
+    public var offKnobTintColor: Color?
     
     //--------------------------------------------------
     // MARK: - Keys
@@ -30,12 +33,18 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case state
+        case animated
+        case enabled
         case action
         case backgroundColor
         case fieldKey
         case alternateAction
         case groupName
         case accessibilityText
+        case onTintColor
+        case offTintColor
+        case onKnobTintColor
+        case offKnobTintColor
     }
     
     //--------------------------------------------------
@@ -64,9 +73,19 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         if let state = try typeContainer.decodeIfPresent(Bool.self, forKey: .state) {
             self.state = state
         }
+        if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
+            self.enabled = enabled
+        }
+        if let animated = try typeContainer.decodeIfPresent(Bool.self, forKey: .animated) {
+            self.animated = animated
+        }
         action = try typeContainer.decodeModelIfPresent(codingKey: .action)
         alternateAction = try typeContainer.decodeModelIfPresent(codingKey: .alternateAction)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
+        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
@@ -82,6 +101,12 @@ public class ToggleModel: MoleculeModelProtocol, FormFieldProtocol {
         try container.encodeModelIfPresent(alternateAction, forKey: .alternateAction)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(state, forKey: .state)
+        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)
         try container.encodeIfPresent(accessibilityText, forKey: .accessibilityText)

MVMCoreUI/Atomic/Extensions/NSTextAlignment+Extension.swift

@@ -0,0 +1,89 @@
+//
+//  NSTextAlignment+Extension.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 3/24/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+/**
+ When using this class in codable for a String value from server.
+ 
+ Example use case....
+ 
+ var alignment: NSTextAlignment
+ 
+ enum CodingKeys: String, CodingKey {
+     case alignment
+ }
+ 
+ required public init(from decoder: Decoder) throws {
+     let container = try decoder.container(keyedBy: CodingKeys.self)
+     let word = try container.decode(String.self, forKey: .alignment)
+     alignment = NSTextAlignment(rawValue: word)!
+ }
+ 
+ public func encode(to encoder: Encoder) throws {
+     var container = encoder.container(keyedBy: CodingKeys.self)
+     try container.encode(alignment.rawValueString, forKey: .alignment)
+ }
+ */
+
+enum TextAlignmentError: Error {
+    case notAnAlignment
+}
+
+extension NSTextAlignment: RawRepresentable {
+    
+    init?(rawValue: String) {
+        switch rawValue {
+        case "left":
+            self = .left
+        case "center":
+            self = .center
+        case "right":
+            self = .right
+        case "justified":
+            self = .justified
+        case "natural":
+            self = .natural
+        default:
+            return nil
+        }
+    }
+    
+    var rawValueString: String {
+        switch self {
+        case .left:
+            return "left"
+        case .center:
+            return "center"
+        case .right:
+            return "right"
+        case .justified:
+            return "justified"
+        case .natural:
+            return "natural"
+        @unknown default:
+            return ""
+        }
+    }
+}
+
+extension NSTextAlignment: Codable {
+    public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.singleValueContainer()
+        let string = try typeContainer.decode(String.self)
+        guard let alignment = NSTextAlignment(rawValue: string) else {
+            throw TextAlignmentError.notAnAlignment
+        }
+        self = alignment
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(rawValueString)
+    }
+}

MVMCoreUI/Atomic/Extensions/UICollectionViewScrollPosition+Extension.swift

@@ -0,0 +1,71 @@
+//
+//  UICollectionViewScrollPosition+Extension.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 3/24/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+enum ScrollPositionError: Error {
+    case notAPosition
+}
+
+extension UICollectionView.ScrollPosition: RawRepresentable {
+    
+    init?(rawValue: String) {
+        switch rawValue {
+        case "left", "leading":
+            self = .left
+        case "centeredHorizontally", "center":
+            self = .centeredHorizontally
+        case "right", "trailing":
+            self = .right
+        case "top":
+            self = .top
+        case "bottom":
+            self = .bottom
+        case "centeredVertically":
+            self = .centeredVertically
+        default:
+            return nil
+        }
+    }
+    
+    
+    var rawValueString: String {
+        switch self {
+        case .left:
+            return "left"
+        case .centeredHorizontally:
+            return "centeredHorizontally"
+        case .right:
+            return "right"
+        case .top:
+            return "top"
+        case .bottom:
+            return "bottom"
+        case .centeredVertically:
+            return "centeredVertically"
+        default:
+            return ""
+        }
+    }
+}
+
+extension UICollectionView.ScrollPosition: Codable {
+    public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.singleValueContainer()
+        let string = try typeContainer.decode(String.self)
+        guard let position = UICollectionView.ScrollPosition(rawValue: string) else {
+            throw ScrollPositionError.notAPosition
+        }
+        self = position
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(rawValueString)
+    }
+}

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -0,0 +1,184 @@
+//
+//  MoleculeObjectMapping.swift
+//  MVMCoreUI
+//
+//  Created by Suresh, Kamlesh on 10/28/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers public class MoleculeObjectMapping: NSObject {
+    
+    public var moleculeMapping: [String: MoleculeViewProtocol.Type] = [:]
+
+    /// Returns the mapping object stored in the singleton
+    public static func shared() -> Self? {
+        return MVMCoreActionUtility.initializerClassCheck(CoreUIObject.sharedInstance()?.moleculeMap, classToVerify: self) as? Self
+    }
+    
+    /// Registers the model with the model registry and the view with the mapper.
+    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
+    public func getMoleculeClass(_ model: MoleculeModelProtocol) -> MoleculeViewProtocol.Type? {
+        return moleculeMapping[model.moleculeName]
+    }
+
+    /// Creates a molecule with the given model.
+    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)
+    }
+    
+    /// Call to register all of the CoreUI molecules.
+    public static func registerObjects() {
+        // Stacks
+        MoleculeObjectMapping.shared()?.register(viewClass: MoleculeStackView.self, viewModelClass: MoleculeStackModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Stack<StackModel>.self, viewModelClass: StackModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: UnOrderedList.self, viewModelClass: UnOrderedListModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: NumberedList.self, viewModelClass: NumberedListModel.self)
+        
+        // Label
+        MoleculeObjectMapping.shared()?.register(viewClass: Label.self, viewModelClass: LabelModel.self)
+        // need to move labelattributemodel to different method
+        try? ModelRegistry.register(LabelAttributeFontModel.self)
+        try? ModelRegistry.register(LabelAttributeColorModel.self)
+        try? ModelRegistry.register(LabelAttributeImageModel.self) // We need to separate the registry by types due to collisions...
+        try? ModelRegistry.register(LabelAttributeUnderlineModel.self)
+        try? ModelRegistry.register(LabelAttributeStrikeThroughModel.self)
+        try? ModelRegistry.register(LabelAttributeActionModel.self)
+        
+        // Buttons
+        MoleculeObjectMapping.shared()?.register(viewClass: PillButton.self, viewModelClass: ButtonModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: TwoButtonView.self, viewModelClass: TwoButtonViewModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ExternalLink.self, viewModelClass: ExternalLinkModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Link.self, viewModelClass: LinkModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: CaretLink.self, viewModelClass: CaretLinkModel.self)
+        
+        // Entry Field
+        MoleculeObjectMapping.shared()?.register(viewClass: TextEntryField.self, viewModelClass: TextEntryFieldModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: MdnEntryField.self, viewModelClass: MdnEntryFieldModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: DigitEntryField.self, viewModelClass: DigitEntryFieldModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ItemDropdownEntryField.self, viewModelClass: ItemDropdownEntryFieldModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: DateDropdownEntryField.self, viewModelClass: DateDropdownEntryFieldModel.self)
+        
+        // Other Atoms
+        MoleculeObjectMapping.shared()?.register(viewClass: ProgressBar.self, viewModelClass: ProgressBarModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: MultiProgress.self, viewModelClass: MultiProgressBarModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: CaretView.self, viewModelClass: CaretViewModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: DashLine.self, viewModelClass: DashLineModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: MFLoadImageView.self, viewModelClass: ImageViewModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Line.self, viewModelClass: LineModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: GraphView.self, viewModelClass: CircleProgressModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Toggle.self, viewModelClass: ToggleModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Checkbox.self, viewModelClass: CheckboxModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: CheckboxLabel.self, viewModelClass: CheckboxLabelModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Arrow.self, viewModelClass: ArrowModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: RadioButton.self, viewModelClass: RadioButtonModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: RadioButtonLabel.self, viewModelClass: RadioButtonLabelModel.self)
+
+        // Horizontal Combination Molecules
+        MoleculeObjectMapping.shared()?.register(viewClass: StringAndMoleculeView.self, viewModelClass: StringAndMoleculeModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ImageHeadlineBody.self, viewModelClass: ImageHeadlineBodyModel.self)
+        
+        // Vertical Combination Molecules
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadlineBody.self, viewModelClass: HeadlineBodyModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadLineBodyCaretLinkImage.self, viewModelClass: HeadlineBodyCaretLinkImageModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: EyebrowHeadlineBodyLink.self, viewModelClass: EyebrowHeadlineBodyLinkModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadlineBodyLink.self, viewModelClass: HeadlineBodyLinkModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadlineBodyButton.self, viewModelClass: HeadlineBodyButtonModel.self)
+
+        // Left Right Molecules
+        MoleculeObjectMapping.shared()?.register(viewClass: CornerLabels.self, viewModelClass: CornerLabelsModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: LeftRightLabelView.self, viewModelClass: LeftRightLabelModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: LabelToggle.self, viewModelClass: LabelToggleModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadlineBodyToggle.self, viewModelClass: HeadlineBodyToggleModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadlineBodyLinkToggle.self, viewModelClass: HeadlineBodyLinkToggleModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ActionDetailWithImage.self, viewModelClass: ActionDetailWithImageModel.self)
+
+        // List items
+        MoleculeObjectMapping.shared()?.register(viewClass: MoleculeTableViewCell.self, viewModelClass: MoleculeListItemModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: DropDownFilterTableViewCell.self, viewModelClass: DropDownListItemModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: AccordionMoleculeTableViewCell.self, viewModelClass: AccordionListItemModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: TabsTableViewCell.self, viewModelClass: TabsListItemModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListProgressBarData.self, viewModelClass: ListProgressBarDataModel.self)
+        
+        // Other Items
+        MoleculeObjectMapping.shared()?.register(viewClass: MoleculeStackItem.self, viewModelClass: MoleculeStackItemModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: StackItem.self, viewModelClass: StackItemModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: MoleculeCollectionViewCell.self, viewModelClass: CarouselItemModel.self)
+
+        // Other Container Molecules
+        MoleculeObjectMapping.shared()?.register(viewClass: MoleculeHeaderView.self, viewModelClass: MoleculeHeaderModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: FooterView.self, viewModelClass: FooterModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: Scroller.self, viewModelClass: ScrollerModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ModuleMolecule.self, viewModelClass: ModuleMoleculeModel.self)
+
+        // Other Molecules
+        MoleculeObjectMapping.shared()?.register(viewClass: DoughnutChartView.self, viewModelClass: DoughnutChartModel.self)
+        
+        // Other Organisms
+        MoleculeObjectMapping.shared()?.register(viewClass: Carousel.self, viewModelClass: CarouselModel.self)
+        
+        // Designed List Items
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconWithRightCaret.self, viewModelClass: ListLeftVariableIconWithRightCaretModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableCheckboxAllTextAndLinks.self, viewModelClass: ListLeftVariableCheckboxAllTextAndLinksModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableRadioButtonAndPaymentMethod.self, viewModelClass: ListLeftVariableRadioButtonAndPaymentMethodModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListRVWheel.self, viewModelClass: ListRVWheelModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariablePayments.self, viewModelClass: ListRightVariablePaymentsModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariableTotalData.self, viewModelClass: ListRightVariableTotalDataModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnFullWidthTextAllTextAndLinks.self, viewModelClass: ListOneColumnFullWidthTextAllTextAndLinksModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnFullWidthTextBodyText.self, viewModelClass: ListOneColumnFullWidthTextBodyTextModel.self)
+        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)
+
+        // Designed Section Dividers
+        MoleculeObjectMapping.shared()?.register(viewClass: ListFourColumnDataUsageDivider.self, viewModelClass: ListFourColumnDataUsageDividerModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListThreeColumnPlanDataDivider.self, viewModelClass: ListThreeColumnPlanDataDividerModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerShort.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerShortModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnTextWithWhitespaceDividerTall.self, viewModelClass: ListOneColumnTextWithWhitespaceDividerTallModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListOneColumnFullWidthTextDividerSubsection.self, viewModelClass: ListOneColumnFullWidthTextDividerSubsectionModel.self)
+
+        // Designed Headers
+        MoleculeObjectMapping.shared()?.register(viewClass: HeadersH2NoButtonsBodyText.self, viewModelClass: HeadersH2NoButtonsBodyTextModel.self)
+
+        // TODO: Need View
+        try? ModelRegistry.register(TabsModel.self)
+
+        // Helper models
+        try? ModelRegistry.register(RuleRequiredModel.self)
+        try? ModelRegistry.register(RuleAnyRequiredModel.self)
+        try? ModelRegistry.register(RuleAnyValueChangedModel.self)
+        try? ModelRegistry.register(RuleAllValueChangedModel.self)
+        try? ModelRegistry.register(RuleEqualsModel.self)
+        try? ModelRegistry.register(RuleRegexModel.self)
+        
+        // Actions
+        try? ModelRegistry.register(ActionTopAlertModel.self)
+        try? ModelRegistry.register(ActionCollapseNotificationModel.self)
+        try? ModelRegistry.register(ActionOpenPanelModel.self)
+    }
+    
+    /// Convenience function to get required modules for a give model
+    public static func getRequiredModules(for model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
+        guard let model = model else { return nil }
+        return MoleculeObjectMapping.shared()?.getMoleculeClass(model)?.requiredModules(with: model, delegateObject, error: error)
+    }
+
+    /// Convenience function to add require modules for the  given model to the passed in array.
+    public static func addRequiredModules(for model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, moduleList: inout [String]?, errorList: inout [MVMCoreErrorObject]?) {
+        guard let model = model else { return }
+        let error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>? = nil
+        if let modules = getRequiredModules(for: model, delegateObject, error: error) {
+            moduleList?.append(contentsOf: modules)
+        }
+        if let error = error?.pointee {
+            errorList?.append(error)
+        }
+    }
+}

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift

@@ -40,6 +40,7 @@ import UIKit
     
     override open func setupView() {
         super.setupView()
+        leftImage.addSizeConstraintsForAspectRatio = true
         addMolecule(stack)
         stack.restack()
         eyebrowHeadlineBodyLink.body.textColor = .mvmOrangeAA

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyTextModel.swift

@@ -20,7 +20,7 @@ public class ListOneColumnFullWidthTextBodyTextModel: ListItemModel, MoleculeMod
     // Defaults to set
     override public func setDefaults() {
         super.setDefaults()
-        headlineBody.style = "item"
+        headlineBody.style = .item
     }
     
     private enum CodingKeys: String, CodingKey {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift

@@ -39,7 +39,7 @@ import Foundation
     }
     
     //-------------------------------------------------
-    // MARK: - ModelMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     //-------------------------------------------------
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         super.set(with: model, delegateObject, additionalData)
@@ -50,7 +50,7 @@ import Foundation
     }
     
     //-------------------------------------------------
-    // MARK: - MVMCoreUIMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     //-------------------------------------------------
     open override func reset() {
         super.reset()

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift

@@ -36,6 +36,7 @@ import Foundation
     //-------------------------------------------------------
     override open func setupView() {
         super.setupView()
+        rightImage.addSizeConstraintsForAspectRatio = true
         addMolecule(stack)
         stack.restack()
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift

@@ -32,7 +32,7 @@ import UIKit
         rightLabel.updateView(size)
     }
     
-    // MARK: - MVMCoreUIMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? ListTwoColumnPriceDetailsModel else { return }

MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/ListProgressBarData.swift

@@ -44,7 +44,7 @@ import UIKit
     }
     
     //-----------------------------------------------------
-    // MARK: - ModelMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     //-----------------------------------------------------
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         super.set(with: model, delegateObject, additionalData)
@@ -59,7 +59,7 @@ import UIKit
     }
     
     //-----------------------------------------------------
-    // MARK: - MVMCoreUIMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     //-----------------------------------------------------
     override open func reset() {
         super.reset()

MVMCoreUI/Atomic/Molecules/DesignedComponents/SectionDividers/FourColumn/ListFourColumnDataUsageDivider.swift

@@ -38,7 +38,7 @@ import Foundation
         stack.restack()
     }
     
-    // MARK: - ModelMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable : Any]?) {
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? ListFourColumnDataUsageDividerModel else { return }
@@ -52,7 +52,7 @@ import Foundation
         return 121
     }
     
-    // MARK: - MVMCoreUIMoleculeViewProtocol
+    // MARK: - MoleculeViewProtocol
     open override func reset() {
         super.reset()
         label1.styleBoldBodySmall(true)