diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index 02373958..dfffcded 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -392,8 +392,23 @@ public typealias ActionBlockConfirmation = () -> (Bool)
             accessibilityLabel = accessibileString
         }
         
-        if let actionMap = model.action?.toJSON() {
-            didToggleAction = { MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject) }
+        let actionMap = model.action?.toJSON()
+        let alternateActionMap = model.alternateAction?.toJSON()
+        if actionMap != nil || alternateActionMap != nil {
+            didToggleAction = { [weak self] in
+                guard let self = self else { return }
+                if self.isOn {
+                    if actionMap != nil {
+                        MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
+                    }
+                } else {
+                    if alternateActionMap != nil {
+                         MVMCoreActionHandler.shared()?.handleAction(with: alternateActionMap, additionalData: additionalData, delegateObject: delegateObject)
+                    } else if actionMap != nil {
+                        MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
+                    }
+                }
+            }
         }
     }
     
diff --git a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
index 04280042..4696ce38 100644
--- a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
@@ -11,16 +11,23 @@ import Foundation
 public protocol TemplateProtocol: AnyObject {
     associatedtype TemplateModel: TemplateModelProtocol
     var templateModel: TemplateModel? { get set }
+    
+    func decodeTemplate(using decoder: JSONDecoder, from data: Data) throws -> TemplateModel
 }
 
 public extension TemplateProtocol where Self: ViewController {
+    
     func parseTemplate(json: [AnyHashable: Any]?) throws {
         guard let pageJSON = json else { return }
         let data = try JSONSerialization.data(withJSONObject: pageJSON)
         let decoder = JSONDecoder()
         try decoder.add(delegateObject: delegateObjectIVar)
-        let templateModel = try decoder.decode(TemplateModel.self, from: data)
-        self.templateModel = templateModel
+        self.templateModel = try decodeTemplate(using: decoder, from: data)
         self.pageModel = templateModel as? MVMControllerModelProtocol
     }
+    
+    func decodeTemplate(using decoder: JSONDecoder, from data: Data) throws -> TemplateModel {
+        return try decoder.decode(TemplateModel.self, from: data)
+    }
+    
 }
diff --git a/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift b/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
index b239bd81..b2b52573 100644
--- a/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
+++ b/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
@@ -8,12 +8,12 @@
 
 import Foundation
 
-@objcMembers public class ListPageTemplateModel: ThreeLayerModelBase {
+@objcMembers open class ListPageTemplateModel: ThreeLayerModelBase {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
     
-    public override class var identifier: String {
+    open override class var identifier: String {
         return "list"
     }
     public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]?
@@ -49,7 +49,7 @@ import Foundation
         try super.init(from: decoder)
     }
 
-    public override func encode(to encoder: Encoder) throws {
+    open override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeModelsIfPresent(molecules, forKey: .molecules)
diff --git a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
index 4be4e025..372ae778 100644
--- a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
@@ -28,6 +28,11 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         try super.parsePageJSON()
     }
     
+    // For subclassing the model.
+    open func decodeTemplate(using decoder: JSONDecoder, from data: Data) throws -> ListPageTemplateModel {
+        return try decoder.decode(ListPageTemplateModel.self, from: data)
+    }
+    
     open override var loadObject: MVMCoreLoadObject? {
         didSet {
             guard loadObject != oldValue else { return }
diff --git a/MVMCoreUI/Atomic/Templates/TemplateModel.swift b/MVMCoreUI/Atomic/Templates/TemplateModel.swift
index 01753414..bb8bb104 100644
--- a/MVMCoreUI/Atomic/Templates/TemplateModel.swift
+++ b/MVMCoreUI/Atomic/Templates/TemplateModel.swift
@@ -9,7 +9,8 @@
 import Foundation
 
 
-@objcMembers public class TemplateModel: MVMControllerModelProtocol, TabPageModelProtocol {
+@objcMembers open class TemplateModel: MVMControllerModelProtocol, TabPageModelProtocol {
+    
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Templates/ThreeLayerModelBase.swift b/MVMCoreUI/Atomic/Templates/ThreeLayerModelBase.swift
index f0276979..1120b0e7 100644
--- a/MVMCoreUI/Atomic/Templates/ThreeLayerModelBase.swift
+++ b/MVMCoreUI/Atomic/Templates/ThreeLayerModelBase.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-@objcMembers public class ThreeLayerModelBase: TemplateModel, ThreeLayerTemplateModelProtocol {
+@objcMembers open class ThreeLayerModelBase: TemplateModel, ThreeLayerTemplateModelProtocol {
     public var anchorHeader: Bool = false
     public var header: MoleculeModelProtocol?
     public var anchorFooter: Bool = false
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 09172362..228dbdcb 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -158,7 +158,7 @@ import UIKit
     
     open func parsePageJSON() throws {
     }
-
+    
     open class func verifyRequiredModulesLoaded(for loadObject: MVMCoreLoadObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool {
         guard let pageType = loadObject?.pageType, var modulesRequired = MVMCoreUIViewControllerMappingObject.shared()?.modulesRequired(forPageType: pageType),
             !modulesRequired.isEmpty else { return true }