From 66ffb32274d27dd1ff92fea222ba70b71b1096f6 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Fri, 18 Jul 2025 14:41:00 +0200
Subject: [PATCH 01/18] Migrate solution file to .slnx format

Replace legacy .sln format with modern .slnx format and relocate from src/ to project root
---
 Elmish.WPF.slnx                |  47 ++++++
 src/Elmish.WPF.sln             | 287 ---------------------------------
 src/Elmish.WPF.sln.DotSettings |  14 --
 3 files changed, 47 insertions(+), 301 deletions(-)
 create mode 100644 Elmish.WPF.slnx
 delete mode 100644 src/Elmish.WPF.sln
 delete mode 100644 src/Elmish.WPF.sln.DotSettings

diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
new file mode 100644
index 00000000..2e608ed0
--- /dev/null
+++ b/Elmish.WPF.slnx
@@ -0,0 +1,47 @@
+<Solution>
+  <Folder Name="/Samples/">
+    <Project Path="src/Samples/Capabilities.Core/Capabilities.Core.fsproj" />
+    <Project Path="src/Samples/Capabilities/Capabilities.csproj" />
+    <Project Path="src/Samples/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj" />
+    <Project Path="src/Samples/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj" />
+    <Project Path="src/Samples/FileDialogs.Core/FileDialogs.Core.fsproj" />
+    <Project Path="src/Samples/FileDialogs/FileDialogs.csproj" />
+    <Project Path="src/Samples/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj" />
+    <Project Path="src/Samples/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
+    <Project Path="src/Samples/Multiselect.Core/Multiselect.Core.fsproj" />
+    <Project Path="src/Samples/Multiselect/Multiselect.csproj" />
+    <Project Path="src/Samples/NewWindow.Core/NewWindow.Core.fsproj" />
+    <Project Path="src/Samples/NewWindow/NewWindow.csproj" />
+    <Project Path="src/Samples/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
+    <Project Path="src/Samples/OneWaySeq/OneWaySeq.csproj" />
+    <Project Path="src/Samples/SingleCounter.Core/SingleCounter.Core.fsproj" />
+    <Project Path="src/Samples/SingleCounter/SingleCounter.csproj" />
+    <Project Path="src/Samples/Sticky.Core/Sticky.Core.fsproj" />
+    <Project Path="src/Samples/Sticky/Sticky.csproj" />
+    <Project Path="src/Samples/SubModel.Core/SubModel.Core.fsproj" />
+    <Project Path="src/Samples/SubModel/SubModel.csproj" />
+    <Project Path="src/Samples/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
+    <Project Path="src/Samples/SubModelOpt/SubModelOpt.csproj" />
+    <Project Path="src/Samples/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj" />
+    <Project Path="src/Samples/SubModelSelectedItem/SubModelSelectedItem.csproj" />
+    <Project Path="src/Samples/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
+    <Project Path="src/Samples/SubModelSeq/SubModelSeq.csproj" />
+    <Project Path="src/Samples/SubModelStatic.Core/SubModelStatic.Core.fsproj" />
+    <Project Path="src/Samples/SubModelStatic/SubModelStatic.csproj" />
+    <Project Path="src/Samples/Threading.Core/Threading.Core.fsproj" />
+    <Project Path="src/Samples/Threading/Threading.csproj" />
+    <Project Path="src/Samples/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj" />
+    <Project Path="src/Samples/UiBoundCmdParam/UiBoundCmdParam.csproj" />
+    <Project Path="src/Samples/Validation.Core/Validation.Core.fsproj" />
+    <Project Path="src/Samples/Validation/Validation.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="README.md" />
+    <File Path="REFERENCE.md" />
+    <File Path="RELEASE_NOTES.md" />
+    <File Path="TUTORIAL.md" />
+  </Folder>
+  <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
+  <Project Path="src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj" />
+  <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj" />
+</Solution>
diff --git a/src/Elmish.WPF.sln b/src/Elmish.WPF.sln
deleted file mode 100644
index e72c6a8d..00000000
--- a/src/Elmish.WPF.sln
+++ /dev/null
@@ -1,287 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SingleCounter", "Samples\SingleCounter\SingleCounter.csproj", "{55F79BA4-8265-4612-8354-D04F91BF9B03}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SingleCounter.Core", "Samples\SingleCounter.Core\SingleCounter.Core.fsproj", "{2DBB8062-2843-43A0-B73C-4777A30BD4FF}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Elmish.WPF", "Elmish.WPF\Elmish.WPF.fsproj", "{8C6E8D34-7205-4C57-9722-87E30E4FC5CE}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "UiBoundCmdParam.Core", "Samples\UiBoundCmdParam.Core\UiBoundCmdParam.Core.fsproj", "{9581A1DE-70A6-4AC2-AF65-FD6E95F3A983}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UiBoundCmdParam", "Samples\UiBoundCmdParam\UiBoundCmdParam.csproj", "{574786BE-3A84-4A0F-99DE-0FB10ED4161F}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Validation.Core", "Samples\Validation.Core\Validation.Core.fsproj", "{69DED389-B4BB-4295-926D-1DFFB8995628}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Validation", "Samples\Validation\Validation.csproj", "{4BD0B0AF-C522-43F9-92BF-FB6205A9E2F6}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SubModel.Core", "Samples\SubModel.Core\SubModel.Core.fsproj", "{EA0640D2-D64B-4AE6-8876-5E33C53BD50E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SubModel", "Samples\SubModel\SubModel.csproj", "{A15C50F5-B4CF-45D3-A35B-DD385AEC5BB7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneWaySeq", "Samples\OneWaySeq\OneWaySeq.csproj", "{4A7B4B16-0FC3-4338-BE43-497F63818749}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "OneWaySeq.Core", "Samples\OneWaySeq.Core\OneWaySeq.Core.fsproj", "{E97A831B-0525-4248-8143-4E1114612071}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SubModelOpt.Core", "Samples\SubModelOpt.Core\SubModelOpt.Core.fsproj", "{47ADE238-C32B-4F19-9028-68EB8E09927C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SubModelOpt", "Samples\SubModelOpt\SubModelOpt.csproj", "{EB80831A-431C-4CEC-AC41-8E5163E4B857}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Elmish.WPF.Tests", "Elmish.WPF.Tests\Elmish.WPF.Tests.fsproj", "{54DFF909-F5DF-48A9-B57D-E57B0EE743FF}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "NewWindow.Core", "Samples\NewWindow.Core\NewWindow.Core.fsproj", "{9D01D459-4EAA-446E-BC2E-F5F66D29833A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewWindow", "Samples\NewWindow\NewWindow.csproj", "{7595D7F1-5B28-415F-97C2-470A375E3BCC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SubModelSeq", "Samples\SubModelSeq\SubModelSeq.csproj", "{DFAFDCF3-83E0-4440-AD8C-E45878C80F64}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SubModelSeq.Core", "Samples\SubModelSeq.Core\SubModelSeq.Core.fsproj", "{2946EBC5-5937-45EE-8F19-7AF0792B5A5B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SubModelSelectedItem", "Samples\SubModelSelectedItem\SubModelSelectedItem.csproj", "{6023315A-BC97-4C4A-930E-D6D01E1DC549}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SubModelSelectedItem.Core", "Samples\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj", "{5B2B78EA-DA5C-406B-97C2-2964E557E2DB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBindingsAndBehaviors", "Samples\EventBindingsAndBehaviors\EventBindingsAndBehaviors.csproj", "{A4D16DF7-7BA8-4833-8F06-1D151CC81DC2}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EventBindingsAndBehaviors.Core", "Samples\EventBindingsAndBehaviors.Core\EventBindingsAndBehaviors.Core.fsproj", "{35149AA6-9132-4D6F-B4BF-272D70CD81C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileDialogs", "Samples\FileDialogs\FileDialogs.csproj", "{E084B944-E21D-45A5-A1AE-C5A6A641CE92}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FileDialogs.Core", "Samples\FileDialogs.Core\FileDialogs.Core.fsproj", "{36A4AEAF-8282-47EC-B751-BB3D16AB1A20}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileDialogsCmdMsg", "Samples\FileDialogsCmdMsg\FileDialogsCmdMsg.csproj", "{F66F6E21-357E-4CE8-9807-042C5171AB06}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FileDialogsCmdMsg.Core", "Samples\FileDialogsCmdMsg.Core\FileDialogsCmdMsg.Core.fsproj", "{F095E7E4-28ED-4223-A92F-4E86922E34EF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51DF5F61-CE23-4BB5-A1D6-8421974B760B}"
-	ProjectSection(SolutionItems) = preProject
-		..\README.md = ..\README.md
-		..\RELEASE_NOTES.md = ..\RELEASE_NOTES.md
-		..\TUTORIAL.md = ..\TUTORIAL.md
-		..\REFERENCE.md = ..\REFERENCE.md
-	EndProjectSection
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Sticky.Core", "Samples\Sticky.Core\Sticky.Core.fsproj", "{F251BEA3-6AD1-4C14-9F3D-87FCFA4292EB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sticky", "Samples\Sticky\Sticky.csproj", "{668E3AAD-B2AA-4934-804E-234C4F502038}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Capabilities.Core", "Samples\Capabilities.Core\Capabilities.Core.fsproj", "{B3BD88DC-7362-46F8-8040-6574C7B6B759}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Capabilities", "Samples\Capabilities\Capabilities.csproj", "{BDA46408-691C-47FA-8670-92A5D04663EB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Multiselect", "Samples\Multiselect\Multiselect.csproj", "{57EB1D0A-9182-4A7F-818B-8FDCA58D7321}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Multiselect.Core", "Samples\Multiselect.Core\Multiselect.Core.fsproj", "{DFF15AD9-337E-4301-9A05-5CFA147C457E}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Elmish.WPF.Benchmarks", "Elmish.WPF.Benchmarks\Elmish.WPF.Benchmarks.fsproj", "{240E981A-BEEF-41A1-A214-135E52DCA956}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SubModelStatic", "Samples\SubModelStatic\SubModelStatic.csproj", "{3F50DF04-DE1F-4368-9584-E318FE41AC2C}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SubModelStatic.Core", "Samples\SubModelStatic.Core\SubModelStatic.Core.fsproj", "{F0064852-8E7F-437B-A414-72EB0FA46711}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Threading.Core", "Samples\Threading.Core\Threading.Core.fsproj", "{B5029D1D-73A0-4C08-A4A0-1BF52CE919C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Threading", "Samples\Threading\Threading.csproj", "{36565661-EA23-4965-97A0-2F4FDA0B4B67}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{55F79BA4-8265-4612-8354-D04F91BF9B03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55F79BA4-8265-4612-8354-D04F91BF9B03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55F79BA4-8265-4612-8354-D04F91BF9B03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55F79BA4-8265-4612-8354-D04F91BF9B03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DBB8062-2843-43A0-B73C-4777A30BD4FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DBB8062-2843-43A0-B73C-4777A30BD4FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DBB8062-2843-43A0-B73C-4777A30BD4FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DBB8062-2843-43A0-B73C-4777A30BD4FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C6E8D34-7205-4C57-9722-87E30E4FC5CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C6E8D34-7205-4C57-9722-87E30E4FC5CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C6E8D34-7205-4C57-9722-87E30E4FC5CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C6E8D34-7205-4C57-9722-87E30E4FC5CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9581A1DE-70A6-4AC2-AF65-FD6E95F3A983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9581A1DE-70A6-4AC2-AF65-FD6E95F3A983}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9581A1DE-70A6-4AC2-AF65-FD6E95F3A983}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9581A1DE-70A6-4AC2-AF65-FD6E95F3A983}.Release|Any CPU.Build.0 = Release|Any CPU
-		{574786BE-3A84-4A0F-99DE-0FB10ED4161F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{574786BE-3A84-4A0F-99DE-0FB10ED4161F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{574786BE-3A84-4A0F-99DE-0FB10ED4161F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{574786BE-3A84-4A0F-99DE-0FB10ED4161F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69DED389-B4BB-4295-926D-1DFFB8995628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69DED389-B4BB-4295-926D-1DFFB8995628}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69DED389-B4BB-4295-926D-1DFFB8995628}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69DED389-B4BB-4295-926D-1DFFB8995628}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BD0B0AF-C522-43F9-92BF-FB6205A9E2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BD0B0AF-C522-43F9-92BF-FB6205A9E2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BD0B0AF-C522-43F9-92BF-FB6205A9E2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BD0B0AF-C522-43F9-92BF-FB6205A9E2F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA0640D2-D64B-4AE6-8876-5E33C53BD50E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA0640D2-D64B-4AE6-8876-5E33C53BD50E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA0640D2-D64B-4AE6-8876-5E33C53BD50E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA0640D2-D64B-4AE6-8876-5E33C53BD50E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A15C50F5-B4CF-45D3-A35B-DD385AEC5BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A15C50F5-B4CF-45D3-A35B-DD385AEC5BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A15C50F5-B4CF-45D3-A35B-DD385AEC5BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A15C50F5-B4CF-45D3-A35B-DD385AEC5BB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A7B4B16-0FC3-4338-BE43-497F63818749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A7B4B16-0FC3-4338-BE43-497F63818749}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A7B4B16-0FC3-4338-BE43-497F63818749}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A7B4B16-0FC3-4338-BE43-497F63818749}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E97A831B-0525-4248-8143-4E1114612071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E97A831B-0525-4248-8143-4E1114612071}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E97A831B-0525-4248-8143-4E1114612071}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E97A831B-0525-4248-8143-4E1114612071}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47ADE238-C32B-4F19-9028-68EB8E09927C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47ADE238-C32B-4F19-9028-68EB8E09927C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47ADE238-C32B-4F19-9028-68EB8E09927C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47ADE238-C32B-4F19-9028-68EB8E09927C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB80831A-431C-4CEC-AC41-8E5163E4B857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB80831A-431C-4CEC-AC41-8E5163E4B857}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB80831A-431C-4CEC-AC41-8E5163E4B857}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB80831A-431C-4CEC-AC41-8E5163E4B857}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54DFF909-F5DF-48A9-B57D-E57B0EE743FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54DFF909-F5DF-48A9-B57D-E57B0EE743FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54DFF909-F5DF-48A9-B57D-E57B0EE743FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54DFF909-F5DF-48A9-B57D-E57B0EE743FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D01D459-4EAA-446E-BC2E-F5F66D29833A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D01D459-4EAA-446E-BC2E-F5F66D29833A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D01D459-4EAA-446E-BC2E-F5F66D29833A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D01D459-4EAA-446E-BC2E-F5F66D29833A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7595D7F1-5B28-415F-97C2-470A375E3BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7595D7F1-5B28-415F-97C2-470A375E3BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7595D7F1-5B28-415F-97C2-470A375E3BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7595D7F1-5B28-415F-97C2-470A375E3BCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFAFDCF3-83E0-4440-AD8C-E45878C80F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFAFDCF3-83E0-4440-AD8C-E45878C80F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFAFDCF3-83E0-4440-AD8C-E45878C80F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFAFDCF3-83E0-4440-AD8C-E45878C80F64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2946EBC5-5937-45EE-8F19-7AF0792B5A5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2946EBC5-5937-45EE-8F19-7AF0792B5A5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2946EBC5-5937-45EE-8F19-7AF0792B5A5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2946EBC5-5937-45EE-8F19-7AF0792B5A5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6023315A-BC97-4C4A-930E-D6D01E1DC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6023315A-BC97-4C4A-930E-D6D01E1DC549}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6023315A-BC97-4C4A-930E-D6D01E1DC549}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6023315A-BC97-4C4A-930E-D6D01E1DC549}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B2B78EA-DA5C-406B-97C2-2964E557E2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B2B78EA-DA5C-406B-97C2-2964E557E2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B2B78EA-DA5C-406B-97C2-2964E557E2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B2B78EA-DA5C-406B-97C2-2964E557E2DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4D16DF7-7BA8-4833-8F06-1D151CC81DC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D16DF7-7BA8-4833-8F06-1D151CC81DC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D16DF7-7BA8-4833-8F06-1D151CC81DC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4D16DF7-7BA8-4833-8F06-1D151CC81DC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35149AA6-9132-4D6F-B4BF-272D70CD81C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35149AA6-9132-4D6F-B4BF-272D70CD81C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35149AA6-9132-4D6F-B4BF-272D70CD81C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35149AA6-9132-4D6F-B4BF-272D70CD81C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E084B944-E21D-45A5-A1AE-C5A6A641CE92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E084B944-E21D-45A5-A1AE-C5A6A641CE92}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E084B944-E21D-45A5-A1AE-C5A6A641CE92}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E084B944-E21D-45A5-A1AE-C5A6A641CE92}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36A4AEAF-8282-47EC-B751-BB3D16AB1A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36A4AEAF-8282-47EC-B751-BB3D16AB1A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36A4AEAF-8282-47EC-B751-BB3D16AB1A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36A4AEAF-8282-47EC-B751-BB3D16AB1A20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F66F6E21-357E-4CE8-9807-042C5171AB06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F66F6E21-357E-4CE8-9807-042C5171AB06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F66F6E21-357E-4CE8-9807-042C5171AB06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F66F6E21-357E-4CE8-9807-042C5171AB06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F095E7E4-28ED-4223-A92F-4E86922E34EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F095E7E4-28ED-4223-A92F-4E86922E34EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F095E7E4-28ED-4223-A92F-4E86922E34EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F095E7E4-28ED-4223-A92F-4E86922E34EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F251BEA3-6AD1-4C14-9F3D-87FCFA4292EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F251BEA3-6AD1-4C14-9F3D-87FCFA4292EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F251BEA3-6AD1-4C14-9F3D-87FCFA4292EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F251BEA3-6AD1-4C14-9F3D-87FCFA4292EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668E3AAD-B2AA-4934-804E-234C4F502038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668E3AAD-B2AA-4934-804E-234C4F502038}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668E3AAD-B2AA-4934-804E-234C4F502038}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668E3AAD-B2AA-4934-804E-234C4F502038}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B3BD88DC-7362-46F8-8040-6574C7B6B759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3BD88DC-7362-46F8-8040-6574C7B6B759}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3BD88DC-7362-46F8-8040-6574C7B6B759}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3BD88DC-7362-46F8-8040-6574C7B6B759}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDA46408-691C-47FA-8670-92A5D04663EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDA46408-691C-47FA-8670-92A5D04663EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDA46408-691C-47FA-8670-92A5D04663EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDA46408-691C-47FA-8670-92A5D04663EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57EB1D0A-9182-4A7F-818B-8FDCA58D7321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57EB1D0A-9182-4A7F-818B-8FDCA58D7321}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57EB1D0A-9182-4A7F-818B-8FDCA58D7321}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57EB1D0A-9182-4A7F-818B-8FDCA58D7321}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFF15AD9-337E-4301-9A05-5CFA147C457E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFF15AD9-337E-4301-9A05-5CFA147C457E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFF15AD9-337E-4301-9A05-5CFA147C457E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFF15AD9-337E-4301-9A05-5CFA147C457E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{240E981A-BEEF-41A1-A214-135E52DCA956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{240E981A-BEEF-41A1-A214-135E52DCA956}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{240E981A-BEEF-41A1-A214-135E52DCA956}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{240E981A-BEEF-41A1-A214-135E52DCA956}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F50DF04-DE1F-4368-9584-E318FE41AC2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F50DF04-DE1F-4368-9584-E318FE41AC2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F50DF04-DE1F-4368-9584-E318FE41AC2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F50DF04-DE1F-4368-9584-E318FE41AC2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0064852-8E7F-437B-A414-72EB0FA46711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0064852-8E7F-437B-A414-72EB0FA46711}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0064852-8E7F-437B-A414-72EB0FA46711}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0064852-8E7F-437B-A414-72EB0FA46711}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5029D1D-73A0-4C08-A4A0-1BF52CE919C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5029D1D-73A0-4C08-A4A0-1BF52CE919C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5029D1D-73A0-4C08-A4A0-1BF52CE919C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5029D1D-73A0-4C08-A4A0-1BF52CE919C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36565661-EA23-4965-97A0-2F4FDA0B4B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36565661-EA23-4965-97A0-2F4FDA0B4B67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36565661-EA23-4965-97A0-2F4FDA0B4B67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36565661-EA23-4965-97A0-2F4FDA0B4B67}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{55F79BA4-8265-4612-8354-D04F91BF9B03} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{2DBB8062-2843-43A0-B73C-4777A30BD4FF} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{9581A1DE-70A6-4AC2-AF65-FD6E95F3A983} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{574786BE-3A84-4A0F-99DE-0FB10ED4161F} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{69DED389-B4BB-4295-926D-1DFFB8995628} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{4BD0B0AF-C522-43F9-92BF-FB6205A9E2F6} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{EA0640D2-D64B-4AE6-8876-5E33C53BD50E} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{A15C50F5-B4CF-45D3-A35B-DD385AEC5BB7} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{4A7B4B16-0FC3-4338-BE43-497F63818749} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{E97A831B-0525-4248-8143-4E1114612071} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{47ADE238-C32B-4F19-9028-68EB8E09927C} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{EB80831A-431C-4CEC-AC41-8E5163E4B857} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{9D01D459-4EAA-446E-BC2E-F5F66D29833A} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{7595D7F1-5B28-415F-97C2-470A375E3BCC} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{DFAFDCF3-83E0-4440-AD8C-E45878C80F64} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{2946EBC5-5937-45EE-8F19-7AF0792B5A5B} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{6023315A-BC97-4C4A-930E-D6D01E1DC549} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{5B2B78EA-DA5C-406B-97C2-2964E557E2DB} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{A4D16DF7-7BA8-4833-8F06-1D151CC81DC2} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{35149AA6-9132-4D6F-B4BF-272D70CD81C5} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{E084B944-E21D-45A5-A1AE-C5A6A641CE92} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{36A4AEAF-8282-47EC-B751-BB3D16AB1A20} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{F66F6E21-357E-4CE8-9807-042C5171AB06} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{F095E7E4-28ED-4223-A92F-4E86922E34EF} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{F251BEA3-6AD1-4C14-9F3D-87FCFA4292EB} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{668E3AAD-B2AA-4934-804E-234C4F502038} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{B3BD88DC-7362-46F8-8040-6574C7B6B759} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{BDA46408-691C-47FA-8670-92A5D04663EB} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{57EB1D0A-9182-4A7F-818B-8FDCA58D7321} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{DFF15AD9-337E-4301-9A05-5CFA147C457E} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{3F50DF04-DE1F-4368-9584-E318FE41AC2C} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{F0064852-8E7F-437B-A414-72EB0FA46711} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{B5029D1D-73A0-4C08-A4A0-1BF52CE919C4} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-		{36565661-EA23-4965-97A0-2F4FDA0B4B67} = {BBAFEB1E-93C0-4C7E-8E0A-026BB05C88EC}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3125D461-08F4-4071-AAE5-1038EF84A360}
-	EndGlobalSection
-EndGlobal
diff --git a/src/Elmish.WPF.sln.DotSettings b/src/Elmish.WPF.sln.DotSettings
deleted file mode 100644
index cc7500a2..00000000
--- a/src/Elmish.WPF.sln.DotSettings
+++ /dev/null
@@ -1,14 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Elmish/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=modally/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=paramref/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Requery/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unkeyed/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=vopt/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=WPF_0027s/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wlaschin/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=composability/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=declaratively/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=memoizes/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=memoizing/@EntryIndexedValue">True</s:Boolean>
-</wpf:ResourceDictionary>

From 5fff0a1b0651d1db13000ef1f997b9f2efb45486 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Fri, 18 Jul 2025 14:51:46 +0200
Subject: [PATCH 02/18] Configure EditorConfig for project file formatting

Restrict 2-space indentation to XML-based files (xml, slnx, fsproj, csproj, xaml)
Install dotnet tool fantomas to handle F# formatting
---
 .config/dotnet-tools.json | 13 +++++++++++++
 .editorconfig             |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 .config/dotnet-tools.json

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 00000000..476dd7c3
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "fantomas": {
+      "version": "7.0.3",
+      "commands": [
+        "fantomas"
+      ],
+      "rollForward": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
index de329fa9..1cc6785c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,4 +4,6 @@ root = true
 insert_final_newline = false
 trim_trailing_whitespace = true
 indent_style = space
+
+[*.{xml,slnx,fsproj,csproj,xaml}]
 indent_size = 2
\ No newline at end of file

From ff8c2532a45e7388f7e1487a5262e3c86a945f9d Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 15:09:55 +0200
Subject: [PATCH 03/18] Add files to .slnx

Include .editorconfig, .gitignore, and LICENSE.md in solution folder
---
 Elmish.WPF.slnx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 2e608ed0..94d7e7b5 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -40,8 +40,11 @@
     <File Path="REFERENCE.md" />
     <File Path="RELEASE_NOTES.md" />
     <File Path="TUTORIAL.md" />
+    <File Path=".editorconfig" />
+    <File Path=".gitignore" />
+    <File Path="LICENSE.md" />
   </Folder>
   <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
   <Project Path="src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj" />
   <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj" />
-</Solution>
+</Solution>
\ No newline at end of file

From 929b851a4a6261936c5dd40d5e4aa5c94e752b0b Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 15:41:46 +0200
Subject: [PATCH 04/18]  Apply Fantomas code formatting across entire codebase

Format all F# source files in src/Elmish.WPF/
Format all F# test files in src/Elmish.WPF.Tests/
Format all F# sample project files
Standardize code style and indentation
---
 src/Elmish.WPF.Benchmarks/Program.fs          |   44 +-
 src/Elmish.WPF.Tests/AutoOpen.fs              |  110 +-
 src/Elmish.WPF.Tests/BindingTests.fs          | 4463 +++++----
 src/Elmish.WPF.Tests/BindingVmHelpersTests.fs |  203 +-
 src/Elmish.WPF.Tests/DynamicViewModelTests.fs | 2546 +++---
 src/Elmish.WPF.Tests/MergeTests.fs            |  549 +-
 src/Elmish.WPF.Tests/StaticViewModelTests.fs  |  494 +-
 src/Elmish.WPF.Tests/UtilsTests.fs            |  272 +-
 src/Elmish.WPF/Binding.fs                     | 8130 ++++++++---------
 src/Elmish.WPF/BindingData.fs                 | 1592 ++--
 src/Elmish.WPF/BindingVmHelpers.fs            | 1596 ++--
 src/Elmish.WPF/Command.fs                     |   41 +-
 src/Elmish.WPF/InternalUtils.fs               |  130 +-
 src/Elmish.WPF/Merge.fs                       |  494 +-
 src/Elmish.WPF/Utils.fs                       |   51 +-
 src/Elmish.WPF/ViewModelArgs.fs               |   68 +-
 src/Elmish.WPF/ViewModelModule.fs             |    4 +-
 src/Elmish.WPF/ViewModels.fs                  |  727 +-
 src/Elmish.WPF/WindowState.fs                 |   81 +-
 src/Elmish.WPF/WpfProgram.fs                  |  733 +-
 src/Samples/Capabilities.Core/Program.fs      |   96 +-
 src/Samples/Capabilities.Core/Selection.fs    |  117 +-
 src/Samples/Capabilities.Core/Utilities.fs    |    3 +-
 .../EventBindingsAndBehaviors.Core/Program.fs |  111 +-
 src/Samples/FileDialogs.Core/Program.fs       |  167 +-
 src/Samples/FileDialogsCmdMsg.Core/Program.fs |  208 +-
 src/Samples/Multiselect.Core/Program.fs       |   97 +-
 src/Samples/NewWindow.Core/App.fs             |  108 +-
 src/Samples/NewWindow.Core/AutoOpen.fs        |   32 +-
 src/Samples/NewWindow.Core/Program.fs         |   39 +-
 src/Samples/NewWindow.Core/Window1.fs         |    6 +-
 src/Samples/NewWindow.Core/Window2.fs         |  119 +-
 src/Samples/OneWaySeq.Core/Program.fs         |   57 +-
 src/Samples/SingleCounter.Core/Program.fs     |   65 +-
 src/Samples/Sticky.Core/Program.fs            |   71 +-
 src/Samples/SubModel.Core/Program.fs          |  272 +-
 src/Samples/SubModelOpt.Core/Program.fs       |  209 +-
 .../SubModelSelectedItem.Core/Program.fs      |   69 +-
 src/Samples/SubModelSeq.Core/Program.fs       |  450 +-
 src/Samples/SubModelStatic.Core/Program.fs    |  355 +-
 src/Samples/Threading.Core/Program.fs         |   98 +-
 src/Samples/UiBoundCmdParam.Core/Program.fs   |   59 +-
 src/Samples/Validation.Core/Program.fs        |  137 +-
 43 files changed, 13054 insertions(+), 12219 deletions(-)

diff --git a/src/Elmish.WPF.Benchmarks/Program.fs b/src/Elmish.WPF.Benchmarks/Program.fs
index 3ef14862..e79b0467 100644
--- a/src/Elmish.WPF.Benchmarks/Program.fs
+++ b/src/Elmish.WPF.Benchmarks/Program.fs
@@ -4,34 +4,36 @@ open BenchmarkDotNet.Attributes
 open BenchmarkDotNet.Running
 
 type public BenchmarkDynamicViewModel() =
-  let mutable model = 0
-  let mutable vm = DynamicViewModel<int, obj>(ViewModelArgs.simple model, [])
+    let mutable model = 0
+    let mutable vm = DynamicViewModel<int, obj>(ViewModelArgs.simple model, [])
 
-  [<GlobalSetup>]
-  member public x.GlobalSetup() =
-    let createBinding i =
-      Binding.oneWay id $"testBinding_%i{i}"
+    [<GlobalSetup>]
+    member public x.GlobalSetup() =
+        let createBinding i = Binding.oneWay id $"testBinding_%i{i}"
 
-    let bindings =
-      System.Linq.Enumerable.Range(0, x.BindingCount) |> Seq.map createBinding |> Seq.toList
+        let bindings =
+            System.Linq.Enumerable.Range(0, x.BindingCount)
+            |> Seq.map createBinding
+            |> Seq.toList
 
-    vm <- DynamicViewModel<int, obj>(ViewModelArgs.simple model, bindings)
+        vm <- DynamicViewModel<int, obj>(ViewModelArgs.simple model, bindings)
 
 
-  [<Benchmark>]
-  member public x.Update() =
-    model <- 0
-    while model < x.UpdateCount do
-      model <- model + 1
-      IViewModel.updateModel (vm, model)
+    [<Benchmark>]
+    member public x.Update() =
+        model <- 0
 
-    vm :> obj
+        while model < x.UpdateCount do
+            model <- model + 1
+            IViewModel.updateModel (vm, model)
 
-  [<Params (1, 10, 100)>]
-  member val public BindingCount = 0 with get, set
+        vm :> obj
 
-  [<Params (1, 100, 10000)>]
-  member val public UpdateCount = 0 with get, set
+    [<Params(1, 10, 100)>]
+    member val public BindingCount = 0 with get, set
 
+    [<Params(1, 100, 10000)>]
+    member val public UpdateCount = 0 with get, set
 
-let _ = BenchmarkRunner.Run<BenchmarkDynamicViewModel>()
+
+let _ = BenchmarkRunner.Run<BenchmarkDynamicViewModel>()
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/AutoOpen.fs b/src/Elmish.WPF.Tests/AutoOpen.fs
index f6216e3b..d7c5ef81 100644
--- a/src/Elmish.WPF.Tests/AutoOpen.fs
+++ b/src/Elmish.WPF.Tests/AutoOpen.fs
@@ -3,72 +3,76 @@ module AutoOpen
 
 
 type InvokeTester<'a, 'b>(f: 'a -> 'b) =
-  let mutable count = 0
-  let mutable values = []
-  let wrapped a =
-    count <- count + 1
-    values <- values @ [a]
-    f a
-  member __.Fn = wrapped
-  member __.Count = count
-  member __.Values = values
-  member __.Reset () =
-    count <- 0
-    values <- []
+    let mutable count = 0
+    let mutable values = []
+
+    let wrapped a =
+        count <- count + 1
+        values <- values @ [ a ]
+        f a
+
+    member __.Fn = wrapped
+    member __.Count = count
+    member __.Values = values
+
+    member __.Reset() =
+        count <- 0
+        values <- []
 
 
 type InvokeTester2<'a, 'b, 'c>(f: 'a -> 'b -> 'c) =
-  let mutable count = 0
-  let mutable values = []
-  let wrapped a b =
-    count <- count + 1
-    values <- values @ [a, b]
-    f a b
-  member __.Fn = wrapped
-  member __.Count = count
-  member __.Values = values
-  member __.Reset () =
-    count <- 0
-    values <- []
+    let mutable count = 0
+    let mutable values = []
+
+    let wrapped a b =
+        count <- count + 1
+        values <- values @ [ a, b ]
+        f a b
+
+    member __.Fn = wrapped
+    member __.Count = count
+    member __.Values = values
+
+    member __.Reset() =
+        count <- 0
+        values <- []
 
 
 type InvokeTester3<'a, 'b, 'c, 'd>(f: 'a -> 'b -> 'c -> 'd) =
-  let mutable count = 0
-  let mutable values = []
-  let wrapped a b c =
-    count <- count + 1
-    values <- values @ [a, b, c]
-    f a b c
-  member __.Fn = wrapped
-  member __.Count = count
-  member __.Values = values
-  member __.Reset () =
-    count <- 0
-    values <- []
+    let mutable count = 0
+    let mutable values = []
+
+    let wrapped a b c =
+        count <- count + 1
+        values <- values @ [ a, b, c ]
+        f a b c
+
+    member __.Fn = wrapped
+    member __.Count = count
+    member __.Values = values
+
+    member __.Reset() =
+        count <- 0
+        values <- []
 
 
 [<RequireQualifiedAccess>]
 module String =
 
-  let length (s: string) = s.Length
+    let length (s: string) = s.Length
 
 
 [<RequireQualifiedAccess>]
 module List =
 
-  let swap i j =
-    List.permute
-      (function
-        | a when a = i -> j
-        | a when a = j -> i
-        | a -> a)
-
-  let insert i a ma =
-    (ma |> List.take i)
-    @ [ a ]
-    @ (ma |> List.skip i)
-
-  let replace i a ma =
-    (ma |> List.take i)
-    @ [ a ]
-    @ (ma |> List.skip (i + 1))
+    let swap i j =
+        List.permute (function
+            | a when a = i -> j
+            | a when a = j -> i
+            | a -> a)
+
+    let insert i a ma =
+        (ma |> List.take i) @ [ a ] @ (ma |> List.skip i)
+
+    let replace i a ma =
+        (ma |> List.take i) @ [ a ] @ (ma |> List.skip (i + 1))
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/BindingTests.fs b/src/Elmish.WPF.Tests/BindingTests.fs
index 5f805f73..c3607ddb 100644
--- a/src/Elmish.WPF.Tests/BindingTests.fs
+++ b/src/Elmish.WPF.Tests/BindingTests.fs
@@ -10,2986 +10,3401 @@ open Elmish.WPF
 [<AutoOpen>]
 module internal Helpers =
 
-  let fail _ = failwith "Placeholder function was invoked"
-  let fail2 _ _ = failwith "Placeholder function was invoked"
-
-  let rec getBaseBindingData = function
-    | BaseBindingData d -> d
-    | CachingData d -> getBaseBindingData d
-    | ValidationData d -> getBaseBindingData d.BindingData
-    | LazyData d ->
-        d.BindingData
-        |> BindingData.mapModel d.Get
-        |> BindingData.mapMsgWithModel d.Set
-        |> getBaseBindingData
-    | AlterMsgStreamData _ -> raise (System.NotSupportedException()) // hack: reasonable because this is test code and the tests don't currently use this case
-
-  let getOneWayData f =
-    match getBaseBindingData (f "").Data with
-    | OneWayData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getOneWaySeqData f =
-    match getBaseBindingData (f "").Data with
-    | OneWaySeqData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getTwoWayData f =
-    match getBaseBindingData (f "").Data with
-    | TwoWayData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getCmdData f =
-    match getBaseBindingData (f "").Data with
-    | CmdData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getSubModelData f =
-    match getBaseBindingData (f "").Data with
-    | SubModelData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getSubModelSeqKeyedData f =
-    match getBaseBindingData (f "").Data with
-    | SubModelSeqKeyedData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getSubModelSelectedItemData f =
-    match getBaseBindingData (f "").Data with
-    | SubModelSelectedItemData d -> d
-    | _ -> failwith "Incorrect binding"
-
-  let getValidationData f =
-    match f "" with
-    | { Data = ValidationData d } -> d
-    | _ -> failwith "Incorrect binding"
+    let fail _ =
+        failwith "Placeholder function was invoked"
+
+    let fail2 _ _ =
+        failwith "Placeholder function was invoked"
+
+    let rec getBaseBindingData =
+        function
+        | BaseBindingData d -> d
+        | CachingData d -> getBaseBindingData d
+        | ValidationData d -> getBaseBindingData d.BindingData
+        | LazyData d ->
+            d.BindingData
+            |> BindingData.mapModel d.Get
+            |> BindingData.mapMsgWithModel d.Set
+            |> getBaseBindingData
+        | AlterMsgStreamData _ -> raise (System.NotSupportedException()) // hack: reasonable because this is test code and the tests don't currently use this case
+
+    let getOneWayData f =
+        match getBaseBindingData (f "").Data with
+        | OneWayData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getOneWaySeqData f =
+        match getBaseBindingData (f "").Data with
+        | OneWaySeqData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getTwoWayData f =
+        match getBaseBindingData (f "").Data with
+        | TwoWayData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getCmdData f =
+        match getBaseBindingData (f "").Data with
+        | CmdData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getSubModelData f =
+        match getBaseBindingData (f "").Data with
+        | SubModelData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getSubModelSeqKeyedData f =
+        match getBaseBindingData (f "").Data with
+        | SubModelSeqKeyedData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getSubModelSelectedItemData f =
+        match getBaseBindingData (f "").Data with
+        | SubModelSelectedItemData d -> d
+        | _ -> failwith "Incorrect binding"
+
+    let getValidationData f =
+        match f "" with
+        | { Data = ValidationData d } -> d
+        | _ -> failwith "Incorrect binding"
 
 
 
 module oneWay =
 
 
-  [<Fact>]
-  let ``sets the correct binding name`` () =
-    Property.check <| property {
-      let! bindingName = GenX.auto<string>
-      let binding = bindingName |> Binding.OneWay.id
-      test <@ binding.Name = bindingName @>
-    }
+    [<Fact>]
+    let ``sets the correct binding name`` () =
+        Property.check
+        <| property {
+            let! bindingName = GenX.auto<string>
+            let binding = bindingName |> Binding.OneWay.id
+            test <@ binding.Name = bindingName @>
+        }
 
 
-  [<Fact>]
-  let ``final get returns value from original get`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int>
+    [<Fact>]
+    let ``final get returns value from original get`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int>
 
-      let get = string<int>
-      let d = Binding.oneWay(get) |> getOneWayData
+            let get = string<int>
+            let d = Binding.oneWay (get) |> getOneWayData
 
-      test <@ d.Get x |> unbox = get x @>
-    }
+            test <@ d.Get x |> unbox = get x @>
+        }
 
 
 module oneWayOpt =
 
 
-  module option =
+    module option =
 
 
-    [<Fact>]
-    let ``when original get returns Some, final get returns the inner value`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns Some, final get returns the inner value`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string >> Some
-        let d = Binding.oneWayOpt(get) |> getOneWayData
+                let get = string >> Some
+                let d = Binding.oneWayOpt (get) |> getOneWayData
 
-        test <@ d.Get x |> unbox = (get x).Value @>
-      }
+                test <@ d.Get x |> unbox = (get x).Value @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns None, final get returns null`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns None, final get returns null`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get _ = None
-        let d = Binding.oneWayOpt(get) |> getOneWayData
+                let get _ = None
+                let d = Binding.oneWayOpt (get) |> getOneWayData
 
-        test <@ isNull (d.Get x) @>
-      }
+                test <@ isNull (d.Get x) @>
+            }
 
 
 
-  module voption =
+    module voption =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.oneWayOpt((fail: _ -> _ voption))
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.oneWayOpt ((fail: _ -> _ voption))
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns ValueSome, final get returns the inner value`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns ValueSome, final get returns the inner value`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string >> ValueSome
-        let d = Binding.oneWayOpt(get) |> getOneWayData
+                let get = string >> ValueSome
+                let d = Binding.oneWayOpt (get) |> getOneWayData
 
-        test <@ d.Get x |> unbox = (get x).Value @>
-      }
+                test <@ d.Get x |> unbox = (get x).Value @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns ValueNone, final get returns null`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns ValueNone, final get returns null`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get _ = ValueNone
-        let d = Binding.oneWayOpt(get) |> getOneWayData
+                let get _ = ValueNone
+                let d = Binding.oneWayOpt (get) |> getOneWayData
 
-        test <@ isNull (d.Get x) @>
-      }
+                test <@ isNull (d.Get x) @>
+            }
 
 
 
 module oneWaySeq =
 
 
-  [<Fact>]
-  let ``sets the correct binding name`` () =
-    Property.check <| property {
-      let! bindingName = GenX.auto<string>
-      let binding = bindingName |> Binding.oneWaySeq(fail, fail2, fail)
-      test <@ binding.Name = bindingName @>
-    }
+    [<Fact>]
+    let ``sets the correct binding name`` () =
+        Property.check
+        <| property {
+            let! bindingName = GenX.auto<string>
+            let binding = bindingName |> Binding.oneWaySeq (fail, fail2, fail)
+            test <@ binding.Name = bindingName @>
+        }
 
 
-  [<Fact>]
-  let ``final get returns value from original get`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int>
+    [<Fact>]
+    let ``final get returns value from original get`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int>
 
-      let get (i: int) = Seq.singleton i
-      let d = Binding.OneWaySeq.create get fail2 fail |> getOneWaySeqData
+            let get (i: int) = Seq.singleton i
+            let d = Binding.OneWaySeq.create get fail2 fail |> getOneWaySeqData
 
-      test <@ d.Get x |> Seq.map unbox |> Seq.toList = (get x |> Seq.toList) @>
-    }
+            test <@ d.Get x |> Seq.map unbox |> Seq.toList = (get x |> Seq.toList) @>
+        }
 
 
-  [<Fact>]
-  let ``final getId returns value from original getId`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int>
+    [<Fact>]
+    let ``final getId returns value from original getId`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int>
 
-      let getId = string<int>
-      let d = Binding.oneWaySeq(fail, fail2, getId) |> getOneWaySeqData
+            let getId = string<int>
+            let d = Binding.oneWaySeq (fail, fail2, getId) |> getOneWaySeqData
 
-      test <@ d.GetId (box x) |> unbox = getId x @>
-    }
+            test <@ d.GetId(box x) |> unbox = getId x @>
+        }
 
 
-  [<Fact>]
-  let ``final itemEquals returns value from original itemEquals`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int>
-      let! y = GenX.auto<int>
+    [<Fact>]
+    let ``final itemEquals returns value from original itemEquals`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int>
+            let! y = GenX.auto<int>
 
-      let itemEquals : int -> int -> bool = (=)
-      let d = Binding.oneWaySeq(fail, itemEquals, fail) |> getOneWaySeqData
+            let itemEquals: int -> int -> bool = (=)
+            let d = Binding.oneWaySeq (fail, itemEquals, fail) |> getOneWaySeqData
 
-      test <@ d.ItemEquals (box x) (box y) = itemEquals x y @>
-    }
+            test <@ d.ItemEquals (box x) (box y) = itemEquals x y @>
+        }
 
 
 
 module oneWaySeqLazy =
 
 
-  [<Fact>]
-  let ``sets the correct binding name`` () =
-    Property.check <| property {
-      let! bindingName = GenX.auto<string>
-      let binding = bindingName |> Binding.oneWaySeqLazy(fail, fail2, fail, fail2, fail)
-      test <@ binding.Name = bindingName @>
-    }
+    [<Fact>]
+    let ``sets the correct binding name`` () =
+        Property.check
+        <| property {
+            let! bindingName = GenX.auto<string>
+            let binding = bindingName |> Binding.oneWaySeqLazy (fail, fail2, fail, fail2, fail)
+            test <@ binding.Name = bindingName @>
+        }
+
 
+    [<Fact>]
+    let ``final getId returns value from original getId`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int>
 
-  [<Fact>]
-  let ``final getId returns value from original getId`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int>
+            let getId = string<int>
+            let d = Binding.oneWaySeqLazy (fail, fail2, fail, fail2, getId) |> getOneWaySeqData
 
-      let getId = string<int>
-      let d = Binding.oneWaySeqLazy(fail, fail2, fail, fail2, getId) |> getOneWaySeqData
+            test <@ d.GetId(box x) |> unbox = getId x @>
+        }
 
-      test <@ d.GetId (box x) |> unbox = getId x @>
-    }
 
+    [<Fact>]
+    let ``final itemEquals returns value from original itemEquals`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int>
+            let! y = GenX.auto<int>
 
-  [<Fact>]
-  let ``final itemEquals returns value from original itemEquals`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int>
-      let! y = GenX.auto<int>
+            let itemEquals: int -> int -> bool = (=)
 
-      let itemEquals : int -> int -> bool = (=)
-      let d = Binding.oneWaySeqLazy(fail, fail2, fail, itemEquals, fail) |> getOneWaySeqData
+            let d =
+                Binding.oneWaySeqLazy (fail, fail2, fail, itemEquals, fail) |> getOneWaySeqData
 
-      test <@ d.ItemEquals (box x) (box y) = itemEquals x y @>
-    }
+            test <@ d.ItemEquals (box x) (box y) = itemEquals x y @>
+        }
 
 
 
 module twoWay =
 
 
-  module setModel =
+    module setModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.TwoWay.id
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.TwoWay.id
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final get returns value from original get`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``final get returns value from original get`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string<int>
-        let d = Binding.twoWay(get, fail2) |> getTwoWayData
+                let get = string<int>
+                let d = Binding.twoWay (get, fail2) |> getTwoWayData
 
-        test <@ d.Get x |> unbox = get x @>
-      }
+                test <@ d.Get x |> unbox = get x @>
+            }
 
 
-    [<Fact>]
-    let ``final set returns value from original set`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final set returns value from original set`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let set (p: string) (m: int) = p + string m
-        let d = Binding.twoWay((fun _ -> ""), set) |> getTwoWayData
+                let set (p: string) (m: int) = p + string m
+                let d = Binding.twoWay ((fun _ -> ""), set) |> getTwoWayData
 
-        test <@ d.Set (box p) m |> unbox = set p m @>
-      }
+                test <@ d.Set (box p) m |> unbox = set p m @>
+            }
 
 
 
-  module noSetModel =
+    module noSetModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.twoWay(fail, (fail: string -> int))
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.twoWay (fail, (fail: string -> int))
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final get returns value from original get`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``final get returns value from original get`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string<int>
-        let d = Binding.twoWay(get, (fail: string -> int)) |> getTwoWayData
+                let get = string<int>
+                let d = Binding.twoWay (get, (fail: string -> int)) |> getTwoWayData
 
-        test <@ d.Get x |> unbox = get x @>
-      }
+                test <@ d.Get x |> unbox = get x @>
+            }
 
 
-    [<Fact>]
-    let ``final set returns value from original set`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final set returns value from original set`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let set (p: string) = p + p
-        let d = Binding.twoWay((fun _ -> ""), set) |> getTwoWayData
+                let set (p: string) = p + p
+                let d = Binding.twoWay ((fun _ -> ""), set) |> getTwoWayData
 
-        test <@ d.Set (box p) m |> unbox = set p @>
-      }
+                test <@ d.Set (box p) m |> unbox = set p @>
+            }
 
 
 
 module twoWayOpt =
 
 
-  module option_setModel =
+    module option_setModel =
 
 
-    [<Fact>]
-    let ``when original get returns Some, final get returns the inner value`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns Some, final get returns the inner value`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string >> Some
-        let d = Binding.twoWayOpt(get, fail2) |> getTwoWayData
+                let get = string >> Some
+                let d = Binding.twoWayOpt (get, fail2) |> getTwoWayData
 
-        test <@ d.Get x |> unbox = (get x).Value @>
-      }
+                test <@ d.Get x |> unbox = (get x).Value @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns None, final get returns null`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns None, final get returns null`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get _ = None
-        let d = Binding.twoWayOpt(get, fail2) |> getTwoWayData
+                let get _ = None
+                let d = Binding.twoWayOpt (get, fail2) |> getTwoWayData
 
-        test <@ isNull (d.Get x) @>
-      }
+                test <@ isNull (d.Get x) @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives a non-null value, original get receives Some`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``when final set receives a non-null value, original get receives Some`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> Some ""), set) |> getTwoWayData
+                let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> Some ""), set) |> getTwoWayData
 
-        test <@ d.Set (box p) m |> unbox = set (Some p) m @>
-      }
+                test <@ d.Set (box p) m |> unbox = set (Some p) m @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives null, original get receives None`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
+        [<Fact>]
+        let ``when final set receives null, original get receives None`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
 
-        let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> Some ""), set) |> getTwoWayData
+                let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> Some ""), set) |> getTwoWayData
 
-        test <@ d.Set null m |> unbox = set None m @>
-      }
+                test <@ d.Set null m |> unbox = set None m @>
+            }
 
 
 
-  module voption_setModel =
+    module voption_setModel =
 
 
-    [<Fact>]
-    let ``when original get returns ValueSome, final get returns the inner value`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns ValueSome, final get returns the inner value`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string >> ValueSome
-        let d = Binding.twoWayOpt(get, fail2) |> getTwoWayData
+                let get = string >> ValueSome
+                let d = Binding.twoWayOpt (get, fail2) |> getTwoWayData
 
-        test <@ d.Get x |> unbox = (get x).Value @>
-      }
+                test <@ d.Get x |> unbox = (get x).Value @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns ValueNone, final get returns null`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns ValueNone, final get returns null`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get _ = ValueNone
-        let d = Binding.twoWayOpt(get, fail2) |> getTwoWayData
+                let get _ = ValueNone
+                let d = Binding.twoWayOpt (get, fail2) |> getTwoWayData
 
-        test <@ isNull (d.Get x) @>
-      }
+                test <@ isNull (d.Get x) @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives a non-null value, original get receives ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``when final set receives a non-null value, original get receives ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> ValueSome ""), set) |> getTwoWayData
+                let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> ValueSome ""), set) |> getTwoWayData
 
-        test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
-      }
+                test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives null, original get receives ValueNone`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
+        [<Fact>]
+        let ``when final set receives null, original get receives ValueNone`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
 
-        let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> ValueSome ""), set) |> getTwoWayData
+                let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> ValueSome ""), set) |> getTwoWayData
 
-        test <@ d.Set null m |> unbox = set ValueNone m @>
-      }
+                test <@ d.Set null m |> unbox = set ValueNone m @>
+            }
 
 
 
-  module option_noSetModel =
+    module option_noSetModel =
 
 
-    [<Fact>]
-    let ``when original get returns Some, final get returns the inner value`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns Some, final get returns the inner value`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string >> Some
-        let d = Binding.twoWayOpt(get, (fail: _ option -> int)) |> getTwoWayData
+                let get = string >> Some
+                let d = Binding.twoWayOpt (get, (fail: _ option -> int)) |> getTwoWayData
 
-        test <@ d.Get x |> unbox = (get x).Value @>
-      }
+                test <@ d.Get x |> unbox = (get x).Value @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns None, final get returns null`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns None, final get returns null`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get _ = None
-        let d = Binding.twoWayOpt(get, (fail: _ option -> int)) |> getTwoWayData
+                let get _ = None
+                let d = Binding.twoWayOpt (get, (fail: _ option -> int)) |> getTwoWayData
 
-        test <@ isNull (d.Get x) @>
-      }
+                test <@ isNull (d.Get x) @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives a non-null value, original get receives Some`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``when final set receives a non-null value, original get receives Some`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let set (p: string option) = p |> Option.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> Some ""), set) |> getTwoWayData
+                let set (p: string option) = p |> Option.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> Some ""), set) |> getTwoWayData
 
-        test <@ d.Set (box p) m |> unbox = set (Some p) @>
-      }
+                test <@ d.Set (box p) m |> unbox = set (Some p) @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives null, original get receives None`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
+        [<Fact>]
+        let ``when final set receives null, original get receives None`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
 
-        let set (p: string option) = p |> Option.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> Some ""), set) |> getTwoWayData
+                let set (p: string option) = p |> Option.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> Some ""), set) |> getTwoWayData
 
-        test <@ d.Set null m |> unbox = set None @>
-      }
+                test <@ d.Set null m |> unbox = set None @>
+            }
 
 
 
-  module voption_noSetModel =
+    module voption_noSetModel =
 
 
-    [<Fact>]
-    let ``when original get returns ValueSome, final get returns the inner value`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns ValueSome, final get returns the inner value`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get = string >> ValueSome
-        let d = Binding.twoWayOpt(get, (fail: _ voption -> int)) |> getTwoWayData
+                let get = string >> ValueSome
+                let d = Binding.twoWayOpt (get, (fail: _ voption -> int)) |> getTwoWayData
 
-        test <@ d.Get x |> unbox = (get x).Value @>
-      }
+                test <@ d.Get x |> unbox = (get x).Value @>
+            }
 
 
-    [<Fact>]
-    let ``when original get returns ValueNone, final get returns null`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``when original get returns ValueNone, final get returns null`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
 
-        let get _ = ValueNone
-        let d = Binding.twoWayOpt(get, (fail: _ voption -> int)) |> getTwoWayData
+                let get _ = ValueNone
+                let d = Binding.twoWayOpt (get, (fail: _ voption -> int)) |> getTwoWayData
 
-        test <@ isNull (d.Get x) @>
-      }
+                test <@ isNull (d.Get x) @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives a non-null value, original get receives ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``when final set receives a non-null value, original get receives ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let set (p: string voption) = p |> ValueOption.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> ValueSome ""), set) |> getTwoWayData
+                let set (p: string voption) = p |> ValueOption.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> ValueSome ""), set) |> getTwoWayData
 
-        test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
-      }
+                test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
+            }
 
 
-    [<Fact>]
-    let ``when final set receives null, original get receives ValueNone`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
+        [<Fact>]
+        let ``when final set receives null, original get receives ValueNone`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
 
-        let set (p: string voption) = p |> ValueOption.map ((+) (string m))
-        let d = Binding.twoWayOpt((fun _ -> ValueSome ""), set) |> getTwoWayData
+                let set (p: string voption) = p |> ValueOption.map ((+) (string m))
+                let d = Binding.twoWayOpt ((fun _ -> ValueSome ""), set) |> getTwoWayData
 
-        test <@ d.Set null m |> unbox = set ValueNone @>
-      }
+                test <@ d.Set null m |> unbox = set ValueNone @>
+            }
 
 
 
 module twoWayValidate =
 
 
-  module setModel_validateVoption =
+    module setModel_validateVoption =
 
 
-    //[<Fact>]
-    //let ``final get returns value from original get`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``final get returns value from original get`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get = string<int>
-    //    let d = Binding.twoWayValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
+        //    let get = string<int>
+        //    let d = Binding.twoWayValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = get x @>
-    //  }
+        //    test <@ d.Get x |> unbox = get x @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``final set returns value from original set`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``final set returns value from original set`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    let set (p: string) (m: int) = p + string m
-    //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //    let set (p: string) (m: int) = p + string m
+        //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set p m @>
-    //  }
+        //    test <@ d.Set (box p) m |> unbox = set p m @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayValidate(fail, fail2, validate) |> getValidationData
+                let validate x = if x < 0 then [ err ] else []
+                let d = Binding.twoWayValidate (fail, fail2, validate) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
 
-  module setModel_validateOption =
+    module setModel_validateOption =
 
 
-    //[<Fact>]
-    //let ``final get returns value from original get`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``final get returns value from original get`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get = string<int>
-    //    let d = Binding.twoWayValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
+        //    let get = string<int>
+        //    let d = Binding.twoWayValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = get x @>
-    //  }
+        //    test <@ d.Get x |> unbox = get x @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``final set returns value from original set`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``final set returns value from original set`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    let set (p: string) (m: int) = p + string m
-    //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //    let set (p: string) (m: int) = p + string m
+        //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set p m @>
-    //  }
+        //    test <@ d.Set (box p) m |> unbox = set p m @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayValidate(fail, fail2, validate) |> getValidationData
+                let validate x = if x < 0 then [ err ] else []
+                let d = Binding.twoWayValidate (fail, fail2, validate) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
 
-  module setModel_validateResult =
+    module setModel_validateResult =
 
 
-    //[<Fact>]
-    //let ``final get returns value from original get`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``final get returns value from original get`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get = string<int>
-    //    let d = Binding.twoWayValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
+        //    let get = string<int>
+        //    let d = Binding.twoWayValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = get x @>
-    //  }
+        //    test <@ d.Get x |> unbox = get x @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``final set returns value from original set`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``final set returns value from original set`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    let set (p: string) (m: int) = p + string m
-    //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+        //    let set (p: string) (m: int) = p + string m
+        //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set p m @>
-    //  }
+        //    test <@ d.Set (box p) m |> unbox = set p m @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [] else [ err ]
-        let d = Binding.twoWayValidate(fail, fail2, validate) |> getValidationData
+                let validate x = if x < 0 then [] else [ err ]
+                let d = Binding.twoWayValidate (fail, fail2, validate) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
 
-  module noSetModel_validateVoption =
+    module noSetModel_validateVoption =
 
 
-    //[<Fact>]
-    //let ``final get returns value from original get`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``final get returns value from original get`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get = string<int>
-    //    let d = Binding.twoWayValidate(get, (fail: string -> int), (fail: _ -> _ voption)) |> getValidationData
+        //    let get = string<int>
+        //    let d = Binding.twoWayValidate(get, (fail: string -> int), (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = get x @>
-    //  }
+        //    test <@ d.Get x |> unbox = get x @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``final set returns value from original set`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``final set returns value from original set`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    let set (p: string) = p + p
-    //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //    let set (p: string) = p + p
+        //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set p @>
-    //  }
+        //    test <@ d.Set (box p) m |> unbox = set p @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayValidate(fail, (fail: string -> int), validate) |> getValidationData
+                let validate x = if x < 0 then [ err ] else []
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                let d =
+                    Binding.twoWayValidate (fail, (fail: string -> int), validate)
+                    |> getValidationData
 
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
-  module noSetModel_validateOption =
 
+    module noSetModel_validateOption =
 
-    //[<Fact>]
-    //let ``final get returns value from original get`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get = string<int>
-    //    let d = Binding.twoWayValidate(get, (fail: string -> int), (fail: _ -> _ option)) |> getValidationData
+        //[<Fact>]
+        //let ``final get returns value from original get`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ d.Get x |> unbox = get x @>
-    //  }
+        //    let get = string<int>
+        //    let d = Binding.twoWayValidate(get, (fail: string -> int), (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ d.Get x |> unbox = get x @>
+        //  }
 
-    //[<Fact>]
-    //let ``final set returns value from original set`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
 
-    //    let set (p: string) = p + p
-    //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //[<Fact>]
+        //let ``final set returns value from original set`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    test <@ d.Set (box p) m |> unbox = set p @>
-    //  }
+        //    let set (p: string) = p + p
+        //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ d.Set (box p) m |> unbox = set p @>
+        //  }
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayValidate(fail, (fail: string -> int), validate) |> getValidationData
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                let validate x = if x < 0 then [ err ] else []
 
+                let d =
+                    Binding.twoWayValidate (fail, (fail: string -> int), validate)
+                    |> getValidationData
 
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-  module noSetModel_validateResult =
 
 
-    //[<Fact>]
-    //let ``final get returns value from original get`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+    module noSetModel_validateResult =
 
-    //    let get = string<int>
-    //    let d = Binding.twoWayValidate(get, (fail: string -> int), (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = get x @>
-    //  }
+        //[<Fact>]
+        //let ``final get returns value from original get`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get = string<int>
+        //    let d = Binding.twoWayValidate(get, (fail: string -> int), (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //[<Fact>]
-    //let ``final set returns value from original set`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //    test <@ d.Get x |> unbox = get x @>
+        //  }
 
-    //    let set (p: string) = p + p
-    //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set p @>
-    //  }
+        //[<Fact>]
+        //let ``final set returns value from original set`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
+        //    let set (p: string) = p + p
+        //    let d = Binding.twoWayValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //    test <@ d.Set (box p) m |> unbox = set p @>
+        //  }
+
+
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [] else [ err ]
-        let d = Binding.twoWayValidate(fail, (fail: string -> int), validate) |> getValidationData
+                let validate x = if x < 0 then [] else [ err ]
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                let d =
+                    Binding.twoWayValidate (fail, (fail: string -> int), validate)
+                    |> getValidationData
+
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
 
 module twoWayOptValidate =
 
 
-  module voption_setModel_validateVoption =
+    module voption_setModel_validateVoption =
 
 
-    //[<Fact>]
-    //let ``when original get returns ValueSome, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``when original get returns ValueSome, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get = string >> ValueSome
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
+        //    let get = string >> ValueSome
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when original get returns ValueNone, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``when original get returns ValueNone, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get _ = ValueNone
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
+        //    let get _ = ValueNone
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives ValueSome`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives ValueSome`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
-    //  }
+        //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives ValueNone`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //[<Fact>]
+        //let ``when final set receives null, original get receives ValueNone`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-    //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Set null m |> unbox = set ValueNone m @>
-    //  }
+        //    test <@ d.Set null m |> unbox = set ValueNone m @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ voption), fail2, validate) |> getValidationData
+                let validate x = if x < 0 then [ err ] else []
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ voption), fail2, validate)
+                    |> getValidationData
 
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
-  module voption_setModel_validateOption =
 
+    module voption_setModel_validateOption =
 
-    //[<Fact>]
-    //let ``when original get returns ValueSome, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get = string >> ValueSome
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
+        //[<Fact>]
+        //let ``when original get returns ValueSome, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+        //    let get = string >> ValueSome
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //[<Fact>]
-    //let ``when original get returns ValueNone, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get _ = ValueNone
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
+        //[<Fact>]
+        //let ``when original get returns ValueNone, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+        //    let get _ = ValueNone
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives ValueSome`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
 
-    //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives ValueSome`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
-    //  }
+        //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
+        //  }
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives ValueNone`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
 
-    //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //[<Fact>]
+        //let ``when final set receives null, original get receives ValueNone`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-    //    test <@ d.Set null m |> unbox = set ValueNone m @>
-    //  }
+        //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ d.Set null m |> unbox = set ValueNone m @>
+        //  }
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ voption), fail2, validate) |> getValidationData
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+                let validate x = if x < 0 then [ err ] else []
 
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ voption), fail2, validate)
+                    |> getValidationData
 
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-  module voption_setModel_validateResult =
 
 
-    //[<Fact>]
-    //let ``when original get returns ValueSome, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+    module voption_setModel_validateResult =
 
-    //    let get = string >> ValueSome
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+        //[<Fact>]
+        //let ``when original get returns ValueSome, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get = string >> ValueSome
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when original get returns ValueNone, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //    let get _ = ValueNone
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+        //[<Fact>]
+        //let ``when original get returns ValueNone, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get _ = ValueNone
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives ValueSome`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
-    //  }
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives ValueSome`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
+        //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives ValueNone`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) m @>
+        //  }
 
-    //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Set null m |> unbox = set ValueNone m @>
-    //  }
+        //[<Fact>]
+        //let ``when final set receives null, original get receives ValueNone`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
+        //    let set (p: string voption) (m: int) = p |> ValueOption.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //    test <@ d.Set null m |> unbox = set ValueNone m @>
+        //  }
 
-        let validate x = if x < 0 then [] else [ err ]
-        let d = Binding.twoWayOptValidate((fail: _ -> _ voption), fail2, validate) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
+                let validate x = if x < 0 then [] else [ err ]
 
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ voption), fail2, validate)
+                    |> getValidationData
 
-  module option_setModel_validateVoption =
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
-    //[<Fact>]
-    //let ``when original get returns Some, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get = string >> Some
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
+    module option_setModel_validateVoption =
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
 
+        //[<Fact>]
+        //let ``when original get returns Some, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //[<Fact>]
-    //let ``when original get returns None, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //    let get = string >> Some
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
 
-    //    let get _ = None
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
 
+        //[<Fact>]
+        //let ``when original get returns None, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives Some`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //    let get _ = None
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ voption)) |> getValidationData
 
-    //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    //    test <@ d.Set (box p) m |> unbox = set (Some p) m @>
-    //  }
 
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives Some`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives None`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //    test <@ d.Set (box p) m |> unbox = set (Some p) m @>
+        //  }
 
-    //    test <@ d.Set null m |> unbox = set None m @>
-    //  }
 
+        //[<Fact>]
+        //let ``when final set receives null, original get receives None`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ option), fail2, validate) |> getValidationData
+        //    test <@ d.Set null m |> unbox = set None m @>
+        //  }
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
 
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
+                let validate x = if x < 0 then [ err ] else []
 
-  module option_setModel_validateOption =
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ option), fail2, validate)
+                    |> getValidationData
 
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-    //[<Fact>]
-    //let ``when original get returns Some, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get = string >> Some
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+    module option_setModel_validateOption =
 
 
-    //[<Fact>]
-    //let ``when original get returns None, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //[<Fact>]
+        //let ``when original get returns Some, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let get _ = None
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
+        //    let get = string >> Some
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives Some`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``when original get returns None, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //    let get _ = None
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set (Some p) m @>
-    //  }
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives None`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives Some`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Set null m |> unbox = set None m @>
-    //  }
+        //    test <@ d.Set (box p) m |> unbox = set (Some p) m @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //[<Fact>]
+        //let ``when final set receives null, original get receives None`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ option), fail2, validate) |> getValidationData
+        //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //    test <@ d.Set null m |> unbox = set None m @>
+        //  }
 
 
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-  module option_setModel_validateResult =
+                let validate x = if x < 0 then [ err ] else []
 
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ option), fail2, validate)
+                    |> getValidationData
 
-    //[<Fact>]
-    //let ``when original get returns Some, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-    //    let get = string >> Some
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
 
+    module option_setModel_validateResult =
 
-    //[<Fact>]
-    //let ``when original get returns None, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get _ = None
-    //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
+        //[<Fact>]
+        //let ``when original get returns Some, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+        //    let get = string >> Some
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives Some`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
 
-    //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+        //[<Fact>]
+        //let ``when original get returns None, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ d.Set (box p) m |> unbox = set (Some p) m @>
-    //  }
+        //    let get _ = None
+        //    let d = Binding.twoWayOptValidate(get, fail2, (fail: _ -> Result<_,_>)) |> getValidationData
 
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives None`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
 
-    //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives Some`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    //    test <@ d.Set null m |> unbox = set None m @>
-    //  }
+        //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
+        //    test <@ d.Set (box p) m |> unbox = set (Some p) m @>
+        //  }
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [] else [ err ]
-        let d = Binding.twoWayOptValidate((fail: _ -> _ option), fail2, validate) |> getValidationData
+        //[<Fact>]
+        //let ``when final set receives null, original get receives None`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //    let set (p: string option) (m: int) = p |> Option.map ((+) (string m))
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
+        //    test <@ d.Set null m |> unbox = set None m @>
+        //  }
 
 
-  module voption_noSetModel_validateVoption =
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
+                let validate x = if x < 0 then [] else [ err ]
 
-    //[<Fact>]
-    //let ``when original get returns ValueSome, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ option), fail2, validate)
+                    |> getValidationData
 
-    //    let get = string >> ValueSome
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
 
 
-    //[<Fact>]
-    //let ``when original get returns ValueNone, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+    module voption_noSetModel_validateVoption =
 
-    //    let get _ = ValueNone
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+        //[<Fact>]
+        //let ``when original get returns ValueSome, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get = string >> ValueSome
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives ValueSome`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
-    //  }
+        //[<Fact>]
+        //let ``when original get returns ValueNone, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get _ = ValueNone
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives ValueNone`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ d.Set null m |> unbox = set ValueNone @>
-    //  }
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives ValueSome`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
+        //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
+        //  }
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ voption), (fail: _ -> int), validate) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //[<Fact>]
+        //let ``when final set receives null, original get receives ValueNone`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
+        //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
+        //    test <@ d.Set null m |> unbox = set ValueNone @>
+        //  }
 
-  module voption_noSetModel_validateOption =
 
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-    //[<Fact>]
-    //let ``when original get returns ValueSome, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+                let validate x = if x < 0 then [ err ] else []
 
-    //    let get = string >> ValueSome
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ voption), (fail: _ -> int), validate)
+                    |> getValidationData
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
-    //[<Fact>]
-    //let ``when original get returns ValueNone, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get _ = ValueNone
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
+    module voption_noSetModel_validateOption =
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
 
+        //[<Fact>]
+        //let ``when original get returns ValueSome, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives ValueSome`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //    let get = string >> ValueSome
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
 
-    //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
-    //  }
 
+        //[<Fact>]
+        //let ``when original get returns ValueNone, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives ValueNone`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //    let get _ = ValueNone
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
 
-    //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    //    test <@ d.Set null m |> unbox = set ValueNone @>
-    //  }
 
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives ValueSome`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ voption), (fail: _ -> int), validate) |> getValidationData
+        //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
+        //  }
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
 
+        //[<Fact>]
+        //let ``when final set receives null, original get receives ValueNone`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
+        //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-  module voption_noSetModel_validateResult =
+        //    test <@ d.Set null m |> unbox = set ValueNone @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when original get returns ValueSome, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-    //    let get = string >> ValueSome
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
+                let validate x = if x < 0 then [ err ] else []
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ voption), (fail: _ -> int), validate)
+                    |> getValidationData
 
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-    //[<Fact>]
-    //let ``when original get returns ValueNone, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get _ = ValueNone
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+    module voption_noSetModel_validateResult =
 
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives ValueSome`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+        //[<Fact>]
+        //let ``when original get returns ValueSome, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+        //    let get = string >> ValueSome
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
-    //  }
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives ValueNone`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //[<Fact>]
+        //let ``when original get returns ValueNone, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+        //    let get _ = ValueNone
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    test <@ d.Set null m |> unbox = set ValueNone @>
-    //  }
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives ValueSome`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-        let validate x = if x < 0 then [] else [ err ]
-        let d = Binding.twoWayOptValidate((fail: _ -> _ voption), (fail: _ -> int), validate) |> getValidationData
+        //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //    test <@ d.Set (box p) m |> unbox = set (ValueSome p) @>
+        //  }
 
 
+        //[<Fact>]
+        //let ``when final set receives null, original get receives ValueNone`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-  module option_noSetModel_validateVoption =
+        //    let set (p: string voption) = p |> ValueOption.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
 
+        //    test <@ d.Set null m |> unbox = set ValueNone @>
+        //  }
 
-    //[<Fact>]
-    //let ``when original get returns Some, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
 
-    //    let get = string >> Some
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+                let validate x = if x < 0 then [] else [ err ]
 
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ voption), (fail: _ -> int), validate)
+                    |> getValidationData
 
-    //[<Fact>]
-    //let ``when original get returns None, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-    //    let get _ = None
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
 
+    module option_noSetModel_validateVoption =
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives Some`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
 
-    //    let set (p: string option) = p |> Option.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //[<Fact>]
+        //let ``when original get returns Some, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ d.Set (box p) m |> unbox = set (Some p) @>
-    //  }
+        //    let get = string >> Some
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
 
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives None`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
 
-    //    let set (p: string option) = p |> Option.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
+        //[<Fact>]
+        //let ``when original get returns None, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //    test <@ d.Set null m |> unbox = set None @>
-    //  }
+        //    let get _ = None
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ voption)) |> getValidationData
 
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ option), (fail: _ -> int), validate) |> getValidationData
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives Some`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //    let set (p: string option) = p |> Option.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
+        //    test <@ d.Set (box p) m |> unbox = set (Some p) @>
+        //  }
 
 
-  module option_noSetModel_validateOption =
+        //[<Fact>]
+        //let ``when final set receives null, original get receives None`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
+        //    let set (p: string option) = p |> Option.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ voption)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when original get returns Some, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //    test <@ d.Set null m |> unbox = set None @>
+        //  }
 
-    //    let get = string >> Some
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
+                let validate x = if x < 0 then [ err ] else []
 
-    //[<Fact>]
-    //let ``when original get returns None, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ option), (fail: _ -> int), validate)
+                    |> getValidationData
 
-    //    let get _ = None
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
 
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives Some`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
+    module option_noSetModel_validateOption =
 
-    //    let set (p: string option) = p |> Option.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Set (box p) m |> unbox = set (Some p) @>
-    //  }
+        //[<Fact>]
+        //let ``when original get returns Some, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get = string >> Some
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives None`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //    let set (p: string option) = p |> Option.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-    //    test <@ d.Set null m |> unbox = set None @>
-    //  }
+        //[<Fact>]
+        //let ``when original get returns None, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
+        //    let get _ = None
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> _ option)) |> getValidationData
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
+        //    test <@ isNull (d.Get x) @>
+        //  }
 
-        let validate x = if x < 0 then [ err ] else []
-        let d = Binding.twoWayOptValidate((fail: _ -> _ option), (fail: _ -> int), validate) |> getValidationData
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives Some`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
 
+        //    let set (p: string option) = p |> Option.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
+        //    test <@ d.Set (box p) m |> unbox = set (Some p) @>
+        //  }
 
-  module option_noSetModel_validateResult =
 
+        //[<Fact>]
+        //let ``when final set receives null, original get receives None`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-    //[<Fact>]
-    //let ``when original get returns Some, final get returns the inner value`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+        //    let set (p: string option) = p |> Option.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> _ option)) |> getValidationData
 
-    //    let get = string >> Some
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
+        //    test <@ d.Set null m |> unbox = set None @>
+        //  }
 
-    //    test <@ d.Get x |> unbox = (get x).Value @>
-    //  }
 
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
 
-    //[<Fact>]
-    //let ``when original get returns None, final get returns null`` () =
-    //  Property.check <| property {
-    //    let! x = GenX.auto<int>
+                let validate x = if x < 0 then [ err ] else []
 
-    //    let get _ = None
-    //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ option), (fail: _ -> int), validate)
+                    |> getValidationData
 
-    //    test <@ isNull (d.Get x) @>
-    //  }
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
-    //[<Fact>]
-    //let ``when final set receives a non-null value, original get receives Some`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
-    //    let! p = GenX.auto<string>
 
-    //    let set (p: string option) = p |> Option.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+    module option_noSetModel_validateResult =
 
-    //    test <@ d.Set (box p) m |> unbox = set (Some p) @>
-    //  }
 
+        //[<Fact>]
+        //let ``when original get returns Some, final get returns the inner value`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
 
-    //[<Fact>]
-    //let ``when final set receives null, original get receives None`` () =
-    //  Property.check <| property {
-    //    let! m = GenX.auto<int>
+        //    let get = string >> Some
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
 
-    //    let set (p: string option) = p |> Option.map (fun x -> x + x)
-    //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+        //    test <@ d.Get x |> unbox = (get x).Value @>
+        //  }
 
-    //    test <@ d.Set null m |> unbox = set None @>
-    //  }
 
+        //[<Fact>]
+        //let ``when original get returns None, final get returns null`` () =
+        //  Property.check <| property {
+        //    let! x = GenX.auto<int>
+
+        //    let get _ = None
+        //    let d = Binding.twoWayOptValidate(get, (fail: _ -> int), (fail: _ -> Result<_,_>)) |> getValidationData
+
+        //    test <@ isNull (d.Get x) @>
+        //  }
+
+
+        //[<Fact>]
+        //let ``when final set receives a non-null value, original get receives Some`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
+        //    let! p = GenX.auto<string>
+
+        //    let set (p: string option) = p |> Option.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+
+        //    test <@ d.Set (box p) m |> unbox = set (Some p) @>
+        //  }
 
-    [<Fact>]
-    let ``final validate returns value from original validate`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! err = GenX.auto<string>
 
-        let validate x = if x < 0 then [] else [ err ]
-        let d = Binding.twoWayOptValidate((fail: _ -> _ option), (fail: _ -> int), validate) |> getValidationData
+        //[<Fact>]
+        //let ``when final set receives null, original get receives None`` () =
+        //  Property.check <| property {
+        //    let! m = GenX.auto<int>
 
-        test <@ d.Validate x |> unbox = validate x @>
-      }
+        //    let set (p: string option) = p |> Option.map (fun x -> x + x)
+        //    let d = Binding.twoWayOptValidate(fail, set, (fail: _ -> Result<_,_>)) |> getValidationData
+
+        //    test <@ d.Set null m |> unbox = set None @>
+        //  }
+
+
+        [<Fact>]
+        let ``final validate returns value from original validate`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! err = GenX.auto<string>
+
+                let validate x = if x < 0 then [] else [ err ]
+
+                let d =
+                    Binding.twoWayOptValidate ((fail: _ -> _ option), (fail: _ -> int), validate)
+                    |> getValidationData
+
+                test <@ d.Validate x |> unbox = validate x @>
+            }
 
 
 
 module cmd =
 
 
-  module model =
+    module model =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmd(fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmd (fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
 
-  module noModel =
+    module noModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmd(obj())
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmd (obj ())
+                test <@ binding.Name = bindingName @>
+            }
 
 
 
 module cmdIf =
 
 
-  module explicitCanExec_model =
+    module explicitCanExec_model =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdIf(fail, fail, id)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdIf (fail, fail, id)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-  module explicitCanExec_noModel =
+    module explicitCanExec_noModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdIf(obj(), fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdIf (obj (), fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
 
-  module voption =
+    module voption =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdIf(fail: _ -> _ voption)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdIf (fail: _ -> _ voption)
+                test <@ binding.Name = bindingName @>
+            }
 
 
 
-  module option =
+    module option =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdIf(fail: _ -> _ option)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdIf (fail: _ -> _ option)
+                test <@ binding.Name = bindingName @>
+            }
 
 
 
-  module result =
+    module result =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdIf(fail: _ -> Result<_,_>)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdIf (fail: _ -> Result<_, _>)
+                test <@ binding.Name = bindingName @>
+            }
 
 
 
 module cmdParam =
 
 
-  module model =
+    module model =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParam(fail2)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParam (fail2)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final exec returns value from original exec wrapped in ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final exec returns value from original exec wrapped in ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let exec (p: obj) (m: int) = unbox p + string m
-        let d = Binding.cmdParam(exec) |> getCmdData
+                let exec (p: obj) (m: int) = unbox p + string m
+                let d = Binding.cmdParam (exec) |> getCmdData
 
-        test <@ d.Exec (box p) m = (exec p m |> ValueSome) @>
-      }
+                test <@ d.Exec (box p) m = (exec p m |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``canExec always returns true`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
-        let d = Binding.cmdParam(fail2) |> getCmdData
-        test <@ d.CanExec (box p) m = true @>
-      }
+        [<Fact>]
+        let ``canExec always returns true`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
+                let d = Binding.cmdParam (fail2) |> getCmdData
+                test <@ d.CanExec (box p) m = true @>
+            }
 
 
-    [<Fact>]
-    let ``autoRequery is false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParam(fail2) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+        [<Fact>]
+        let ``autoRequery is false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParam (fail2) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
 
 
-  module noModel =
+    module noModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParam(fail: obj -> obj)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParam (fail: obj -> obj)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final exec returns original value wrapped in ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final exec returns original value wrapped in ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let exec (p: obj) = string p
-        let d = Binding.cmdParam(exec) |> getCmdData
+                let exec (p: obj) = string p
+                let d = Binding.cmdParam (exec) |> getCmdData
 
-        test <@ d.Exec (box p) m = (exec p |> ValueSome) @>
-      }
+                test <@ d.Exec (box p) m = (exec p |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``canExec always returns true`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
-        let d = Binding.cmdParam(fail: obj -> obj) |> getCmdData
-        test <@ d.CanExec (box p) m = true @>
-      }
+        [<Fact>]
+        let ``canExec always returns true`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
+                let d = Binding.cmdParam (fail: obj -> obj) |> getCmdData
+                test <@ d.CanExec (box p) m = true @>
+            }
 
 
-    [<Fact>]
-    let ``autoRequery is false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParam(fail: obj -> obj) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+        [<Fact>]
+        let ``autoRequery is false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParam (fail: obj -> obj) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
 
 
 module cmdParamIf =
 
 
-  module explicitCanExec_model =
+    module explicitCanExec_model =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail, fail, id)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail, fail, id)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final exec returns value from original exec wrapped in ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final exec returns value from original exec wrapped in ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let exec (p: obj) (m: int) = unbox p + string m
-        let d = Binding.cmdParamIf(exec, fail) |> getCmdData
+                let exec (p: obj) (m: int) = unbox p + string m
+                let d = Binding.cmdParamIf (exec, fail) |> getCmdData
 
-        test <@ d.Exec (box p) m = (exec p m |> ValueSome) @>
-      }
+                test <@ d.Exec (box p) m = (exec p m |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``final canExec returns value from original canExec`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final canExec returns value from original canExec`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let canExec (p: obj) m = (unbox<string> p).Length + m > 0
-        let d = Binding.cmdParamIf(fail, canExec) |> getCmdData
+                let canExec (p: obj) m = (unbox<string> p).Length + m > 0
+                let d = Binding.cmdParamIf (fail, canExec) |> getCmdData
 
-        test <@ d.CanExec (box p) m = canExec p m @>
-      }
+                test <@ d.CanExec (box p) m = canExec p m @>
+            }
 
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf(fail, fail, false) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf (fail, fail, false) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf(fail, fail, uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
+                let d = Binding.cmdParamIf (fail, fail, uiBoundCmdParam) |> getCmdData
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
 
-  module voption_model =
+    module voption_model =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail2: _ -> _ -> _ voption)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail2: _ -> _ -> _ voption)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final exec returns value from original exec`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final exec returns value from original exec`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let exec (p: obj) m = (p :?> string).Length + m |> ValueSome |> ValueOption.filter (fun x -> x > 0)
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                let exec (p: obj) m =
+                    (p :?> string).Length + m |> ValueSome |> ValueOption.filter (fun x -> x > 0)
 
-        test <@ d.Exec (box p) m = exec p m @>
-      }
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
+                test <@ d.Exec (box p) m = exec p m @>
+            }
 
-    [<Fact>]
-    let ``final canExec returns true if original exec returns ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (p: obj) m = (p :?> string).Length + m |> ValueSome
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+        [<Fact>]
+        let ``final canExec returns true if original exec returns ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        test <@ d.CanExec (box p) m = true @>
-      }
+                let exec (p: obj) m = (p :?> string).Length + m |> ValueSome
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
+                test <@ d.CanExec (box p) m = true @>
+            }
 
-    [<Fact>]
-    let ``final canExec returns false if original exec returns ValueNone`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (_: obj) _ = ValueNone
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+        [<Fact>]
+        let ``final canExec returns false if original exec returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        test <@ d.CanExec (box p) m = false @>
-      }
+                let exec (_: obj) _ = ValueNone
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
+                test <@ d.CanExec (box p) m = false @>
+            }
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail2: _ -> _ -> _ voption)) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
 
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail2: _ -> _ -> _ voption)) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail2: _ -> _ -> _ voption), uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
 
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
 
+                let d =
+                    Binding.cmdParamIf ((fail2: _ -> _ -> _ voption), uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
 
-  module option_model =
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail2: _ -> _ -> _ option)
-        test <@ binding.Name = bindingName @>
-      }
 
+    module option_model =
 
-    [<Fact>]
-    let ``final exec returns value from original exec converted to ValueOption`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (p: obj) m = (p :?> string).Length + m |> Some |> Option.filter (fun x -> x > 0)
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail2: _ -> _ -> _ option)
+                test <@ binding.Name = bindingName @>
+            }
 
-        test <@ d.Exec (box p) m = (exec p m |> ValueOption.ofOption) @>
-      }
 
+        [<Fact>]
+        let ``final exec returns value from original exec converted to ValueOption`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``final canExec returns true if original exec returns Some`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+                let exec (p: obj) m =
+                    (p :?> string).Length + m |> Some |> Option.filter (fun x -> x > 0)
 
-        let exec (p: obj) m = (p :?> string).Length + m |> Some
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-        test <@ d.CanExec (box p) m = true @>
-      }
+                test <@ d.Exec (box p) m = (exec p m |> ValueOption.ofOption) @>
+            }
 
 
-    [<Fact>]
-    let ``final canExec returns false if original exec returns None`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final canExec returns true if original exec returns Some`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-        let exec (_: obj) _ = None
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                let exec (p: obj) m = (p :?> string).Length + m |> Some
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-        test <@ d.CanExec (box p) m = false @>
-      }
+                test <@ d.CanExec (box p) m = true @>
+            }
 
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail2: _ -> _ -> _ option)) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+        [<Fact>]
+        let ``final canExec returns false if original exec returns None`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
+                let exec (_: obj) _ = None
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail2: _ -> _ -> _ option), uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
+                test <@ d.CanExec (box p) m = false @>
+            }
 
 
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail2: _ -> _ -> _ option)) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
-  module result_model =
 
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail2: _ -> _ -> Result<_,_>)
-        test <@ binding.Name = bindingName @>
-      }
+                let d =
+                    Binding.cmdParamIf ((fail2: _ -> _ -> _ option), uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
 
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
-    [<Fact>]
-    let ``final exec returns Ok value from original exec converted to ValueOption`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (p: obj) m =
-          let x = (p :?> string).Length + m
-          if x > 0 then Ok x else Error (string x)
-        let d = Binding.cmdParamIf(exec) |> getCmdData
 
-        test <@ d.Exec (box p) m = (exec p m |> ValueOption.ofOk) @>
-      }
+    module result_model =
 
 
-    [<Fact>]
-    let ``final canExec returns true if original exec returns Ok`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail2: _ -> _ -> Result<_, _>)
+                test <@ binding.Name = bindingName @>
+            }
 
-        let exec (p: obj) m = (p :?> string).Length + m |> Ok
-        let d = Binding.cmdParamIf(exec) |> getCmdData
 
-        test <@ d.CanExec (box p) m = true @>
-      }
+        [<Fact>]
+        let ``final exec returns Ok value from original exec converted to ValueOption`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
+                let exec (p: obj) m =
+                    let x = (p :?> string).Length + m
+                    if x > 0 then Ok x else Error(string x)
 
-    [<Fact>]
-    let ``final canExec returns false if original exec returns Error`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
-        let! err = GenX.auto<byte>
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-        let exec (_: obj) _ = Error err
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                test <@ d.Exec (box p) m = (exec p m |> ValueOption.ofOk) @>
+            }
 
-        test <@ d.CanExec (box p) m = false @>
-      }
 
+        [<Fact>]
+        let ``final canExec returns true if original exec returns Ok`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail2: _ -> _ -> Result<_,_>)) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+                let exec (p: obj) m = (p :?> string).Length + m |> Ok
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
+                test <@ d.CanExec (box p) m = true @>
+            }
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail2: _ -> _ -> Result<_,_>), uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
 
+        [<Fact>]
+        let ``final canExec returns false if original exec returns Error`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
+                let! err = GenX.auto<byte>
 
+                let exec (_: obj) _ = Error err
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-  module explicitCanExec_noModel =
+                test <@ d.CanExec (box p) m = false @>
+            }
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf((fail: obj -> obj), fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail2: _ -> _ -> Result<_, _>)) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
 
-    [<Fact>]
-    let ``final exec returns value from original exec wrapped in ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
 
-        let exec (p: obj) = (unbox<string> p).Length
-        let d = Binding.cmdParamIf(exec, fail) |> getCmdData
+                let d =
+                    Binding.cmdParamIf ((fail2: _ -> _ -> Result<_, _>), uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
 
-        test <@ d.Exec (box p) m = (exec p |> ValueSome) @>
-      }
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
 
-    [<Fact>]
-    let ``final canExec returns value from original canExec`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let canExec (p: obj) = (unbox<string> p).Length + m > 0
-        let d = Binding.cmdParamIf(fail, canExec) |> getCmdData
+    module explicitCanExec_noModel =
 
-        test <@ d.CanExec (box p) m = canExec p @>
-      }
 
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf ((fail: obj -> obj), fail)
+                test <@ binding.Name = bindingName @>
+            }
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail: obj -> obj), fail) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
 
+        [<Fact>]
+        let ``final exec returns value from original exec wrapped in ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail: obj -> obj), fail, uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
+                let exec (p: obj) = (unbox<string> p).Length
+                let d = Binding.cmdParamIf (exec, fail) |> getCmdData
 
+                test <@ d.Exec (box p) m = (exec p |> ValueSome) @>
+            }
 
-  module voption_noModel =
 
+        [<Fact>]
+        let ``final canExec returns value from original canExec`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail: _ -> _ voption)
-        test <@ binding.Name = bindingName @>
-      }
+                let canExec (p: obj) = (unbox<string> p).Length + m > 0
+                let d = Binding.cmdParamIf (fail, canExec) |> getCmdData
 
+                test <@ d.CanExec (box p) m = canExec p @>
+            }
 
-    [<Fact>]
-    let ``final exec returns value from original exec`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (p: obj) = (p :?> string).Length |> ValueSome |> ValueOption.filter (fun x -> x > 0)
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail: obj -> obj), fail) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
-        test <@ d.Exec (box p) m = exec p @>
-      }
 
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
 
-    [<Fact>]
-    let ``final canExec returns true if original exec returns ValueSome`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+                let d =
+                    Binding.cmdParamIf ((fail: obj -> obj), fail, uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
 
-        let exec (p: obj) = (p :?> string).Length |> ValueSome
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
-        test <@ d.CanExec (box p) m = true @>
-      }
 
+    module voption_noModel =
 
-    [<Fact>]
-    let ``final canExec returns false if original exec returns ValueNone`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (_: obj) = ValueNone
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail: _ -> _ voption)
+                test <@ binding.Name = bindingName @>
+            }
 
-        test <@ d.CanExec (box p) m = false @>
-      }
 
+        [<Fact>]
+        let ``final exec returns value from original exec`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail: _ -> _ voption)) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+                let exec (p: obj) =
+                    (p :?> string).Length |> ValueSome |> ValueOption.filter (fun x -> x > 0)
 
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail: _ -> _ voption), uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
+                test <@ d.Exec (box p) m = exec p @>
+            }
 
 
+        [<Fact>]
+        let ``final canExec returns true if original exec returns ValueSome`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-  module option_noModel =
+                let exec (p: obj) = (p :?> string).Length |> ValueSome
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
+                test <@ d.CanExec (box p) m = true @>
+            }
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail: _ -> _ option)
-        test <@ binding.Name = bindingName @>
-      }
 
+        [<Fact>]
+        let ``final canExec returns false if original exec returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
-    [<Fact>]
-    let ``final exec returns value from original exec converted to ValueOption`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+                let exec (_: obj) = ValueNone
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-        let exec (p: obj) = (p :?> string).Length |> Some |> Option.filter (fun x -> x > 0)
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                test <@ d.CanExec (box p) m = false @>
+            }
 
-        test <@ d.Exec (box p) m = (exec p |> ValueOption.ofOption) @>
-      }
 
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail: _ -> _ voption)) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
-    [<Fact>]
-    let ``final canExec returns true if original exec returns Some`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (p: obj) = (p :?> string).Length |> Some
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
 
-        test <@ d.CanExec (box p) m = true @>
-      }
+                let d =
+                    Binding.cmdParamIf ((fail: _ -> _ voption), uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
 
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
-    [<Fact>]
-    let ``final canExec returns false if original exec returns None`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
 
-        let exec (_: obj) = None
-        let d = Binding.cmdParamIf(exec) |> getCmdData
 
-        test <@ d.CanExec (box p) m = false @>
-      }
+    module option_noModel =
 
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail: _ -> _ option)) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail: _ -> _ option)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail: _ -> _ option), uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
+        [<Fact>]
+        let ``final exec returns value from original exec converted to ValueOption`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
+                let exec (p: obj) =
+                    (p :?> string).Length |> Some |> Option.filter (fun x -> x > 0)
 
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-  module result_noModel =
+                test <@ d.Exec (box p) m = (exec p |> ValueOption.ofOption) @>
+            }
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.cmdParamIf(fail: _ -> Result<_,_>)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``final canExec returns true if original exec returns Some`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
+                let exec (p: obj) = (p :?> string).Length |> Some
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-    [<Fact>]
-    let ``final exec returns Ok value from original exec converted to ValueOption`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+                test <@ d.CanExec (box p) m = true @>
+            }
 
-        let exec (p: obj) =
-          let x = (p :?> string).Length
-          if x > 0 then Ok x else Error (string x)
-        let d = Binding.cmdParamIf(exec) |> getCmdData
 
-        test <@ d.Exec (box p) m = (exec p |> ValueOption.ofOk) @>
-      }
+        [<Fact>]
+        let ``final canExec returns false if original exec returns None`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
 
+                let exec (_: obj) = None
+                let d = Binding.cmdParamIf (exec) |> getCmdData
 
-    [<Fact>]
-    let ``final canExec returns true if original exec returns Ok`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
+                test <@ d.CanExec (box p) m = false @>
+            }
 
-        let exec (p: obj) = (p :?> string).Length |> Ok
-        let d = Binding.cmdParamIf(exec) |> getCmdData
 
-        test <@ d.CanExec (box p) m = true @>
-      }
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail: _ -> _ option)) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
 
 
-    [<Fact>]
-    let ``final canExec returns false if original exec returns Error`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string>
-        let! err = GenX.auto<byte>
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
 
-        let exec (_: obj) = Error err
-        let d = Binding.cmdParamIf(exec) |> getCmdData
+                let d =
+                    Binding.cmdParamIf ((fail: _ -> _ option), uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
 
-        test <@ d.CanExec (box p) m = false @>
-      }
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
 
-    [<Fact>]
-    let ``final autoRequery defaults to false`` () =
-      Property.check <| property {
-        let d = Binding.cmdParamIf((fail: _ -> Result<_,_>)) |> getCmdData
-        test <@ d.AutoRequery = false @>
-      }
 
+    module result_noModel =
 
-    [<Fact>]
-    let ``final autoRequery equals original uiBoundCmdParam`` () =
-      Property.check <| property {
-        let! uiBoundCmdParam = GenX.auto<bool>
-        let d = Binding.cmdParamIf((fail: _ -> Result<_,_>), uiBoundCmdParam = uiBoundCmdParam) |> getCmdData
-        test <@ d.AutoRequery = uiBoundCmdParam @>
-      }
+
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.cmdParamIf (fail: _ -> Result<_, _>)
+                test <@ binding.Name = bindingName @>
+            }
+
+
+        [<Fact>]
+        let ``final exec returns Ok value from original exec converted to ValueOption`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
+
+                let exec (p: obj) =
+                    let x = (p :?> string).Length
+                    if x > 0 then Ok x else Error(string x)
+
+                let d = Binding.cmdParamIf (exec) |> getCmdData
+
+                test <@ d.Exec (box p) m = (exec p |> ValueOption.ofOk) @>
+            }
+
+
+        [<Fact>]
+        let ``final canExec returns true if original exec returns Ok`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
+
+                let exec (p: obj) = (p :?> string).Length |> Ok
+                let d = Binding.cmdParamIf (exec) |> getCmdData
+
+                test <@ d.CanExec (box p) m = true @>
+            }
+
+
+        [<Fact>]
+        let ``final canExec returns false if original exec returns Error`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string>
+                let! err = GenX.auto<byte>
+
+                let exec (_: obj) = Error err
+                let d = Binding.cmdParamIf (exec) |> getCmdData
+
+                test <@ d.CanExec (box p) m = false @>
+            }
+
+
+        [<Fact>]
+        let ``final autoRequery defaults to false`` () =
+            Property.check
+            <| property {
+                let d = Binding.cmdParamIf ((fail: _ -> Result<_, _>)) |> getCmdData
+                test <@ d.AutoRequery = false @>
+            }
+
+
+        [<Fact>]
+        let ``final autoRequery equals original uiBoundCmdParam`` () =
+            Property.check
+            <| property {
+                let! uiBoundCmdParam = GenX.auto<bool>
+
+                let d =
+                    Binding.cmdParamIf ((fail: _ -> Result<_, _>), uiBoundCmdParam = uiBoundCmdParam)
+                    |> getCmdData
+
+                test <@ d.AutoRequery = uiBoundCmdParam @>
+            }
 
 
 
 module subModel =
 
 
-  module noToMsg_noToBindingModel =
+    module noToMsg_noToBindingModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModel(fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModel (fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel combines main model and return value of getSubModel, and wraps in ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string<int>
-        let d = Binding.subModel(getSubModel, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, getSubModel x) |> box |> ValueSome) @>
-      }
+        [<Fact>]
+        let ``final getModel combines main model and return value of getSubModel, and wraps in ValueSome`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string<int>
+                let d = Binding.subModel (getSubModel, fail) |> getSubModelData
+                test <@ d.GetModel x = ((x, getSubModel x) |> box |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``final toMsg simply unboxes`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
-        let d = Binding.subModel((fun _ -> 0), fail) |> getSubModelData
-        test <@ d.ToMsg m (box x) = x @>
-      }
+        [<Fact>]
+        let ``final toMsg simply unboxes`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
+                let d = Binding.subModel ((fun _ -> 0), fail) |> getSubModelData
+                test <@ d.ToMsg m (box x) = x @>
+            }
 
 
 
-  module toMsg_noToBindingModel =
+    module toMsg_noToBindingModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModel(fail, fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModel (fail, fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel combines main model and return value of getSubModel, and wraps in ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string<int>
-        let d = Binding.subModel(getSubModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, getSubModel x) |> box |> ValueSome) @>
-      }
+        [<Fact>]
+        let ``final getModel combines main model and return value of getSubModel, and wraps in ValueSome`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string<int>
+                let d = Binding.subModel (getSubModel, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ((x, getSubModel x) |> box |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``final toMsg returns value from original toMsg`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
+        [<Fact>]
+        let ``final toMsg returns value from original toMsg`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
 
-        let toMsg = string<int>
-        let d = Binding.subModel((fun _ -> 0), toMsg, fail) |> getSubModelData
+                let toMsg = string<int>
+                let d = Binding.subModel ((fun _ -> 0), toMsg, fail) |> getSubModelData
 
-        test <@ d.ToMsg m (box x) = toMsg x @>
-      }
+                test <@ d.ToMsg m (box x) = toMsg x @>
+            }
 
 
-  module toMsg_toBindingModel =
+    module toMsg_toBindingModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModel(fail, fail, fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModel (fail, fail, fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel calls toBindingModel on main model and return value of getSubModel, and wraps in ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string<int>
-        let toBindingModel (m: int, s: string) = m + s.Length
-        let d = Binding.subModel(getSubModel, toBindingModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, getSubModel x) |> toBindingModel |> box |> ValueSome) @>
-      }
+        [<Fact>]
+        let ``final getModel calls toBindingModel on main model and return value of getSubModel, and wraps in ValueSome``
+            ()
+            =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string<int>
+                let toBindingModel (m: int, s: string) = m + s.Length
 
+                let d =
+                    Binding.subModel (getSubModel, toBindingModel, fail, fail) |> getSubModelData
 
-    [<Fact>]
-    let ``final toMsg returns value from original toMsg`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
+                test <@ d.GetModel x = ((x, getSubModel x) |> toBindingModel |> box |> ValueSome) @>
+            }
+
+
+        [<Fact>]
+        let ``final toMsg returns value from original toMsg`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
 
-        let toMsg = string<int>
-        let d = Binding.subModel((fun _ -> 0), (fun _ -> 0), toMsg, fail) |> getSubModelData
+                let toMsg = string<int>
 
-        test <@ d.ToMsg m (box x) = toMsg x @>
-      }
+                let d =
+                    Binding.subModel ((fun _ -> 0), (fun _ -> 0), toMsg, fail) |> getSubModelData
+
+                test <@ d.ToMsg m (box x) = toMsg x @>
+            }
 
 
 
 module subModelOpt =
 
 
-  module voption_noToMsg_noToBindingModel =
+    module voption_noToMsg_noToBindingModel =
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelOpt((fail: _ -> _ voption), fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModelOpt ((fail: _ -> _ voption), fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string >> ValueSome
-        let d = Binding.subModelOpt(getSubModel, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
-      }
+        [<Fact>]
+        let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string >> ValueSome
+                let d = Binding.subModelOpt (getSubModel, fail) |> getSubModelData
+                test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel (_: int) : string voption = ValueNone
-        let d = Binding.subModelOpt(getSubModel, fail) |> getSubModelData
-        test <@ d.GetModel x = ValueNone @>
-      }
+        [<Fact>]
+        let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel (_: int) : string voption = ValueNone
+                let d = Binding.subModelOpt (getSubModel, fail) |> getSubModelData
+                test <@ d.GetModel x = ValueNone @>
+            }
+
+
+        [<Fact>]
+        let ``final toMsg simply unboxes`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
+                let d = Binding.subModelOpt ((fun _ -> ValueSome 0), fail) |> getSubModelData
+                test <@ d.ToMsg m (box x) = x @>
+            }
 
 
-    [<Fact>]
-    let ``final toMsg simply unboxes`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
-        let d = Binding.subModelOpt((fun _ -> ValueSome 0), fail) |> getSubModelData
-        test <@ d.ToMsg m (box x) = x @>
-      }
 
+    module option_noToMsg_noToBindingModel =
 
 
-  module option_noToMsg_noToBindingModel =
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModelOpt ((fail: _ -> _ option), fail)
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelOpt((fail: _ -> _ option), fail)
-        test <@ binding.Name = bindingName @>
-      }
+        [<Fact>]
+        let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string >> Some
+                let d = Binding.subModelOpt (getSubModel, fail) |> getSubModelData
+                test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string >> Some
-        let d = Binding.subModelOpt(getSubModel, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
-      }
+        [<Fact>]
+        let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel (_: int) : string option = None
+                let d = Binding.subModelOpt (getSubModel, fail) |> getSubModelData
+                test <@ d.GetModel x = ValueNone @>
+            }
 
 
-    [<Fact>]
-    let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel (_: int) : string option = None
-        let d = Binding.subModelOpt(getSubModel, fail) |> getSubModelData
-        test <@ d.GetModel x = ValueNone @>
-      }
+        [<Fact>]
+        let ``final toMsg simply unboxes`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
+                let d = Binding.subModelOpt ((fun _ -> Some 0), fail) |> getSubModelData
+                test <@ d.ToMsg m (box x) = x @>
+            }
 
 
-    [<Fact>]
-    let ``final toMsg simply unboxes`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
-        let d = Binding.subModelOpt((fun _ -> Some 0), fail) |> getSubModelData
-        test <@ d.ToMsg m (box x) = x @>
-      }
+    module voption_toMsg_noToBindingModel =
 
 
-  module voption_toMsg_noToBindingModel =
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
 
+                let binding =
+                    bindingName |> Binding.subModelOpt ((fail: _ -> _ voption), fail, fail)
+
+                test <@ binding.Name = bindingName @>
+            }
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelOpt((fail: _ -> _ voption), fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
 
+        [<Fact>]
+        let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string >> ValueSome
+                let d = Binding.subModelOpt (getSubModel, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
+            }
 
-    [<Fact>]
-    let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string >> ValueSome
-        let d = Binding.subModelOpt(getSubModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
-      }
 
+        [<Fact>]
+        let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel (_: int) : string voption = ValueNone
+                let d = Binding.subModelOpt (getSubModel, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ValueNone @>
+            }
 
-    [<Fact>]
-    let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel (_: int) : string voption = ValueNone
-        let d = Binding.subModelOpt(getSubModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ValueNone @>
-      }
 
+        [<Fact>]
+        let ``final toMsg returns value from original toMsg`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
 
-    [<Fact>]
-    let ``final toMsg returns value from original toMsg`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
+                let toMsg = string<int>
+                let d = Binding.subModelOpt ((fun _ -> ValueSome 0), toMsg, fail) |> getSubModelData
 
-        let toMsg = string<int>
-        let d = Binding.subModelOpt((fun _ -> ValueSome 0), toMsg, fail) |> getSubModelData
+                test <@ d.ToMsg m (box x) = toMsg x @>
+            }
 
-        test <@ d.ToMsg m (box x) = toMsg x @>
-      }
 
 
+    module option_toMsg_noToBindingModel =
 
-  module option_toMsg_noToBindingModel =
 
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModelOpt ((fail: _ -> _ option), fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelOpt((fail: _ -> _ option), fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
 
+        [<Fact>]
+        let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string >> Some
+                let d = Binding.subModelOpt (getSubModel, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
+            }
 
-    [<Fact>]
-    let ``final getModel combines main model and inner return value of getSubModel if ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string >> Some
-        let d = Binding.subModelOpt(getSubModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, (getSubModel x).Value) |> box |> ValueSome) @>
-      }
 
+        [<Fact>]
+        let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel (_: int) : string option = None
+                let d = Binding.subModelOpt (getSubModel, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ValueNone @>
+            }
 
-    [<Fact>]
-    let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel (_: int) : string option = None
-        let d = Binding.subModelOpt(getSubModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ValueNone @>
-      }
 
+        [<Fact>]
+        let ``final toMsg returns value from original toMsg`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
 
-    [<Fact>]
-    let ``final toMsg returns value from original toMsg`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
+                let toMsg = string<int>
+                let d = Binding.subModelOpt ((fun _ -> Some 0), toMsg, fail) |> getSubModelData
 
-        let toMsg = string<int>
-        let d = Binding.subModelOpt((fun _ -> Some 0), toMsg, fail) |> getSubModelData
+                test <@ d.ToMsg m (box x) = toMsg x @>
+            }
 
-        test <@ d.ToMsg m (box x) = toMsg x @>
-      }
 
+    module voption_toMsg_toBindingModel =
 
-  module voption_toMsg_toBindingModel =
 
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelOpt((fail: _ -> _ voption), fail, fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
+                let binding =
+                    bindingName |> Binding.subModelOpt ((fail: _ -> _ voption), fail, fail, fail)
 
+                test <@ binding.Name = bindingName @>
+            }
 
-    [<Fact>]
-    let ``final getModel calls toBindingModel on main model and inner return value of getSubModel if ValueSome`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string >> ValueSome
-        let toBindingModel (m: int, s: string) = m + s.Length
-        let d = Binding.subModelOpt(getSubModel, toBindingModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, (getSubModel x).Value) |> toBindingModel |> box |> ValueSome) @>
-      }
 
+        [<Fact>]
+        let ``final getModel calls toBindingModel on main model and inner return value of getSubModel if ValueSome``
+            ()
+            =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string >> ValueSome
+                let toBindingModel (m: int, s: string) = m + s.Length
 
-    [<Fact>]
-    let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel (_: int) : string voption = ValueNone
-        let d = Binding.subModelOpt(getSubModel, fail, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ValueNone @>
-      }
+                let d =
+                    Binding.subModelOpt (getSubModel, toBindingModel, fail, fail) |> getSubModelData
 
+                test <@ d.GetModel x = ((x, (getSubModel x).Value) |> toBindingModel |> box |> ValueSome) @>
+            }
 
-    [<Fact>]
-    let ``final toMsg returns value from original toMsg`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
 
-        let toMsg = string<int>
-        let d = Binding.subModelOpt((fun _ -> ValueSome 0), (fun _ -> ValueSome 0), toMsg, fail) |> getSubModelData
+        [<Fact>]
+        let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel (_: int) : string voption = ValueNone
+                let d = Binding.subModelOpt (getSubModel, fail, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ValueNone @>
+            }
 
-        test <@ d.ToMsg m (box x) = toMsg x @>
-      }
 
+        [<Fact>]
+        let ``final toMsg returns value from original toMsg`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
 
+                let toMsg = string<int>
 
-  module option_toMsg_toBindingModel =
+                let d =
+                    Binding.subModelOpt ((fun _ -> ValueSome 0), (fun _ -> ValueSome 0), toMsg, fail)
+                    |> getSubModelData
 
+                test <@ d.ToMsg m (box x) = toMsg x @>
+            }
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelOpt((fail: _ -> _ option), fail, fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
 
 
-    [<Fact>]
-    let ``final getModel calls toBindingModel on main model and inner return value of getSubModel if Some`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel = string >> Some
-        let toBindingModel (m: int, s: string) = m + s.Length
-        let d = Binding.subModelOpt(getSubModel, toBindingModel, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ((x, (getSubModel x).Value) |> toBindingModel |> box |> ValueSome) @>
-      }
+    module option_toMsg_toBindingModel =
 
 
-    [<Fact>]
-    let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let getSubModel (_: int) : string option = None
-        let d = Binding.subModelOpt(getSubModel, fail, fail, fail) |> getSubModelData
-        test <@ d.GetModel x = ValueNone @>
-      }
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
 
+                let binding =
+                    bindingName |> Binding.subModelOpt ((fail: _ -> _ option), fail, fail, fail)
 
-    [<Fact>]
-    let ``final toMsg returns value from original toMsg`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! x = GenX.auto<int>
+                test <@ binding.Name = bindingName @>
+            }
+
+
+        [<Fact>]
+        let ``final getModel calls toBindingModel on main model and inner return value of getSubModel if Some`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel = string >> Some
+                let toBindingModel (m: int, s: string) = m + s.Length
+
+                let d =
+                    Binding.subModelOpt (getSubModel, toBindingModel, fail, fail) |> getSubModelData
+
+                test <@ d.GetModel x = ((x, (getSubModel x).Value) |> toBindingModel |> box |> ValueSome) @>
+            }
+
+
+        [<Fact>]
+        let ``final getModel returns ValueNone if getSubModel returns ValueNone`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let getSubModel (_: int) : string option = None
+                let d = Binding.subModelOpt (getSubModel, fail, fail, fail) |> getSubModelData
+                test <@ d.GetModel x = ValueNone @>
+            }
 
-        let toMsg = string<int>
-        let d = Binding.subModelOpt((fun _ -> Some 0), (fun _ -> Some 0), toMsg, fail) |> getSubModelData
 
-        test <@ d.ToMsg m (box x) = toMsg x @>
-      }
+        [<Fact>]
+        let ``final toMsg returns value from original toMsg`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! x = GenX.auto<int>
+
+                let toMsg = string<int>
+
+                let d =
+                    Binding.subModelOpt ((fun _ -> Some 0), (fun _ -> Some 0), toMsg, fail)
+                    |> getSubModelData
+
+                test <@ d.ToMsg m (box x) = toMsg x @>
+            }
 
 
 
 module subModelSeqKeyed =
 
 
-  module noToMsg_noToBindingModel =
+    module noToMsg_noToBindingModel =
+
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModelSeq (fail, fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
+
+
+        [<Fact>]
+        let ``final getModels returns tuples of the items returned by getSubModels and the main model`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<string>
+                let getSubModels: string -> char list = Seq.toList
+                let d = Binding.subModelSeq (getSubModels, fail, fail) |> getSubModelSeqKeyedData
+
+                test
+                    <@ d.GetSubModels m |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map (fun s -> m, s)) @>
+            }
+
+
+        [<Fact>]
+        let ``final getId returns the ID of each element in final getModels`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<string>
+                let getSubModels: string -> char list = Seq.toList
+                let getId: char -> string = string
+                let d = Binding.subModelSeq (getSubModels, getId, fail) |> getSubModelSeqKeyedData
+
+                test
+                    <@
+                        d.GetSubModels m |> Seq.map d.BmToId |> Seq.map unbox |> Seq.toList = (m
+                                                                                               |> getSubModels
+                                                                                               |> List.map getId)
+                    @>
+            }
+
+
+    module toMsg_noToBindingModel =
+
+
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModelSeq (fail, fail, fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
+
+
+        [<Fact>]
+        let ``final getModels returns tuples of the items returned by getSubModels and the main model`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<string>
+                let getSubModels: string -> char list = Seq.toList
+
+                let d =
+                    Binding.subModelSeq (getSubModels, fail, fail, fail) |> getSubModelSeqKeyedData
+
+                test
+                    <@ d.GetSubModels m |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map (fun s -> m, s)) @>
+            }
+
+
+        [<Fact>]
+        let ``final getId returns the ID of each element in final getModels`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<string>
+                let getSubModels: string -> char list = Seq.toList
+                let getId: char -> string = string
+
+                let d =
+                    Binding.subModelSeq (getSubModels, getId, fail, fail) |> getSubModelSeqKeyedData
+
+                test
+                    <@
+                        d.GetSubModels m |> Seq.map d.BmToId |> Seq.map unbox |> Seq.toList = (m
+                                                                                               |> getSubModels
+                                                                                               |> List.map getId)
+                    @>
+            }
+
+
+    module toMsg_toBindingModel =
+
+
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+                let binding = bindingName |> Binding.subModelSeq (fail, fail, fail, fail, fail)
+                test <@ binding.Name = bindingName @>
+            }
+
+
+        [<Fact>]
+        let ``final getModels returns output of toBindingModel called with tuples of the items returned by getSubModels and the main model``
+            ()
+            =
+            Property.check
+            <| property {
+                let! m = GenX.auto<string>
+                let getSubModels: string -> char list = Seq.toList
+                let toBindingModel (m: string, c: char) = (m + string c).Length
+
+                let d =
+                    Binding.subModelSeq (getSubModels, toBindingModel, fail, fail, fail)
+                    |> getSubModelSeqKeyedData
+
+                test
+                    <@
+                        d.GetSubModels m |> Seq.map unbox |> Seq.toList = (m
+                                                                           |> getSubModels
+                                                                           |> List.map (fun s -> toBindingModel (m, s)))
+                    @>
+            }
+
+
+        [<Fact>]
+        let ``final getId returns the ID of each element in final getModels`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<string>
+                let getSubModels: string -> char list = Seq.toList
+                let toBindingModel (m: string, c: char) = (m + string c).Length
+                let getId i = i * 2
+
+                let d =
+                    Binding.subModelSeq (getSubModels, toBindingModel, getId, fail, fail)
+                    |> getSubModelSeqKeyedData
+
+                test
+                    <@
+                        d.GetSubModels m |> Seq.map d.BmToId |> Seq.map unbox |> Seq.toList = (m
+                                                                                               |> getSubModels
+                                                                                               |> List.map (fun s ->
+                                                                                                   toBindingModel (
+                                                                                                       m,
+                                                                                                       s
+                                                                                                   ))
+                                                                                               |> List.map getId)
+                    @>
+            }
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelSeq(fail, fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
 
 
-    [<Fact>]
-    let ``final getModels returns tuples of the items returned by getSubModels and the main model`` () =
-      Property.check <| property {
-        let! m = GenX.auto<string>
-        let getSubModels : string -> char list = Seq.toList
-        let d = Binding.subModelSeq(getSubModels, fail, fail) |> getSubModelSeqKeyedData
-        test <@ d.GetSubModels m |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map (fun s -> m, s)) @>
-      }
+module subModelSelectedItem =
 
 
-    [<Fact>]
-    let ``final getId returns the ID of each element in final getModels`` () =
-      Property.check <| property {
-        let! m = GenX.auto<string>
-        let getSubModels : string -> char list = Seq.toList
-        let getId : char -> string = string
-        let d = Binding.subModelSeq(getSubModels, getId, fail) |> getSubModelSeqKeyedData
-        test <@ d.GetSubModels m |> Seq.map d.BmToId |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map getId) @>
-      }
+    module voption_setModel =
 
 
-  module toMsg_noToBindingModel =
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
 
+                let binding =
+                    bindingName |> Binding.subModelSelectedItem ("", (fail: _ -> _ voption), fail2)
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelSeq(fail, fail, fail, fail)
-        test <@ binding.Name = bindingName @>
-      }
+                test <@ binding.Name = bindingName @>
+            }
 
 
-    [<Fact>]
-    let ``final getModels returns tuples of the items returned by getSubModels and the main model`` () =
-      Property.check <| property {
-        let! m = GenX.auto<string>
-        let getSubModels : string -> char list = Seq.toList
-        let d = Binding.subModelSeq(getSubModels, fail, fail, fail) |> getSubModelSeqKeyedData
-        test <@ d.GetSubModels m |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map (fun s -> m, s)) @>
-      }
+        [<Fact>]
+        let ``sets the correct subModelSeqBindingName`` () =
+            Property.check
+            <| property {
+                let! name = GenX.auto<string>
 
+                let d =
+                    Binding.subModelSelectedItem (name, (fail: _ -> _ voption), fail2)
+                    |> getSubModelSelectedItemData
 
-    [<Fact>]
-    let ``final getId returns the ID of each element in final getModels`` () =
-      Property.check <| property {
-        let! m = GenX.auto<string>
-        let getSubModels : string -> char list = Seq.toList
-        let getId : char -> string = string
-        let d = Binding.subModelSeq(getSubModels, getId, fail, fail) |> getSubModelSeqKeyedData
-        test <@ d.GetSubModels m |> Seq.map d.BmToId |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map getId) @>
-      }
+                test <@ d.SubModelSeqBindingName = name @>
+            }
 
 
-  module toMsg_toBindingModel =
+        [<Fact>]
+        let ``final get returns value from original get`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! useNone = Gen.bool
 
+                let get (x: int) =
+                    if useNone then ValueNone else x |> string |> ValueSome
 
-      [<Fact>]
-      let ``sets the correct binding name`` () =
-        Property.check <| property {
-          let! bindingName = GenX.auto<string>
-          let binding = bindingName |> Binding.subModelSeq(fail, fail, fail, fail, fail)
-          test <@ binding.Name = bindingName @>
-        }
+                let d = Binding.subModelSelectedItem ("", get, fail2) |> getSubModelSelectedItemData
+                test <@ d.Get x |> ValueOption.map unbox<string> = get x @>
+            }
 
 
-      [<Fact>]
-      let ``final getModels returns output of toBindingModel called with tuples of the items returned by getSubModels and the main model`` () =
-        Property.check <| property {
-          let! m = GenX.auto<string>
-          let getSubModels : string -> char list = Seq.toList
-          let toBindingModel (m: string, c: char) = (m + string c).Length
-          let d = Binding.subModelSeq(getSubModels, toBindingModel, fail, fail, fail) |> getSubModelSeqKeyedData
-          test <@ d.GetSubModels m |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map (fun s -> toBindingModel (m, s))) @>
-        }
+        [<Fact>]
+        let ``final set returns value from original set`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string voption>
+                let get _ = ValueNone
 
+                let set (p: string voption) m =
+                    p |> ValueOption.map (fun p -> p.Length + m |> string)
 
-      [<Fact>]
-      let ``final getId returns the ID of each element in final getModels`` () =
-        Property.check <| property {
-          let! m = GenX.auto<string>
-          let getSubModels : string -> char list = Seq.toList
-          let toBindingModel (m: string, c: char) = (m + string c).Length
-          let getId i = i * 2
-          let d = Binding.subModelSeq(getSubModels, toBindingModel, getId, fail, fail) |> getSubModelSeqKeyedData
-          test <@ d.GetSubModels m |> Seq.map d.BmToId |> Seq.map unbox |> Seq.toList = (m |> getSubModels |> List.map (fun s -> toBindingModel (m, s)) |> List.map getId) @>
-        }
+                let d = Binding.subModelSelectedItem ("", get, set) |> getSubModelSelectedItemData
+                test <@ d.Set (p |> ValueOption.map box) m = set p m @>
+            }
 
 
+    module option_setModel =
 
-module subModelSelectedItem =
 
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
 
-  module voption_setModel =
+                let binding =
+                    bindingName |> Binding.subModelSelectedItem ("", (fail: _ -> _ option), fail2)
 
+                test <@ binding.Name = bindingName @>
+            }
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelSelectedItem("", (fail: _ -> _ voption), fail2)
-        test <@ binding.Name = bindingName @>
-      }
 
+        [<Fact>]
+        let ``sets the correct subModelSeqBindingName`` () =
+            Property.check
+            <| property {
+                let! name = GenX.auto<string>
 
-    [<Fact>]
-    let ``sets the correct subModelSeqBindingName`` () =
-      Property.check <| property {
-        let! name = GenX.auto<string>
-        let d = Binding.subModelSelectedItem(name, (fail: _ -> _ voption), fail2) |> getSubModelSelectedItemData
-        test <@ d.SubModelSeqBindingName = name @>
-      }
+                let d =
+                    Binding.subModelSelectedItem (name, (fail: _ -> _ option), fail2)
+                    |> getSubModelSelectedItemData
 
+                test <@ d.SubModelSeqBindingName = name @>
+            }
 
-    [<Fact>]
-    let ``final get returns value from original get`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! useNone = Gen.bool
-        let get (x: int) = if useNone then ValueNone else x |> string |> ValueSome
-        let d = Binding.subModelSelectedItem("", get, fail2) |> getSubModelSelectedItemData
-        test <@ d.Get x |> ValueOption.map unbox<string> = get x @>
-      }
 
+        [<Fact>]
+        let ``final get returns value from original get converted to ValueOption`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! useNone = Gen.bool
 
-    [<Fact>]
-    let ``final set returns value from original set`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string voption>
-        let get _ = ValueNone
-        let set (p: string voption) m = p |> ValueOption.map (fun p -> p.Length + m |> string)
-        let d = Binding.subModelSelectedItem("", get, set) |> getSubModelSelectedItemData
-        test <@ d.Set (p |> ValueOption.map box) m = set p m @>
-      }
+                let get (x: int) =
+                    if useNone then None else x |> string |> Some
 
+                let d = Binding.subModelSelectedItem ("", get, fail2) |> getSubModelSelectedItemData
+                test <@ d.Get x |> ValueOption.map unbox = (get x |> ValueOption.ofOption) @>
+            }
 
-  module option_setModel =
 
+        [<Fact>]
+        let ``final set returns value from original set`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string option>
+                let get _ = None
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelSelectedItem("", (fail: _ -> _ option), fail2)
-        test <@ binding.Name = bindingName @>
-      }
+                let set (p: string option) m =
+                    p |> Option.map (fun p -> p.Length + m |> string)
 
+                let d = Binding.subModelSelectedItem ("", get, set) |> getSubModelSelectedItemData
+                test <@ d.Set (p |> Option.map box |> ValueOption.ofOption) m = set p m @>
+            }
 
-    [<Fact>]
-    let ``sets the correct subModelSeqBindingName`` () =
-      Property.check <| property {
-        let! name = GenX.auto<string>
-        let d = Binding.subModelSelectedItem(name, (fail: _ -> _ option), fail2) |> getSubModelSelectedItemData
-        test <@ d.SubModelSeqBindingName = name @>
-      }
 
+    module voption_noSetModel =
 
-    [<Fact>]
-    let ``final get returns value from original get converted to ValueOption`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! useNone = Gen.bool
-        let get (x: int) = if useNone then None else x |> string |> Some
-        let d = Binding.subModelSelectedItem("", get, fail2) |> getSubModelSelectedItemData
-        test <@ d.Get x |> ValueOption.map unbox = (get x |> ValueOption.ofOption) @>
-      }
 
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
 
-    [<Fact>]
-    let ``final set returns value from original set`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string option>
-        let get _ = None
-        let set (p: string option) m = p |> Option.map (fun p -> p.Length + m |> string)
-        let d = Binding.subModelSelectedItem("", get, set) |> getSubModelSelectedItemData
-        test <@ d.Set (p |> Option.map box |> ValueOption.ofOption) m = set p m @>
-      }
-
-
-  module voption_noSetModel =
-
-
-      [<Fact>]
-      let ``sets the correct binding name`` () =
-        Property.check <| property {
-          let! bindingName = GenX.auto<string>
-          let binding = bindingName |> Binding.subModelSelectedItem("", (fail: _ -> _ voption), (fail: _ -> obj))
-          test <@ binding.Name = bindingName @>
-        }
+                let binding =
+                    bindingName
+                    |> Binding.subModelSelectedItem ("", (fail: _ -> _ voption), (fail: _ -> obj))
 
+                test <@ binding.Name = bindingName @>
+            }
 
-      [<Fact>]
-      let ``sets the correct subModelSeqBindingName`` () =
-        Property.check <| property {
-          let! name = GenX.auto<string>
-          let d = Binding.subModelSelectedItem(name, (fail: _ -> _ voption), (fail: _ -> obj)) |> getSubModelSelectedItemData
-          test <@ d.SubModelSeqBindingName = name @>
-        }
 
+        [<Fact>]
+        let ``sets the correct subModelSeqBindingName`` () =
+            Property.check
+            <| property {
+                let! name = GenX.auto<string>
 
-      [<Fact>]
-      let ``final get returns value from original get`` () =
-        Property.check <| property {
-          let! x = GenX.auto<int>
-          let! useNone = Gen.bool
-          let get (x: int) = if useNone then ValueNone else x |> string |> ValueSome
-          let d = Binding.subModelSelectedItem("", get, (fail: _ -> obj)) |> getSubModelSelectedItemData
-          test <@ d.Get x |> ValueOption.map unbox = get x @>
-        }
+                let d =
+                    Binding.subModelSelectedItem (name, (fail: _ -> _ voption), (fail: _ -> obj))
+                    |> getSubModelSelectedItemData
 
+                test <@ d.SubModelSeqBindingName = name @>
+            }
 
-      [<Fact>]
-      let ``final set returns value from original set`` () =
-        Property.check <| property {
-          let! m = GenX.auto<int>
-          let! p = GenX.auto<string voption>
-          let get _ = ValueNone
-          let set (p: string voption) = p |> ValueOption.map (fun p -> p.Length |> string)
-          let d = Binding.subModelSelectedItem("", get, set) |> getSubModelSelectedItemData
-          test <@ d.Set (p |> ValueOption.map box) m = set p @>
-        }
 
+        [<Fact>]
+        let ``final get returns value from original get`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! useNone = Gen.bool
 
-  module option_noSetModel =
+                let get (x: int) =
+                    if useNone then ValueNone else x |> string |> ValueSome
 
+                let d =
+                    Binding.subModelSelectedItem ("", get, (fail: _ -> obj))
+                    |> getSubModelSelectedItemData
 
-    [<Fact>]
-    let ``sets the correct binding name`` () =
-      Property.check <| property {
-        let! bindingName = GenX.auto<string>
-        let binding = bindingName |> Binding.subModelSelectedItem("", (fail: _ -> _ option), (fail: _ -> obj))
-        test <@ binding.Name = bindingName @>
-      }
+                test <@ d.Get x |> ValueOption.map unbox = get x @>
+            }
 
 
-    [<Fact>]
-    let ``sets the correct subModelSeqBindingName`` () =
-      Property.check <| property {
-        let! name = GenX.auto<string>
-        let d = Binding.subModelSelectedItem(name, (fail: _ -> _ option), (fail: _ -> obj)) |> getSubModelSelectedItemData
-        test <@ d.SubModelSeqBindingName = name @>
-      }
+        [<Fact>]
+        let ``final set returns value from original set`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string voption>
+                let get _ = ValueNone
 
+                let set (p: string voption) =
+                    p |> ValueOption.map (fun p -> p.Length |> string)
 
-    [<Fact>]
-    let ``final get returns value from original get converted to ValueOption`` () =
-      Property.check <| property {
-        let! x = GenX.auto<int>
-        let! useNone = Gen.bool
-        let get (x: int) = if useNone then None else x |> string |> Some
-        let d = Binding.subModelSelectedItem("", get, (fail: _ -> obj)) |> getSubModelSelectedItemData
-        test <@ d.Get x |> ValueOption.map unbox = (get x |> ValueOption.ofOption) @>
-      }
+                let d = Binding.subModelSelectedItem ("", get, set) |> getSubModelSelectedItemData
+                test <@ d.Set (p |> ValueOption.map box) m = set p @>
+            }
 
 
-    [<Fact>]
-    let ``final set returns value from original set`` () =
-      Property.check <| property {
-        let! m = GenX.auto<int>
-        let! p = GenX.auto<string option>
-        let get _ = None
-        let set (p: string option) = p |> Option.map (fun p -> p.Length |> string)
-        let d = Binding.subModelSelectedItem("", get, set) |> getSubModelSelectedItemData
-        test <@ d.Set (p |> Option.map box |> ValueOption.ofOption) m = set p @>
-      }
+    module option_noSetModel =
+
+
+        [<Fact>]
+        let ``sets the correct binding name`` () =
+            Property.check
+            <| property {
+                let! bindingName = GenX.auto<string>
+
+                let binding =
+                    bindingName
+                    |> Binding.subModelSelectedItem ("", (fail: _ -> _ option), (fail: _ -> obj))
+
+                test <@ binding.Name = bindingName @>
+            }
+
+
+        [<Fact>]
+        let ``sets the correct subModelSeqBindingName`` () =
+            Property.check
+            <| property {
+                let! name = GenX.auto<string>
+
+                let d =
+                    Binding.subModelSelectedItem (name, (fail: _ -> _ option), (fail: _ -> obj))
+                    |> getSubModelSelectedItemData
+
+                test <@ d.SubModelSeqBindingName = name @>
+            }
+
+
+        [<Fact>]
+        let ``final get returns value from original get converted to ValueOption`` () =
+            Property.check
+            <| property {
+                let! x = GenX.auto<int>
+                let! useNone = Gen.bool
+
+                let get (x: int) =
+                    if useNone then None else x |> string |> Some
+
+                let d =
+                    Binding.subModelSelectedItem ("", get, (fail: _ -> obj))
+                    |> getSubModelSelectedItemData
+
+                test <@ d.Get x |> ValueOption.map unbox = (get x |> ValueOption.ofOption) @>
+            }
+
+
+        [<Fact>]
+        let ``final set returns value from original set`` () =
+            Property.check
+            <| property {
+                let! m = GenX.auto<int>
+                let! p = GenX.auto<string option>
+                let get _ = None
+
+                let set (p: string option) =
+                    p |> Option.map (fun p -> p.Length |> string)
+
+                let d = Binding.subModelSelectedItem ("", get, set) |> getSubModelSelectedItemData
+                test <@ d.Set (p |> Option.map box |> ValueOption.ofOption) m = set p @>
+            }
 
 
 
 module sorting =
 
-  open BindingVmHelpers
+    open BindingVmHelpers
 
-  [<Fact>]
+    [<Fact>]
     let ``SubModelSelectedItemData sorted last`` () =
-      Property.check <| property {
-        let! s = GenX.auto<string>
-        let data =
-          [ SubModelSelectedItemData { Get = fail; Set = fail2; SubModelSeqBindingName = s }
-            SubModelSeqKeyedData { GetSubModels = fail; BmToId = fail; CreateViewModel = fail; CreateCollection = fail; UpdateViewModel = fail; ToMsg = fail; VmToId = fail }
-            SubModelSelectedItemData { Get = fail; Set = fail2; SubModelSeqBindingName = s }
-          ] |> List.map BaseBindingData
-        let sorted = data |> List.sortWith (SubModelSelectedItemLast().CompareBindingDatas())
-        match sorted with
-        | [_; BaseBindingData (SubModelSelectedItemData _); BaseBindingData (SubModelSelectedItemData _)] -> ()
-        | _ -> failwith "SubModelSelectedItemData was not sorted last"
-      }
+        Property.check
+        <| property {
+            let! s = GenX.auto<string>
+
+            let data =
+                [ SubModelSelectedItemData
+                      { Get = fail
+                        Set = fail2
+                        SubModelSeqBindingName = s }
+                  SubModelSeqKeyedData
+                      { GetSubModels = fail
+                        BmToId = fail
+                        CreateViewModel = fail
+                        CreateCollection = fail
+                        UpdateViewModel = fail
+                        ToMsg = fail
+                        VmToId = fail }
+                  SubModelSelectedItemData
+                      { Get = fail
+                        Set = fail2
+                        SubModelSeqBindingName = s } ]
+                |> List.map BaseBindingData
+
+            let sorted =
+                data |> List.sortWith (SubModelSelectedItemLast().CompareBindingDatas())
+
+            match sorted with
+            | [ _; BaseBindingData(SubModelSelectedItemData _); BaseBindingData(SubModelSelectedItemData _) ] -> ()
+            | _ -> failwith "SubModelSelectedItemData was not sorted last"
+        }
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/BindingVmHelpersTests.fs b/src/Elmish.WPF.Tests/BindingVmHelpersTests.fs
index 91e96e7b..8e1d97a3 100644
--- a/src/Elmish.WPF.Tests/BindingVmHelpersTests.fs
+++ b/src/Elmish.WPF.Tests/BindingVmHelpersTests.fs
@@ -12,125 +12,138 @@ open Elmish.WPF.BindingVmHelpers
 
 
 let name = "name"
-let noGetSelectedItemCall _ = failwith "Should not call get selected item"
+
+let noGetSelectedItemCall _ =
+    failwith "Should not call get selected item"
 
 
 module Initialize =
 
-  [<Fact>]
-  let ``Initialize doesn't call getCurrentModel`` () =
-    let binding =
-      BindingData.OneWay.id<string, string>
-      |> BindingData.addValidation List.singleton
+    [<Fact>]
+    let ``Initialize doesn't call getCurrentModel`` () =
+        let binding =
+            BindingData.OneWay.id<string, string>
+            |> BindingData.addValidation List.singleton
 
-    let vmBinding =
-      Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
-        .Recursive("", ignore, (fun _ -> failwith "Should not call getCurrentModel on initialize"), binding)
+        let vmBinding =
+            Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
+                .Recursive("", ignore, (fun _ -> failwith "Should not call getCurrentModel on initialize"), binding)
 
-    test <@ vmBinding.IsSome @>
+        test <@ vmBinding.IsSome @>
 
 module Get =
 
-  let check<'a when 'a : equality> (g: Gen<'a>) =
-    Property.check <| property {
-      let! expectedModel = g
+    let check<'a when 'a: equality> (g: Gen<'a>) =
+        Property.check
+        <| property {
+            let! expectedModel = g
+
+            let binding = BindingData.OneWay.id
 
-      let binding =
-        BindingData.OneWay.id
-      let vmBinding =
-        Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
-          .Recursive(expectedModel, ignore, (fun () -> expectedModel), binding)
-          .Value
+            let vmBinding =
+                Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
+                    .Recursive(expectedModel, ignore, (fun () -> expectedModel), binding)
+                    .Value
 
-      let actualModel = Get(name).Recursive(expectedModel, vmBinding)
+            let actualModel = Get(name).Recursive(expectedModel, vmBinding)
 
-      test <@ actualModel = Ok expectedModel @>
-    }
+            test <@ actualModel = Ok expectedModel @>
+        }
 
-  [<Fact>]
-  let ``get succeeds for various types`` () =
-    GenX.auto<float> |> check
-    GenX.auto<int32> |> check
-    GenX.auto<Guid> |> check
-    GenX.auto<string> |> GenX.withNull |> check
-    GenX.auto<obj> |> GenX.withNull |> check
+    [<Fact>]
+    let ``get succeeds for various types`` () =
+        GenX.auto<float> |> check
+        GenX.auto<int32> |> check
+        GenX.auto<Guid> |> check
+        GenX.auto<string> |> GenX.withNull |> check
+        GenX.auto<obj> |> GenX.withNull |> check
 
 
-  [<Fact>]
-  let ``should return error on bad typing`` () =
-    let binding = Binding.SubModel.opt (fun () -> []) >> Binding.mapModel (fun () -> None) <| ""
+    [<Fact>]
+    let ``should return error on bad typing`` () =
+        let binding =
+            Binding.SubModel.opt (fun () -> []) >> Binding.mapModel (fun () -> None) <| ""
 
-    let dispatch msg =
-      failwith $"Should not dispatch, got {msg}"
+        let dispatch msg =
+            failwith $"Should not dispatch, got {msg}"
 
-    let vmBinding =
-      Initialize(LoggingViewModelArgs.none, "Nothing", (fun _ -> failwith "Should not call get selected item"))
-        .Recursive((), dispatch, (fun () -> ()), binding.Data)
-      |> Option.defaultWith (fun () -> failwith $"Could not create VmBinding after passing in BindingData: {binding}")
+        let vmBinding =
+            Initialize(LoggingViewModelArgs.none, "Nothing", (fun _ -> failwith "Should not call get selected item"))
+                .Recursive((), dispatch, (fun () -> ()), binding.Data)
+            |> Option.defaultWith (fun () ->
+                failwith $"Could not create VmBinding after passing in BindingData: {binding}")
 
-    let vmBinding2 = vmBinding |> MapOutputType.unboxVm
+        let vmBinding2 = vmBinding |> MapOutputType.unboxVm
 
-    let getResult: Result<int, GetError> =  Get("Nothing").Recursive((), vmBinding2)
+        let getResult: Result<int, GetError> = Get("Nothing").Recursive((), vmBinding2)
 
-    test <@ match getResult with | Error (GetError.ToNullError (ValueOption.ToNullError.ValueCannotBeNull _)) -> true | _ -> false @>
+        test
+            <@
+                match getResult with
+                | Error(GetError.ToNullError(ValueOption.ToNullError.ValueCannotBeNull _)) -> true
+                | _ -> false
+            @>
 
 module Set =
 
-  let check<'a when 'a : equality> (g: Gen<'a>) =
-    Property.check <| property {
-      let! initialModel = g
-      let! newModel = g |> GenX.notEqualTo initialModel
-
-      let model = ref initialModel
-      let dispatch msg = model.Value <- msg
-      let binding =
-        BindingData.TwoWay.id
-      
-      let vmBinding =
-        Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
-          .Recursive(initialModel, dispatch, (fun () -> model.Value), binding)
-          .Value
-
-      test <@ Set(newModel).Recursive(model.Value, vmBinding) @>
-      test <@ model.Value = newModel @>
-    }
-
-  [<Fact>]
-  let ``set successful for various types`` () =
-    GenX.auto<float> |> check
-    GenX.auto<int32> |> check
-    GenX.auto<Guid> |> check
-    GenX.auto<string> |> GenX.withNull |> check
-    GenX.auto<obj> |> GenX.withNull |> check
+    let check<'a when 'a: equality> (g: Gen<'a>) =
+        Property.check
+        <| property {
+            let! initialModel = g
+            let! newModel = g |> GenX.notEqualTo initialModel
+
+            let model = ref initialModel
+            let dispatch msg = model.Value <- msg
+            let binding = BindingData.TwoWay.id
+
+            let vmBinding =
+                Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
+                    .Recursive(initialModel, dispatch, (fun () -> model.Value), binding)
+                    .Value
+
+            test <@ Set(newModel).Recursive(model.Value, vmBinding) @>
+            test <@ model.Value = newModel @>
+        }
+
+    [<Fact>]
+    let ``set successful for various types`` () =
+        GenX.auto<float> |> check
+        GenX.auto<int32> |> check
+        GenX.auto<Guid> |> check
+        GenX.auto<string> |> GenX.withNull |> check
+        GenX.auto<obj> |> GenX.withNull |> check
 
 
 module Update =
 
-  let check<'a when 'a : equality> (g: Gen<'a>) =
-    Property.check <| property {
-      let! initialModel = g
-      let! newModel = g |> GenX.notEqualTo initialModel
-
-      let model = ref initialModel
-      let dispatch msg = failwith $"Should not dispatch message {msg}"
-      let binding =
-        BindingData.TwoWay.id
-      let vmBinding =
-        Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
-          .Recursive(initialModel, dispatch, (fun () -> model.Value), binding)
-          .Value
-
-      let updateResult =
-        Update(LoggingViewModelArgs.none, name)
-          .Recursive(initialModel, newModel, vmBinding)
-
-      test <@ updateResult |> List.length = 1 @>
-    }
-
-  [<Fact>]
-  let ``update successful for various types`` () =
-    GenX.auto<float> |> check
-    GenX.auto<int32> |> check
-    GenX.auto<Guid> |> check
-    GenX.auto<string> |> GenX.withNull |> check
-    GenX.auto<obj> |> GenX.withNull |> check
+    let check<'a when 'a: equality> (g: Gen<'a>) =
+        Property.check
+        <| property {
+            let! initialModel = g
+            let! newModel = g |> GenX.notEqualTo initialModel
+
+            let model = ref initialModel
+
+            let dispatch msg =
+                failwith $"Should not dispatch message {msg}"
+
+            let binding = BindingData.TwoWay.id
+
+            let vmBinding =
+                Initialize(LoggingViewModelArgs.none, name, noGetSelectedItemCall)
+                    .Recursive(initialModel, dispatch, (fun () -> model.Value), binding)
+                    .Value
+
+            let updateResult =
+                Update(LoggingViewModelArgs.none, name).Recursive(initialModel, newModel, vmBinding)
+
+            test <@ updateResult |> List.length = 1 @>
+        }
+
+    [<Fact>]
+    let ``update successful for various types`` () =
+        GenX.auto<float> |> check
+        GenX.auto<int32> |> check
+        GenX.auto<Guid> |> check
+        GenX.auto<string> |> GenX.withNull |> check
+        GenX.auto<obj> |> GenX.withNull |> check
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/DynamicViewModelTests.fs b/src/Elmish.WPF.Tests/DynamicViewModelTests.fs
index e54888af..d9a5e016 100644
--- a/src/Elmish.WPF.Tests/DynamicViewModelTests.fs
+++ b/src/Elmish.WPF.Tests/DynamicViewModelTests.fs
@@ -19,83 +19,77 @@ open Elmish.WPF
 [<AutoOpen>]
 module Extensions =
 
-  type DynamicViewModel<'model, 'msg> with
+    type DynamicViewModel<'model, 'msg> with
 
-    member internal this.Get propName =
-      (?) this propName
+        member internal this.Get propName = (?) this propName
 
-    member internal this.Set propName value =
-      (?<-) this propName value
+        member internal this.Set propName value = (?<-) this propName value
 
 
 type internal TestVm<'model, 'msg>(model, bindings) as this =
-  inherit DynamicViewModel<'model, 'msg>({ initialModel = model; dispatch = (fun x -> this.Dispatch x); loggingArgs = LoggingViewModelArgs.none }, bindings)
+    inherit
+        DynamicViewModel<'model, 'msg>(
+            { initialModel = model
+              dispatch = (fun x -> this.Dispatch x)
+              loggingArgs = LoggingViewModelArgs.none },
+            bindings
+        )
+
+    let pcTriggers = ConcurrentDictionary<string, int>()
+    let ecTriggers = ConcurrentDictionary<string, int>()
 
-  let pcTriggers = ConcurrentDictionary<string, int>()
-  let ecTriggers = ConcurrentDictionary<string, int>()
-  let ccTriggers = ConcurrentDictionary<string, NotifyCollectionChangedEventArgs list>()
-  let cecTriggers = ConcurrentDictionary<string, int>()
-  let dispatchMsgs = ResizeArray<'msg> ()
+    let ccTriggers =
+        ConcurrentDictionary<string, NotifyCollectionChangedEventArgs list>()
 
+    let cecTriggers = ConcurrentDictionary<string, int>()
+    let dispatchMsgs = ResizeArray<'msg>()
 
-  do
-    (this :> INotifyPropertyChanged).PropertyChanged.Add (fun e ->
-      pcTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore
-    )
 
-    (this :> INotifyDataErrorInfo).ErrorsChanged.Add (fun e ->
-      ecTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore
-    )
+    do
+        (this :> INotifyPropertyChanged)
+            .PropertyChanged.Add(fun e ->
+                pcTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore)
 
-  new(model, binding) = TestVm(model, [binding])
+        (this :> INotifyDataErrorInfo)
+            .ErrorsChanged.Add(fun e -> ecTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore)
 
-  member _.UpdateModel(m) = IViewModel.updateModel(this, m)
+    new(model, binding) = TestVm(model, [ binding ])
 
-  member private __.Dispatch x =
-    dispatchMsgs.Add x
+    member _.UpdateModel(m) = IViewModel.updateModel (this, m)
 
-  member __.NumPcTriggersFor propName =
-    pcTriggers.TryGetValue propName |> snd
+    member private __.Dispatch x = dispatchMsgs.Add x
 
-  member __.NumEcTriggersFor propName =
-    ecTriggers.TryGetValue propName |> snd
+    member __.NumPcTriggersFor propName = pcTriggers.TryGetValue propName |> snd
 
-  member __.NumCcTriggersFor propName =
-    ccTriggers.GetOrAdd(propName, []).Length
+    member __.NumEcTriggersFor propName = ecTriggers.TryGetValue propName |> snd
 
-  member __.NumCecTriggersFor propName =
-    cecTriggers.TryGetValue propName |> snd
+    member __.NumCcTriggersFor propName =
+        ccTriggers.GetOrAdd(propName, []).Length
 
-  member __.Dispatches =
-    dispatchMsgs |> Seq.toList
+    member __.NumCecTriggersFor propName = cecTriggers.TryGetValue propName |> snd
 
-  member __.CcTriggersFor propName =
-    ccTriggers.TryGetValue propName |> snd |> Seq.toList
+    member __.Dispatches = dispatchMsgs |> Seq.toList
 
-  /// Starts tracking CollectionChanged triggers for the specified prop.
-  /// Will cause the property to be retrieved.
-  member this.TrackCcTriggersFor propName =
-    try
-      (this.Get propName : INotifyCollectionChanged).CollectionChanged.Add (fun e ->
-        ccTriggers.AddOrUpdate(
-          propName,
-          [e],
-          (fun _ me -> e :: me)) |> ignore
-      )
-    with _ ->
-      (this.Get propName |> unbox<INotifyCollectionChanged>).CollectionChanged.Add (fun e ->
-        ccTriggers.AddOrUpdate(
-          propName,
-          [e],
-          (fun _ me -> e :: me)) |> ignore
-      )
+    member __.CcTriggersFor propName =
+        ccTriggers.TryGetValue propName |> snd |> Seq.toList
 
-  /// Starts tracking CanExecuteChanged triggers for the specified prop.
-  /// Will cause the property to be retrieved.
-  member this.TrackCecTriggersFor propName =
-    (this.Get propName : ICommand).CanExecuteChanged.Add (fun _ ->
-      cecTriggers.AddOrUpdate(propName, 1, (fun _ count -> count + 1)) |> ignore
-    )
+    /// Starts tracking CollectionChanged triggers for the specified prop.
+    /// Will cause the property to be retrieved.
+    member this.TrackCcTriggersFor propName =
+        try
+            (this.Get propName: INotifyCollectionChanged)
+                .CollectionChanged.Add(fun e ->
+                    ccTriggers.AddOrUpdate(propName, [ e ], (fun _ me -> e :: me)) |> ignore)
+        with _ ->
+            (this.Get propName |> unbox<INotifyCollectionChanged>)
+                .CollectionChanged.Add(fun e ->
+                    ccTriggers.AddOrUpdate(propName, [ e ], (fun _ me -> e :: me)) |> ignore)
+
+    /// Starts tracking CanExecuteChanged triggers for the specified prop.
+    /// Will cause the property to be retrieved.
+    member this.TrackCecTriggersFor propName =
+        (this.Get propName: ICommand)
+            .CanExecuteChanged.Add(fun _ -> cecTriggers.AddOrUpdate(propName, 1, (fun _ count -> count + 1)) |> ignore)
 
 
 
@@ -103,1548 +97,1714 @@ type internal TestVm<'model, 'msg>(model, bindings) as this =
 module Helpers =
 
 
-  let internal oneWay x = x |> Binding.oneWay
-  let internal oneWayLazy x = x |> Func3.curry Binding.oneWayLazy
-  let internal oneWaySeqLazy x = x |> Func5.curry Binding.oneWaySeqLazy
-  let internal twoWay x = x |> Func2.curry Binding.twoWay
-  let internal twoWayValidate
-      name
-      (get: 'model -> 'a)
-      (set: 'a -> 'model -> 'msg)
-      (validate: 'model -> string voption) =
-    Binding.twoWayValidate (get, set, validate) name
-
+    let internal oneWay x = x |> Binding.oneWay
+    let internal oneWayLazy x = x |> Func3.curry Binding.oneWayLazy
+    let internal oneWaySeqLazy x = x |> Func5.curry Binding.oneWaySeqLazy
+    let internal twoWay x = x |> Func2.curry Binding.twoWay
 
-  let internal cmd x = x |> Binding.Cmd.create
+    let internal twoWayValidate
+        name
+        (get: 'model -> 'a)
+        (set: 'a -> 'model -> 'msg)
+        (validate: 'model -> string voption)
+        =
+        Binding.twoWayValidate (get, set, validate) name
 
 
+    let internal cmd x = x |> Binding.Cmd.create
 
-  let internal cmdParam
-      name
-      (exec: 'a -> 'model -> 'msg voption)
-      (canExec: 'a -> 'model -> bool)
-      (autoRequery: bool) =
-    ({ Exec = unbox >> exec
-       CanExec = unbox >> canExec
-       AutoRequery = autoRequery }
-     |> CmdData
-     |> BaseBindingData
-     |> createBinding) name
 
 
-  let internal subModel
-      name
-      (getModel: 'model -> 'subModel voption)
-      (toMsg: 'subMsg -> 'msg)
-      (bindings: Binding<'subModel, 'subMsg> list)
-      (sticky: bool) =
-    Binding.subModelOpt(getModel, snd, toMsg, (fun () -> bindings), sticky) name
+    let internal cmdParam
+        name
+        (exec: 'a -> 'model -> 'msg voption)
+        (canExec: 'a -> 'model -> bool)
+        (autoRequery: bool)
+        =
+        ({ Exec = unbox >> exec
+           CanExec = unbox >> canExec
+           AutoRequery = autoRequery }
+         |> CmdData
+         |> BaseBindingData
+         |> createBinding)
+            name
+
+
+    let internal subModel
+        name
+        (getModel: 'model -> 'subModel voption)
+        (toMsg: 'subMsg -> 'msg)
+        (bindings: Binding<'subModel, 'subMsg> list)
+        (sticky: bool)
+        =
+        Binding.subModelOpt (getModel, snd, toMsg, (fun () -> bindings), sticky) name
 
 
-  let internal subModelSeq
-      name
-      (getModels: 'model -> 'subModel list)
-      (getId: 'subModel -> 'id)
-      (toMsg: 'id * 'subMsg -> 'msg)
-      (bindings: Binding<'subModel, 'subMsg> list) =
-    name
-    |> Binding.subModelSeq (getBindings = (fun () -> bindings), getId = getId)
-    |> Binding.mapModel (fun m -> upcast getModels m)
-    |> Binding.mapMsg toMsg
+    let internal subModelSeq
+        name
+        (getModels: 'model -> 'subModel list)
+        (getId: 'subModel -> 'id)
+        (toMsg: 'id * 'subMsg -> 'msg)
+        (bindings: Binding<'subModel, 'subMsg> list)
+        =
+        name
+        |> Binding.subModelSeq (getBindings = (fun () -> bindings), getId = getId)
+        |> Binding.mapModel (fun m -> upcast getModels m)
+        |> Binding.mapMsg toMsg
 
 
 
-  let internal subModelSelectedItem
-      name
-      subModelSeqBindingName
-      (get: 'model -> 'id voption)
-      (set: 'id voption -> 'model -> 'msg) =
-    Binding.subModelSelectedItem (subModelSeqBindingName, get, set) name
+    let internal subModelSelectedItem
+        name
+        subModelSeqBindingName
+        (get: 'model -> 'id voption)
+        (set: 'id voption -> 'model -> 'msg)
+        =
+        Binding.subModelSelectedItem (subModelSeqBindingName, get, set) name
 
 
 
 module OneWay =
 
 
-  [<Fact>]
-  let ``when retrieved, should always return the value returned by get`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``when retrieved, should always return the value returned by get`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string<int>
+            let get = string<int>
 
-      let binding = oneWay get name
-      let vm = TestVm(m1, binding)
+            let binding = oneWay get name
+            let vm = TestVm(m1, binding)
 
-      test <@ vm.Get name = get m1 @>
+            test <@ vm.Get name = get m1 @>
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      test <@ vm.Get name = get m2 @>
-  }
+            test <@ vm.Get name = get m2 @>
+        }
 
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string<int>
+            let get = string<int>
 
-      let binding = oneWay get name
-      let vm = TestVm(m1, binding)
+            let binding = oneWay get name
+            let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
-      test <@ vm.NumPcTriggersFor name = if get m1 = get m2 then 0 else 1 @>
-  }
+            vm.UpdateModel m2
+            test <@ vm.NumPcTriggersFor name = if get m1 = get m2 then 0 else 1 @>
+        }
 
-  [<Fact>]
-  let ``on model increment, sticky-to-even binding returns even number`` () =
-    let isEven x = x % 2 = 0
+    [<Fact>]
+    let ``on model increment, sticky-to-even binding returns even number`` () =
+        let isEven x = x % 2 = 0
 
-    let returnEven a =
-      function
-      | b when isEven b -> b
-      | _ -> a
+        let returnEven a =
+            function
+            | b when isEven b -> b
+            | _ -> a
 
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
 
-      let binding = oneWay id name |> Binding.addSticky isEven
-      let vm = TestVm(m, binding)
+            let binding = oneWay id name |> Binding.addSticky isEven
+            let vm = TestVm(m, binding)
 
-      vm.UpdateModel (m + 1)
-      test <@ vm.Get name = returnEven m (m + 1) @>
-    }
+            vm.UpdateModel(m + 1)
+            test <@ vm.Get name = returnEven m (m + 1) @>
+        }
 
-  [<Fact>]
-  let ``when model updated, event is not called before view model property is updated`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int> |> GenX.notEqualTo m1
+    [<Fact>]
+    let ``when model updated, event is not called before view model property is updated`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int> |> GenX.notEqualTo m1
 
-      let get = string<int>
+            let get = string<int>
 
-      let binding = oneWay get name
-      let vm = TestVm(m1, binding)
-      let mutable eventFired = false
+            let binding = oneWay get name
+            let vm = TestVm(m1, binding)
+            let mutable eventFired = false
 
-      (vm :> INotifyPropertyChanged).PropertyChanged.Add (fun e ->
-        test <@ e.PropertyName = name @>
-        test <@ vm.Get name = get m2 @>
-        eventFired <- true
-      )
+            (vm :> INotifyPropertyChanged)
+                .PropertyChanged.Add(fun e ->
+                    test <@ e.PropertyName = name @>
+                    test <@ vm.Get name = get m2 @>
+                    eventFired <- true)
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      test <@ eventFired @>
-  }
+            test <@ eventFired @>
+        }
 
 
 
 module OneWayLazy =
 
 
-  [<Fact>]
-  let ``when retrieved initially, should return the value returned by map`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-
-      let get = string<int>
-      let equals = (=)
-      let map = String.length
-
-      let binding = oneWayLazy get equals map name
-      let vm = TestVm(m, binding)
+    [<Fact>]
+    let ``when retrieved initially, should return the value returned by map`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
 
-      test <@ vm.Get name = (m |> get |> map) @>
-  }
+            let get = string<int>
+            let equals = (=)
+            let map = String.length
 
+            let binding = oneWayLazy get equals map name
+            let vm = TestVm(m, binding)
 
-  [<Fact>]
-  let ``when retrieved after update and equals returns false, should return the value returned by map`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            test <@ vm.Get name = (m |> get |> map) @>
+        }
 
-      let get = string<int>
-      let equals _ _ = false
-      let map = String.length
 
-      let binding = oneWayLazy get equals map name
-      let vm = TestVm(m1, binding)
-      vm.UpdateModel m2
+    [<Fact>]
+    let ``when retrieved after update and equals returns false, should return the value returned by map`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      test <@ vm.Get name = (m2 |> get |> map) @>
-  }
+            let get = string<int>
+            let equals _ _ = false
+            let map = String.length
 
+            let binding = oneWayLazy get equals map name
+            let vm = TestVm(m1, binding)
+            vm.UpdateModel m2
 
-  [<Fact>]
-  let ``when retrieved after update and equals returns true, should return the previous value returned by map`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            test <@ vm.Get name = (m2 |> get |> map) @>
+        }
 
-      let get = string<int>
-      let equals _ _ = true
-      let map = String.length
 
-      let binding = oneWayLazy get equals map name
-      let vm = TestVm(m1, binding)
-      vm.Get name |> ignore  // populate cache
-      vm.UpdateModel m2
+    [<Fact>]
+    let ``when retrieved after update and equals returns true, should return the previous value returned by map`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+
+            let get = string<int>
+            let equals _ _ = true
+            let map = String.length
+
+            let binding = oneWayLazy get equals map name
+            let vm = TestVm(m1, binding)
+            vm.Get name |> ignore // populate cache
+            vm.UpdateModel m2
 
-      test <@ vm.Get name = (m1 |> get |> map) @>
-  }
+            test <@ vm.Get name = (m1 |> get |> map) @>
+        }
 
 
-  [<Fact>]
-  let ``when retrieved, updated, and retrieved again, should call map once after the update iff equals returns false`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
-      let! eq = Gen.bool
+    [<Fact>]
+    let ``when retrieved, updated, and retrieved again, should call map once after the update iff equals returns false``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+            let! eq = Gen.bool
 
-      let get = string
-      let equals _ _ = eq
-      let map = InvokeTester String.length
+            let get = string
+            let equals _ _ = eq
+            let map = InvokeTester String.length
 
-      let binding = oneWayLazy get equals map.Fn name
-      let vm = TestVm(m1, binding)
+            let binding = oneWayLazy get equals map.Fn name
+            let vm = TestVm(m1, binding)
 
-      vm.Get name |> ignore
-      vm.UpdateModel m2
-      map.Reset ()
-      vm.Get name |> ignore
+            vm.Get name |> ignore
+            vm.UpdateModel m2
+            map.Reset()
+            vm.Get name |> ignore
 
-      test <@ map.Count = if eq then 0 else 1 @>
-  }
+            test <@ map.Count = if eq then 0 else 1 @>
+        }
 
 
-  [<Fact>]
-  let ``map should never be called during model update`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``map should never be called during model update`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string
-      let equals = (=)
-      let map = InvokeTester String.length
+            let get = string
+            let equals = (=)
+            let map = InvokeTester String.length
 
-      let binding = oneWayLazy get equals map.Fn name
-      let vm = TestVm(m1, binding)
+            let binding = oneWayLazy get equals map.Fn name
+            let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      test <@ map.Count = 0 @>
-  }
+            test <@ map.Count = 0 @>
+        }
 
 
-  [<Fact>]
-  let ``when retrieved several times between updates, map is called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``when retrieved several times between updates, map is called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string
-      let equals = (=)
-      let map = InvokeTester String.length
+            let get = string
+            let equals = (=)
+            let map = InvokeTester String.length
 
-      let binding = oneWayLazy get equals map.Fn name
-      let vm = TestVm(m1, binding)
+            let binding = oneWayLazy get equals map.Fn name
+            let vm = TestVm(m1, binding)
 
-      vm.Get name |> ignore
-      vm.Get name |> ignore
-      test <@ map.Count <= 1 @>
+            vm.Get name |> ignore
+            vm.Get name |> ignore
+            test <@ map.Count <= 1 @>
 
-      map.Reset ()
-      vm.UpdateModel m2
-      vm.Get name |> ignore
-      vm.Get name |> ignore
-      test <@ map.Count <= 1 @>
-    }
+            map.Reset()
+            vm.UpdateModel m2
+            vm.Get name |> ignore
+            vm.Get name |> ignore
+            test <@ map.Count <= 1 @>
+        }
 
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff equals is false`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
-      let! eq = Gen.bool
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff equals is false`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+            let! eq = Gen.bool
 
-      let get = string
-      let equals _ _ = eq
-      let map = String.length
+            let get = string
+            let equals _ _ = eq
+            let map = String.length
 
-      let binding = oneWayLazy get equals map name
-      let vm = TestVm(m1, binding)
-      vm.UpdateModel m2
+            let binding = oneWayLazy get equals map name
+            let vm = TestVm(m1, binding)
+            vm.UpdateModel m2
 
-      test <@ vm.NumPcTriggersFor name = if not eq then 1 else 0 @>
-  }
+            test <@ vm.NumPcTriggersFor name = if not eq then 1 else 0 @>
+        }
 
 
 
 module OneWaySeqLazy =
 
 
-  let private testObservableCollectionContainsExpectedItems (vm: DynamicViewModel<_, _>) name expected =
-    let actual = (vm.Get name : ObservableCollection<_>) |> Seq.toList
-    test <@ expected = actual @>
+    let private testObservableCollectionContainsExpectedItems (vm: DynamicViewModel<_, _>) name expected =
+        let actual = (vm.Get name: ObservableCollection<_>) |> Seq.toList
+        test <@ expected = actual @>
 
 
-  [<Fact>]
-  let ``when retrieved initially, should return an ObservableCollection with the values returned by map`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<Guid list>
+    [<Fact>]
+    let ``when retrieved initially, should return an ObservableCollection with the values returned by map`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<Guid list>
 
-      let get = id
-      let equals = (=)
-      let map = id
-      let itemEquals = (=)
-      let getId = id
+            let get = id
+            let equals = (=)
+            let map = id
+            let itemEquals = (=)
+            let getId = id
 
-      let binding = oneWaySeqLazy get equals map itemEquals getId name
-      let vm = TestVm(m, binding)
+            let binding = oneWaySeqLazy get equals map itemEquals getId name
+            let vm = TestVm(m, binding)
 
-      testObservableCollectionContainsExpectedItems vm name (m |> get |> map)
-    }
+            testObservableCollectionContainsExpectedItems vm name (m |> get |> map)
+        }
 
 
-  [<Fact>]
-  let ``given equals returns false, when retrieved after update, should return an ObservableCollection with the new values returned by map`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
+    [<Fact>]
+    let ``given equals returns false, when retrieved after update, should return an ObservableCollection with the new values returned by map``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
 
-      let get = id
-      let equals _ _ = false
-      let map = id
-      let itemEquals = (=)
-      let getId = id
+            let get = id
+            let equals _ _ = false
+            let map = id
+            let itemEquals = (=)
+            let getId = id
 
-      let binding = oneWaySeqLazy get equals map itemEquals getId name
-      let vm = TestVm(m1, binding)
+            let binding = oneWaySeqLazy get equals map itemEquals getId name
+            let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      testObservableCollectionContainsExpectedItems vm name (m2 |> get |> map)
-    }
+            testObservableCollectionContainsExpectedItems vm name (m2 |> get |> map)
+        }
 
 
-  [<Fact>]
-  let ``given equals returns true, when retrieved after update, should return an ObservableCollection with the previous values returned by map`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
+    [<Fact>]
+    let ``given equals returns true, when retrieved after update, should return an ObservableCollection with the previous values returned by map``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
 
-      let get = id
-      let equals _ _ = true
-      let map = id
-      let itemEquals = (=)
-      let getId = id
+            let get = id
+            let equals _ _ = true
+            let map = id
+            let itemEquals = (=)
+            let getId = id
 
-      let binding = oneWaySeqLazy get equals map itemEquals getId name
-      let vm = TestVm(m1, binding)
+            let binding = oneWaySeqLazy get equals map itemEquals getId name
+            let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      testObservableCollectionContainsExpectedItems vm name (m1 |> get |> map)
-    }
+            testObservableCollectionContainsExpectedItems vm name (m1 |> get |> map)
+        }
 
 
-  [<Fact>]
-  let ``during VM instantiation, get should be called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! eq = Gen.bool
+    [<Fact>]
+    let ``during VM instantiation, get should be called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! eq = Gen.bool
 
-      let get = InvokeTester id
-      let equals _ _ = eq
-      let map = id
-      let itemEquals = (=)
-      let getId = id
+            let get = InvokeTester id
+            let equals _ _ = eq
+            let map = id
+            let itemEquals = (=)
+            let getId = id
 
-      let binding = oneWaySeqLazy get.Fn equals map itemEquals getId name
-      TestVm(m1, binding) |> ignore
+            let binding = oneWaySeqLazy get.Fn equals map itemEquals getId name
+            TestVm(m1, binding) |> ignore
 
-      test <@ get.Count <= 1 @>
-    }
+            test <@ get.Count <= 1 @>
+        }
 
 
-  [<Fact>]
-  let ``during VM instantiation, map should have be called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! eq = Gen.bool
+    [<Fact>]
+    let ``during VM instantiation, map should have be called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! eq = Gen.bool
+
+            let get = id
+            let equals _ _ = eq
+            let map = InvokeTester id
+            let itemEquals = (=)
+            let getId = id
+
+            let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
+            TestVm(m1, binding) |> ignore
 
-      let get = id
-      let equals _ _ = eq
-      let map = InvokeTester id
-      let itemEquals = (=)
-      let getId = id
+            test <@ map.Count <= 1 @>
+        }
 
-      let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
-      TestVm(m1, binding) |> ignore
 
-      test <@ map.Count <= 1 @>
-    }
+    [<Fact>]
+    let ``given equals returns true, during model update, map should be called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
+
+            let get = id
+            let equals _ _ = true
+            let map = InvokeTester id
+            let itemEquals = (=)
+            let getId = id
+
+            let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
+            let vm = TestVm(m1, binding)
 
+            map.Reset()
+            vm.UpdateModel m2
 
-  [<Fact>]
-  let ``given equals returns true, during model update, map should be called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
+            test <@ map.Count = 0 @>
+        }
 
-      let get = id
-      let equals _ _ = true
-      let map = InvokeTester id
-      let itemEquals = (=)
-      let getId = id
 
-      let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
-      let vm = TestVm(m1, binding)
+    [<Fact>]
+    let ``when equals returns false, during model update, map should be called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
+
+            let get = id
+            let equals _ _ = false
+            let map = InvokeTester id
+            let itemEquals = (=)
+            let getId = id
+
+            let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
+            let vm = TestVm(m1, binding)
+
+            map.Reset()
+            vm.UpdateModel m2
 
-      map.Reset ()
-      vm.UpdateModel m2
+            test <@ map.Count <= 1 @>
+        }
 
-      test <@ map.Count = 0 @>
-    }
 
+    [<Fact>]
+    let ``during model update, get should be called at most twice`` () = // once on current model and once on new model
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
+            let! eq = Gen.bool
 
-  [<Fact>]
-  let ``when equals returns false, during model update, map should be called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
+            let get = InvokeTester id
+            let equals _ _ = eq
+            let map = id
+            let itemEquals = (=)
+            let getId = id
+
+            let binding = oneWaySeqLazy get.Fn equals map itemEquals getId name
+            let vm = TestVm(m1, binding)
 
-      let get = id
-      let equals _ _ = false
-      let map = InvokeTester id
-      let itemEquals = (=)
-      let getId = id
+            get.Reset()
+            vm.UpdateModel m2
 
-      let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
-      let vm = TestVm(m1, binding)
+            test <@ get.Count <= 2 @>
+        }
 
-      map.Reset ()
-      vm.UpdateModel m2
 
-      test <@ map.Count <= 1 @>
-    }
+    [<Fact>]
+    let ``when retrieved several times after VM initialization, map is called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+
+            let get = id
+            let equals = (=)
+            let map = InvokeTester id
+            let itemEquals = (=)
+            let getId = id
+
+            let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
+            let vm = TestVm(m1, binding)
+
+            vm.Get name |> ignore
+            vm.Get name |> ignore
 
+            test <@ map.Count <= 1 @>
+        }
 
-  [<Fact>]
-  let ``during model update, get should be called at most twice`` () = // once on current model and once on new model
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
-      let! eq = Gen.bool
 
-      let get = InvokeTester id
-      let equals _ _ = eq
-      let map = id
-      let itemEquals = (=)
-      let getId = id
+    [<Fact>]
+    let ``when retrieved several times after update, map is called at most once`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
 
-      let binding = oneWaySeqLazy get.Fn equals map itemEquals getId name
-      let vm = TestVm(m1, binding)
+            let get = id
+            let equals = (=)
+            let map = InvokeTester id
+            let itemEquals = (=)
+            let getId = id
 
-      get.Reset ()
-      vm.UpdateModel m2
+            let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
+            let vm = TestVm(m1, binding)
 
-      test <@ get.Count <= 2 @>
-    }
+            map.Reset()
+            vm.UpdateModel m2
 
+            vm.Get name |> ignore
+            vm.Get name |> ignore
 
-  [<Fact>]
-  let ``when retrieved several times after VM initialization, map is called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
+            test <@ map.Count <= 1 @>
+        }
 
-      let get = id
-      let equals = (=)
-      let map = InvokeTester id
-      let itemEquals = (=)
-      let getId = id
 
-      let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
-      let vm = TestVm(m1, binding)
+    [<Fact>]
+    let ``for any behavior of equals or itemEquals, when model is updated, should never trigger PC`` () = // because this binding should only trigger CC
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
+            let! eq = Gen.bool
+            let! itemEq = Gen.bool
 
-      vm.Get name |> ignore
-      vm.Get name |> ignore
+            let get = id
+            let equals _ _ = eq
+            let map = InvokeTester id
+            let itemEquals _ _ = itemEq
+            let getId = id
 
-      test <@ map.Count <= 1 @>
-    }
+            let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
+            let vm = TestVm(m1, binding)
 
+            vm.UpdateModel m2
 
-  [<Fact>]
-  let ``when retrieved several times after update, map is called at most once`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
+            test <@ vm.NumPcTriggersFor name = 0 @>
+        }
 
-      let get = id
-      let equals = (=)
-      let map = InvokeTester id
-      let itemEquals = (=)
-      let getId = id
 
-      let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
-      let vm = TestVm(m1, binding)
+    [<Fact>]
+    let ``given equals returns true, when model is updated, should never trigger CC`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
 
-      map.Reset ()
-      vm.UpdateModel m2
+            let get = id
+            let equals _ _ = true
+            let map = id
+            let itemEquals = (=)
+            let getId = id
 
-      vm.Get name |> ignore
-      vm.Get name |> ignore
+            let binding = oneWaySeqLazy get equals map itemEquals getId name
+            let vm = TestVm(m1, binding)
 
-      test <@ map.Count <= 1 @>
-    }
+            vm.TrackCcTriggersFor name
+            vm.UpdateModel m2
 
+            test <@ vm.NumCcTriggersFor name = 0 @>
+        }
 
-  [<Fact>]
-  let ``for any behavior of equals or itemEquals, when model is updated, should never trigger PC`` () =  // because this binding should only trigger CC
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
-      let! eq = Gen.bool
-      let! itemEq = Gen.bool
 
-      let get = id
-      let equals _ _ = eq
-      let map = InvokeTester id
-      let itemEquals _ _ = itemEq
-      let getId = id
+    [<Fact>]
+    let ``given equals returns false and itemEquals returns false, when model is updated, should contain expected items in collection``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = Gen.guid |> Gen.list (Range.constant 1 50)
+            let! m2 = Gen.guid |> Gen.list (Range.constant 1 50)
 
-      let binding = oneWaySeqLazy get equals map.Fn itemEquals getId name
-      let vm = TestVm(m1, binding)
+            let get = id
+            let equals _ _ = false
+            let map = id
+            let itemEquals _ _ = false
+            let getId = id
 
-      vm.UpdateModel m2
+            let binding = oneWaySeqLazy get equals map itemEquals getId name
+            let vm = TestVm(m1, binding)
 
-      test <@ vm.NumPcTriggersFor name = 0 @>
-    }
+            vm.UpdateModel m2
 
+            testObservableCollectionContainsExpectedItems vm name m2
+        }
 
-  [<Fact>]
-  let ``given equals returns true, when model is updated, should never trigger CC`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
 
-      let get = id
-      let equals _ _ = true
-      let map = id
-      let itemEquals = (=)
-      let getId = id
 
-      let binding = oneWaySeqLazy get equals map itemEquals getId name
-      let vm = TestVm(m1, binding)
+module TwoWay =
 
-      vm.TrackCcTriggersFor name
-      vm.UpdateModel m2
 
-      test <@ vm.NumCcTriggersFor name = 0 @>
-    }
+    [<Fact>]
+    let ``when retrieved, should always return the value returned by get`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
+            let get = string<int>
+            let set _ _ = ()
 
-  [<Fact>]
-  let ``given equals returns false and itemEquals returns false, when model is updated, should contain expected items in collection`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = Gen.guid |> Gen.list (Range.constant 1 50)
-      let! m2 = Gen.guid |> Gen.list (Range.constant 1 50)
+            let binding = twoWay get set name
+            let vm = TestVm(m1, binding)
 
-      let get = id
-      let equals _ _ = false
-      let map = id
-      let itemEquals _ _ = false
-      let getId = id
+            test <@ vm.Get name = get m1 @>
 
-      let binding = oneWaySeqLazy get equals map itemEquals getId name
-      let vm = TestVm(m1, binding)
+            vm.UpdateModel m2
 
-      vm.UpdateModel m2
+            test <@ vm.Get name = get m2 @>
+        }
 
-      testObservableCollectionContainsExpectedItems vm name m2
-    }
 
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
+            let get = string<int>
+            let set _ _ = ()
 
-module TwoWay =
+            let binding = twoWay get set name
+            let vm = TestVm(m1, binding)
 
+            vm.UpdateModel m2
+            test <@ vm.NumPcTriggersFor name = if get m1 = get m2 then 0 else 1 @>
+        }
 
-  [<Fact>]
-  let ``when retrieved, should always return the value returned by get`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
 
-      let get = string<int>
-      let set _ _ = ()
+    [<Fact>]
+    let ``when set, should call dispatch once with the value returned by set`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
+            let! p = GenX.auto<string>
 
-      let binding = twoWay get set name
-      let vm = TestVm(m1, binding)
+            let get = string
+            let set (p: string) (m: int) = string m + p
 
-      test <@ vm.Get name = get m1 @>
+            let binding = twoWay get set name
+            let vm = TestVm(m, binding)
 
-      vm.UpdateModel m2
+            vm.Set name p
 
-      test <@ vm.Get name = get m2 @>
-  }
+            test <@ vm.Dispatches = [ set p m ] @>
+        }
 
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
 
-      let get = string<int>
-      let set _ _ = ()
+module TwoWayValidate =
 
-      let binding = twoWay get set name
-      let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
-      test <@ vm.NumPcTriggersFor name = if get m1 = get m2 then 0 else 1 @>
-  }
+    [<Fact>]
+    let ``when retrieved, should always return the value returned by get`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
+            let get = string<int>
+            let set _ _ = ()
+            let validate _ = ValueNone
 
-  [<Fact>]
-  let ``when set, should call dispatch once with the value returned by set`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-      let! p = GenX.auto<string>
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
 
-      let get = string
-      let set (p: string) (m: int) = string m + p
+            test <@ vm.Get name = get m1 @>
 
-      let binding = twoWay get set name
-      let vm = TestVm(m, binding)
+            vm.UpdateModel m2
 
-      vm.Set name p
+            test <@ vm.Get name = get m2 @>
+        }
 
-      test <@ vm.Dispatches = [set p m] @>
-    }
 
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
+            let get = string<int>
+            let set _ _ = ()
+            let validate _ = ValueNone
 
-module TwoWayValidate =
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
 
+            vm.UpdateModel m2
 
-  [<Fact>]
-  let ``when retrieved, should always return the value returned by get`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            test <@ vm.NumPcTriggersFor name = if get m1 = get m2 then 0 else 1 @>
+        }
 
-      let get = string<int>
-      let set _ _ = ()
-      let validate _ = ValueNone
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
+    [<Fact>]
+    let ``when set, should call dispatch once with the value returned by set`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
+            let! p = GenX.auto<string>
 
-      test <@ vm.Get name = get m1 @>
+            let get = string
+            let set (p: string) (m: int) = string m + p
+            let validate _ = ValueNone
 
-      vm.UpdateModel m2
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m, binding)
 
-      test <@ vm.Get name = get m2 @>
-  }
+            vm.Set name p
 
+            test <@ vm.Dispatches = [ set p m ] @>
+        }
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
 
-      let get = string<int>
-      let set _ _ = ()
-      let validate _ = ValueNone
+    [<Fact>]
+    let ``when model is updated, should trigger ErrorsChanged iff the value returned by validate changes`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
+            let get _ = ()
+            let set _ _ = ()
 
-      vm.UpdateModel m2
+            let validate m =
+                if m < 0 then ValueSome(string m) else ValueNone
 
-      test <@ vm.NumPcTriggersFor name = if get m1 = get m2 then 0 else 1 @>
-  }
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
 
+            vm.UpdateModel m2
 
-  [<Fact>]
-  let ``when set, should call dispatch once with the value returned by set`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-      let! p = GenX.auto<string>
+            test <@ vm.NumEcTriggersFor name = if validate m1 = validate m2 then 0 else 1 @>
+        }
 
-      let get = string
-      let set (p: string) (m: int) = string m + p
-      let validate _ = ValueNone
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m, binding)
+    [<Fact>]
+    let ``when model is updated, should trigger NotifyPropertyChanged on HasErrors iff the value returned by validate changes``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      vm.Set name p
+            let get _ = ()
+            let set _ _ = ()
 
-      test <@ vm.Dispatches = [set p m] @>
-    }
+            let validate m =
+                if m < 0 then ValueSome(string m) else ValueNone
 
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
 
-  [<Fact>]
-  let ``when model is updated, should trigger ErrorsChanged iff the value returned by validate changes`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            vm.UpdateModel m2
 
-      let get _ = ()
-      let set _ _ = ()
-      let validate m = if m < 0 then ValueSome (string m) else ValueNone
+            test
+                <@
+                    vm.NumPcTriggersFor "HasErrors" = if
+                                                          (validate m1 |> ValueOption.isNone) = (validate m2
+                                                                                                 |> ValueOption.isNone)
+                                                      then
+                                                          0
+                                                      else
+                                                          1
+                @>
+        }
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
+    [<Fact>]
+    let ``when validate returns ValueNone, HasErrors should return false and GetErrors should return an empty collection``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      test <@ vm.NumEcTriggersFor name = if validate m1 = validate m2 then 0 else 1 @>
-    }
+            let get _ = ()
+            let set _ _ = ()
+            let validate _ = ValueNone
 
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
+            let vm' = vm :> INotifyDataErrorInfo
 
-  [<Fact>]
-  let ``when model is updated, should trigger NotifyPropertyChanged on HasErrors iff the value returned by validate changes`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            test <@ vm'.HasErrors = false @>
+            test <@ vm'.GetErrors name |> Seq.cast |> Seq.isEmpty @>
 
-      let get _ = ()
-      let set _ _ = ()
-      let validate m = if m < 0 then ValueSome (string m) else ValueNone
+            vm.UpdateModel m2
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
+            test <@ vm'.HasErrors = false @>
+            test <@ vm'.GetErrors name |> Seq.cast |> Seq.isEmpty @>
+        }
 
-      vm.UpdateModel m2
 
-      test <@ vm.NumPcTriggersFor "HasErrors" = if (validate m1 |> ValueOption.isNone) = (validate m2 |> ValueOption.isNone) then 0 else 1 @>
-    }
+    [<Fact>]
+    let ``when validate returns ValueSome, HasErrors should return true and GetErrors should return a collection with a single element equal to the inner value returned by validate``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
+            let get _ = ()
+            let set _ _ = ()
+            let validate m = ValueSome(string<int> m)
 
-  [<Fact>]
-  let ``when validate returns ValueNone, HasErrors should return false and GetErrors should return an empty collection`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
+            let vm' = vm :> INotifyDataErrorInfo
 
-      let get _ = ()
-      let set _ _ = ()
-      let validate _ = ValueNone
+            test <@ vm'.HasErrors = true @>
+            test <@ vm'.GetErrors name |> Seq.cast |> Seq.toList = [ (validate m1).Value ] @>
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
-      let vm' = vm :> INotifyDataErrorInfo
+            vm.UpdateModel m2
 
-      test <@ vm'.HasErrors = false @>
-      test <@ vm'.GetErrors name |> Seq.cast |> Seq.isEmpty @>
+            test <@ vm'.HasErrors = true @>
+            test <@ vm'.GetErrors name |> Seq.cast |> Seq.toList = [ (validate m2).Value ] @>
+        }
 
-      vm.UpdateModel m2
 
-      test <@ vm'.HasErrors = false @>
-      test <@ vm'.GetErrors name |> Seq.cast |> Seq.isEmpty @>
-    }
+    [<Fact>]
+    let ``when validate returns no ValueNone after returning ValueSome, HasErrors should return false and GetErrors should return an empty collection``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int> |> GenX.notEqualTo m1
 
+            let get _ = ()
+            let set _ _ = ()
 
-  [<Fact>]
-  let ``when validate returns ValueSome, HasErrors should return true and GetErrors should return a collection with a single element equal to the inner value returned by validate`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            let validate m =
+                if m = m1 then ValueSome(string<int> m) else ValueNone
 
-      let get _ = ()
-      let set _ _ = ()
-      let validate m = ValueSome (string<int> m)
+            let binding = twoWayValidate name get set validate
+            let vm = TestVm(m1, binding)
+            let vm' = vm :> INotifyDataErrorInfo
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
-      let vm' = vm :> INotifyDataErrorInfo
+            test <@ vm'.HasErrors = true @>
+            test <@ vm'.GetErrors name |> Seq.cast |> Seq.toList = [ (validate m1).Value ] @>
 
-      test <@ vm'.HasErrors = true @>
-      test <@ vm'.GetErrors name |> Seq.cast |> Seq.toList = [(validate m1).Value] @>
+            vm.UpdateModel m2
 
-      vm.UpdateModel m2
+            test <@ vm'.HasErrors = false @>
+            test <@ vm'.GetErrors name |> Seq.cast |> Seq.isEmpty @>
+        }
 
-      test <@ vm'.HasErrors = true @>
-      test <@ vm'.GetErrors name |> Seq.cast |> Seq.toList = [(validate m2).Value] @>
-    }
 
 
-  [<Fact>]
-  let ``when validate returns no ValueNone after returning ValueSome, HasErrors should return false and GetErrors should return an empty collection`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int> |> GenX.notEqualTo m1
+module Cmd =
 
-      let get _ = ()
-      let set _ _ = ()
-      let validate m =
-        if m = m1
-        then ValueSome (string<int> m)
-        else ValueNone
 
-      let binding = twoWayValidate name get set validate
-      let vm = TestVm(m1, binding)
-      let vm' = vm :> INotifyDataErrorInfo
+    [<Fact>]
+    let ``the retrieved command's Execute should call dispatch once with the inner value returned by exec`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
+            let! p = GenX.auto<obj> |> GenX.withNull
 
-      test <@ vm'.HasErrors = true @>
-      test <@ vm'.GetErrors name |> Seq.cast |> Seq.toList = [(validate m1).Value] @>
+            let exec m =
+                if m < 0 then ValueNone else ValueSome(string m)
 
-      vm.UpdateModel m2
+            let canExec m = m < 0
 
-      test <@ vm'.HasErrors = false @>
-      test <@ vm'.GetErrors name |> Seq.cast |> Seq.isEmpty @>
-    }
+            let binding = cmd exec canExec name
+            let vm = TestVm(m, binding)
 
+            (vm.Get name: ICommand).Execute(p)
 
+            match exec m with
+            | ValueSome msg -> test <@ vm.Dispatches = [ msg ] @>
+            | ValueNone -> test <@ vm.Dispatches = [] @>
+        }
 
-module Cmd =
 
+    [<Fact>]
+    let ``the retrieved command's CanExecute should return the value returned by canExec`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
+            let! p = GenX.auto<obj> |> GenX.withNull
 
-  [<Fact>]
-  let ``the retrieved command's Execute should call dispatch once with the inner value returned by exec`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-      let! p = GenX.auto<obj> |> GenX.withNull
+            let exec m =
+                if m < 0 then ValueNone else ValueSome(string m)
 
-      let exec m = if m < 0 then ValueNone else ValueSome (string m)
-      let canExec m = m < 0
+            let canExec m = m < 0
 
-      let binding = cmd exec canExec name
-      let vm = TestVm(m, binding)
+            let binding = cmd exec canExec name
+            let vm = TestVm(m, binding)
 
-      (vm.Get name : ICommand).Execute(p)
+            test <@ (vm.Get name: ICommand).CanExecute(p) = canExec m @>
+        }
 
-      match exec m with
-      | ValueSome msg -> test <@ vm.Dispatches = [msg] @>
-      | ValueNone -> test <@ vm.Dispatches = [] @>
-    }
 
+    [<Fact>]
+    let ``when model is updated, should trigger CanExecuteChanged iff the output of canExec changes`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-  [<Fact>]
-  let ``the retrieved command's CanExecute should return the value returned by canExec`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-      let! p = GenX.auto<obj> |> GenX.withNull
+            let exec m =
+                if m < 0 then ValueNone else ValueSome(string m)
 
-      let exec m = if m < 0 then ValueNone else ValueSome (string m)
-      let canExec m = m < 0
+            let canExec m = m < 0
 
-      let binding = cmd exec canExec name
-      let vm = TestVm(m, binding)
+            let binding = cmd exec canExec name
+            let vm = TestVm(m1, binding)
 
-      test <@ (vm.Get name : ICommand).CanExecute(p) = canExec m @>
-    }
+            vm.TrackCecTriggersFor name
+            vm.UpdateModel m2
 
+            test <@ vm.NumCecTriggersFor name = if canExec m1 = canExec m2 then 0 else 1 @>
+        }
 
-  [<Fact>]
-  let ``when model is updated, should trigger CanExecuteChanged iff the output of canExec changes`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
 
-      let exec m = if m < 0 then ValueNone else ValueSome (string m)
-      let canExec m = m < 0
+    [<Fact>]
+    let ``when model is updated, should never trigger PC`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let binding = cmd exec canExec name
-      let vm = TestVm(m1, binding)
+            let exec m =
+                if m < 0 then ValueNone else ValueSome(string m)
 
-      vm.TrackCecTriggersFor name
-      vm.UpdateModel m2
+            let canExec m = m < 0
 
-      test <@ vm.NumCecTriggersFor name = if canExec m1 = canExec m2 then 0 else 1 @>
-    }
+            let binding = cmd exec canExec name
+            let vm = TestVm(m1, binding)
 
+            vm.UpdateModel m2
 
-  [<Fact>]
-  let ``when model is updated, should never trigger PC`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            test <@ vm.NumPcTriggersFor name = 0 @>
+        }
 
-      let exec m = if m < 0 then ValueNone else ValueSome (string m)
-      let canExec m = m < 0
 
-      let binding = cmd exec canExec name
-      let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
+module CmdParam =
 
-      test <@ vm.NumPcTriggersFor name = 0 @>
-    }
 
+    [<Fact>]
+    let ``the retrieved command's Execute should call dispatch once with the inner value returned by exec`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
+            let! p = GenX.auto<string>
+            let! autoRequery = Gen.bool
 
+            let exec (p: string) m =
+                if p.Length + m < 0 then
+                    ValueNone
+                else
+                    ValueSome(string m + p)
 
-module CmdParam =
+            let canExec (p: string) m = p.Length + m < 0
 
+            let binding = cmdParam name exec canExec autoRequery
+            let vm = TestVm(m, binding)
 
-  [<Fact>]
-  let ``the retrieved command's Execute should call dispatch once with the inner value returned by exec`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-      let! p = GenX.auto<string>
-      let! autoRequery = Gen.bool
+            (vm.Get name: ICommand).Execute(p)
 
-      let exec (p: string) m = if p.Length + m < 0 then ValueNone else ValueSome (string m + p)
-      let canExec (p: string) m = p.Length + m < 0
+            match exec p m with
+            | ValueSome msg -> test <@ vm.Dispatches = [ msg ] @>
+            | ValueNone -> test <@ vm.Dispatches = [] @>
+        }
 
-      let binding = cmdParam name exec canExec autoRequery
-      let vm = TestVm(m, binding)
 
-      (vm.Get name : ICommand).Execute(p)
+    [<Fact>]
+    let ``the retrieved command's CanExecute should return the value returned by canExec`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<int>
+            let! p = GenX.auto<string>
+            let! autoRequery = Gen.bool
 
-      match exec p m with
-      | ValueSome msg -> test <@ vm.Dispatches = [msg] @>
-      | ValueNone -> test <@ vm.Dispatches = [] @>
-    }
+            let exec (p: string) m =
+                if p.Length + m < 0 then
+                    ValueNone
+                else
+                    ValueSome(string m + p)
 
+            let canExec (p: string) m = p.Length + m < 0
 
-  [<Fact>]
-  let ``the retrieved command's CanExecute should return the value returned by canExec`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<int>
-      let! p = GenX.auto<string>
-      let! autoRequery = Gen.bool
+            let binding = cmdParam name exec canExec autoRequery
+            let vm = TestVm(m, binding)
 
-      let exec (p: string) m = if p.Length + m < 0 then ValueNone else ValueSome (string m + p)
-      let canExec (p: string) m = p.Length + m < 0
+            test <@ (vm.Get name: ICommand).CanExecute(p) = canExec p m @>
+        }
 
-      let binding = cmdParam name exec canExec autoRequery
-      let vm = TestVm(m, binding)
 
-      test <@ (vm.Get name : ICommand).CanExecute(p) = canExec p m @>
-    }
+    [<Fact>]
+    let ``when model is updated, should always trigger CanExecuteChanged`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+            let! autoRequery = Gen.bool
 
+            let exec (p: string) m =
+                if p.Length + m < 0 then
+                    ValueNone
+                else
+                    ValueSome(string m + p)
 
-  [<Fact>]
-  let ``when model is updated, should always trigger CanExecuteChanged`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
-      let! autoRequery = Gen.bool
+            let canExec (p: string) m = p.Length + m < 0
 
-      let exec (p: string) m = if p.Length + m < 0 then ValueNone else ValueSome (string m + p)
-      let canExec (p: string) m = p.Length + m < 0
+            let binding = cmdParam name exec canExec autoRequery
+            let vm = TestVm(m1, binding)
 
-      let binding = cmdParam name exec canExec autoRequery
-      let vm = TestVm(m1, binding)
+            vm.TrackCecTriggersFor name
+            vm.UpdateModel m2
 
-      vm.TrackCecTriggersFor name
-      vm.UpdateModel m2
+            test <@ vm.NumCecTriggersFor name = 1 @>
+        }
 
-      test <@ vm.NumCecTriggersFor name = 1 @>
-    }
 
+    [<Fact>]
+    let ``when model is updated, should never trigger PC`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+            let! autoRequery = Gen.bool
 
-  [<Fact>]
-  let ``when model is updated, should never trigger PC`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
-      let! autoRequery = Gen.bool
+            let exec (p: string) m =
+                if p.Length + m < 0 then
+                    ValueNone
+                else
+                    ValueSome(string m + p)
 
-      let exec (p: string) m = if p.Length + m < 0 then ValueNone else ValueSome (string m + p)
-      let canExec (p: string) m = p.Length + m < 0
+            let canExec (p: string) m = p.Length + m < 0
 
-      let binding = cmdParam name exec canExec autoRequery
-      let vm = TestVm(m1, binding)
+            let binding = cmdParam name exec canExec autoRequery
+            let vm = TestVm(m1, binding)
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      test <@ vm.NumPcTriggersFor name = 0 @>
-    }
+            test <@ vm.NumPcTriggersFor name = 0 @>
+        }
 
 
 
 module SubModel =
 
 
-  [<Fact>]
-  let ``when retrieved and getModel returns ValueSome, should return a ViewModel whose CurrentModel is the inner value returned by getModel`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<byte * int>
-      let! m2 = GenX.auto<byte * int>
-      let! sticky = Gen.bool
+    [<Fact>]
+    let ``when retrieved and getModel returns ValueSome, should return a ViewModel whose CurrentModel is the inner value returned by getModel``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<byte * int>
+            let! m2 = GenX.auto<byte * int>
+            let! sticky = Gen.bool
+
+            let getModel (m: byte * int) = (snd m) / 2 |> ValueSome
+            let toMsg _ = ()
+
+            let binding = subModel name getModel toMsg [] sticky
+            let vm = TestVm(m1, binding)
+
+            test <@ (vm.Get name: IViewModel<int, obj>).CurrentModel = (getModel m1).Value @>
+
+            vm.UpdateModel m2
 
-      let getModel (m: byte * int) = (snd m) / 2 |> ValueSome
-      let toMsg _ = ()
+            test <@ (vm.Get name: IViewModel<int, obj>).CurrentModel = (getModel m2).Value @>
+        }
 
-      let binding = subModel name getModel toMsg [] sticky
-      let vm = TestVm(m1, binding)
 
-      test <@ (vm.Get name : IViewModel<int, obj>).CurrentModel = (getModel m1).Value @>
+    [<Fact>]
+    let ``when retrieved initially and getModel returns ValueNone, should return null`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<byte * int>
+            let! sticky = Gen.bool
 
-      vm.UpdateModel m2
+            let getModel _ = ValueNone
+            let toMsg _ = ()
 
-      test <@ (vm.Get name : IViewModel<int, obj>).CurrentModel = (getModel m2).Value @>
-    }
+            let binding = subModel name getModel toMsg [] sticky
+            let vm = TestVm(m, binding)
 
+            test <@ vm.Get name |> isNull @>
+        }
 
-  [<Fact>]
-  let ``when retrieved initially and getModel returns ValueNone, should return null`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<byte * int>
-      let! sticky = Gen.bool
 
-      let getModel _ = ValueNone
-      let toMsg _ = ()
+    [<Fact>]
+    let ``when retrieved after update and getModel changes between ValueSome and ValueNone, should return null if sticky is false, otherwise the last non-null value``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<byte * int>
+            let! m2 = GenX.auto<byte * int> |> GenX.notEqualTo m1
+            let! m3 = GenX.auto<byte * int> |> GenX.notEqualTo m1 |> GenX.notEqualTo m2
+            let! sticky = Gen.bool
 
-      let binding = subModel name getModel toMsg [] sticky
-      let vm = TestVm(m, binding)
+            let getModel (m: byte * int) =
+                if m = m1 then (snd m) / 2 |> ValueSome
+                elif m = m2 then ValueNone
+                elif m = m3 then (snd m) / 3 |> ValueSome
+                else failwith "Should never happen"
 
-      test <@ vm.Get name |> isNull @>
-    }
+            let toMsg _ = ()
 
+            let binding = subModel name getModel toMsg [] sticky
+            let vm = TestVm(m1, binding)
 
-  [<Fact>]
-  let ``when retrieved after update and getModel changes between ValueSome and ValueNone, should return null if sticky is false, otherwise the last non-null value`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<byte * int>
-      let! m2 = GenX.auto<byte * int> |> GenX.notEqualTo m1
-      let! m3 = GenX.auto<byte * int> |> GenX.notEqualTo m1  |> GenX.notEqualTo m2
-      let! sticky = Gen.bool
+            test <@ (vm.Get name: IViewModel<int, obj>).CurrentModel = (getModel m1).Value @>
 
-      let getModel (m: byte * int) =
-        if m = m1 then (snd m) / 2 |> ValueSome
-        elif m = m2 then ValueNone
-        elif m = m3 then (snd m) / 3 |> ValueSome
-        else failwith "Should never happen"
-      let toMsg _ = ()
+            vm.UpdateModel m2
 
-      let binding = subModel name getModel toMsg [] sticky
-      let vm = TestVm(m1, binding)
+            if sticky then
+                test <@ (vm.Get name: IViewModel<int, obj>).CurrentModel = (getModel m1).Value @>
+            else
+                test <@ vm.Get name |> isNull @>
 
-      test <@ (vm.Get name : IViewModel<int, obj>).CurrentModel = (getModel m1).Value @>
+            vm.UpdateModel m3
 
-      vm.UpdateModel m2
+            test <@ (vm.Get name: IViewModel<int, obj>).CurrentModel = (getModel m3).Value @>
+        }
 
-      if sticky then
-        test <@ (vm.Get name : IViewModel<int, obj>).CurrentModel = (getModel m1).Value @>
-      else
-        test <@ vm.Get name |> isNull @>
 
-      vm.UpdateModel m3
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff getModel changes from ValueNone to ValueSome, or from ValueSome to ValueNone when sticky is false``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<byte * int>
+            let! m2 = GenX.auto<byte * int> |> GenX.notEqualTo m1
+            let! sticky = Gen.bool
 
-      test <@ (vm.Get name : IViewModel<int, obj>).CurrentModel = (getModel m3).Value @>
-    }
+            let getModel (m: byte * int) =
+                if snd m < 0 then ValueNone else (snd m) / 2 |> ValueSome
 
+            let toMsg _ = ()
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff getModel changes from ValueNone to ValueSome, or from ValueSome to ValueNone when sticky is false`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<byte * int>
-      let! m2 = GenX.auto<byte * int> |> GenX.notEqualTo m1
-      let! sticky = Gen.bool
+            let binding = subModel name getModel toMsg [] sticky
+            let vm = TestVm(m1, binding)
 
-      let getModel (m: byte * int) = if snd m < 0 then ValueNone else (snd m) / 2 |> ValueSome
-      let toMsg _ = ()
+            vm.UpdateModel m2
 
-      let binding = subModel name getModel toMsg [] sticky
-      let vm = TestVm(m1, binding)
+            let wasSome = (getModel m1).IsSome
+            let wasNone = (getModel m1).IsNone
+            let isSome = (getModel m2).IsSome
+            let isNone = (getModel m2).IsNone
 
-      vm.UpdateModel m2
+            test
+                <@
+                    vm.NumPcTriggersFor name = if wasNone && isSome then 1
+                                               elif wasSome && isNone && not sticky then 1
+                                               else 0
+                @>
+        }
 
-      let wasSome = (getModel m1).IsSome
-      let wasNone = (getModel m1).IsNone
-      let isSome = (getModel m2).IsSome
-      let isNone = (getModel m2).IsNone
-      test <@ vm.NumPcTriggersFor name =
-                if wasNone && isSome then 1
-                elif wasSome && isNone && not sticky then 1
-                else 0 @>
-    }
 
+    [<Fact>]
+    let ``smoke test: when a sub-model OneWay binding is retrieved, returns the value returned by get`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! subName = GenX.auto<string>
+            let! m = GenX.auto<byte * int>
+            let! sticky = Gen.bool
 
-  [<Fact>]
-  let ``smoke test: when a sub-model OneWay binding is retrieved, returns the value returned by get`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! subName = GenX.auto<string>
-      let! m = GenX.auto<byte * int>
-      let! sticky = Gen.bool
+            let getModel = snd >> ValueSome
+            let toMsg _ = ()
+            let subGet = string<int>
 
-      let getModel = snd >> ValueSome
-      let toMsg _ = ()
-      let subGet = string<int>
+            let subBinding = oneWay subGet subName
+            let binding = subModel name getModel toMsg [ subBinding ] sticky
+            let vm = TestVm(m, binding)
 
-      let subBinding = oneWay subGet subName
-      let binding = subModel name getModel toMsg [subBinding] sticky
-      let vm = TestVm(m, binding)
+            test <@ (vm.Get name: DynamicViewModel<int, obj>).Get subName = ((getModel m).Value |> subGet) @>
+        }
 
-      test <@ (vm.Get name : DynamicViewModel<int, obj>).Get subName = ((getModel m).Value |> subGet) @>
-    }
 
+    [<Fact>]
+    let ``smoke test: when a sub-model TwoWay binding is set, dispatches the value returned by set transformed by toMsg``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! subName = GenX.auto<string>
+            let! m = GenX.auto<byte * int>
+            let! p = GenX.auto<string>
+            let! sticky = Gen.bool
 
-  [<Fact>]
-  let ``smoke test: when a sub-model TwoWay binding is set, dispatches the value returned by set transformed by toMsg`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! subName = GenX.auto<string>
-      let! m = GenX.auto<byte * int>
-      let! p = GenX.auto<string>
-      let! sticky = Gen.bool
+            let getModel: byte * int -> int voption = snd >> ValueSome
+            let toMsg = String.length
+            let subGet: int -> string = string
+            let subSet (p: string) (m: int) = p + string m
 
-      let getModel : byte * int -> int voption = snd >> ValueSome
-      let toMsg = String.length
-      let subGet : int -> string = string
-      let subSet (p: string) (m: int) = p + string m
+            let subBinding = twoWay subGet subSet subName
+            let binding = subModel name getModel toMsg [ subBinding ] sticky
+            let vm = TestVm(m, binding)
 
-      let subBinding = twoWay subGet subSet subName
-      let binding = subModel name getModel toMsg [subBinding] sticky
-      let vm = TestVm(m, binding)
+            (vm.Get name: DynamicViewModel<int, string>).Set subName p
 
-      (vm.Get name : DynamicViewModel<int, string>).Set subName p
-
-      test <@ vm.Dispatches = [subSet p (getModel m).Value |> toMsg] @>
-    }
+            test <@ vm.Dispatches = [ subSet p (getModel m).Value |> toMsg ] @>
+        }
 
 
-  [<Fact>]
-  let ``setMsgWithModel given current model after new submodel created`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! subName = GenX.auto<string>
-      let! initialModel = GenX.auto<int>
-      let! newModel = GenX.auto<int> |> GenX.notEqualTo initialModel
+    [<Fact>]
+    let ``setMsgWithModel given current model after new submodel created`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! subName = GenX.auto<string>
+            let! initialModel = GenX.auto<int>
+            let! newModel = GenX.auto<int> |> GenX.notEqualTo initialModel
 
-      let subBinding = cmd ValueSome (fun _ -> true) subName
-      let binding =
-        Binding.SubModel.opt (fun () -> [subBinding]) name
-        |> Binding.mapModel (fun m -> if m <> initialModel then Some m else None)
-        |> Binding.setMsgWithModel id
-      let vm = TestVm(initialModel, binding)
+            let subBinding = cmd ValueSome (fun _ -> true) subName
 
-      vm.UpdateModel newModel
-      let subVm = vm.Get name : DynamicViewModel<int, int>
-      let command = subVm.Get subName : ICommand
-      command.Execute(true)
+            let binding =
+                Binding.SubModel.opt (fun () -> [ subBinding ]) name
+                |> Binding.mapModel (fun m -> if m <> initialModel then Some m else None)
+                |> Binding.setMsgWithModel id
 
-      test <@ vm.Dispatches = [newModel] @>
-    }
+            let vm = TestVm(initialModel, binding)
+
+            vm.UpdateModel newModel
+            let subVm = vm.Get name: DynamicViewModel<int, int>
+            let command = subVm.Get subName: ICommand
+            command.Execute(true)
+
+            test <@ vm.Dispatches = [ newModel ] @>
+        }
 
 
 module SubModelSeq =
 
-  let private testObservableCollectionContainsExpectedItems (vm: DynamicViewModel<Guid list, (Guid * obj)>) name expected =
-    let actual =
-      vm.Get name
-      |> unbox<ObservableCollection<DynamicViewModel<Guid, obj>>>
-      |> Seq.map IViewModel.currentModel
-      |> Seq.toList
-    test <@ expected = actual @>
+    let private testObservableCollectionContainsExpectedItems
+        (vm: DynamicViewModel<Guid list, (Guid * obj)>)
+        name
+        expected
+        =
+        let actual =
+            vm.Get name
+            |> unbox<ObservableCollection<DynamicViewModel<Guid, obj>>>
+            |> Seq.map IViewModel.currentModel
+            |> Seq.toList
+
+        test <@ expected = actual @>
+
+    [<Fact>]
+    let ``when retrieved, should return an ObservableCollection with ViewModels whose CurrentModel is the corresponding value returned by getModels``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<Guid list>
+
+            let getModels = id
+            let getId = id
+            let toMsg = id
+
+            let binding = subModelSeq name getModels getId toMsg []
+            let vm = TestVm(m, binding)
+
+            testObservableCollectionContainsExpectedItems vm name m
+        }
+
+
+    [<Fact>]
+    let ``when model is updated, should never trigger PC`` () = // because this binding should only trigger CC
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m1 = GenX.auto<Guid list>
+            let! m2 = GenX.auto<Guid list>
 
-  [<Fact>]
-  let ``when retrieved, should return an ObservableCollection with ViewModels whose CurrentModel is the corresponding value returned by getModels`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<Guid list>
+            let getModels = id
+            let getId = id
+            let toMsg = id
 
-      let getModels = id
-      let getId = id
-      let toMsg = id
+            let binding = subModelSeq name getModels getId toMsg []
+            let vm = TestVm(m1, binding)
 
-      let binding = subModelSeq name getModels getId toMsg []
-      let vm = TestVm(m, binding)
+            vm.UpdateModel m2
 
-      testObservableCollectionContainsExpectedItems vm name m
-    }
+            test <@ vm.NumPcTriggersFor name = 0 @>
+        }
 
 
-  [<Fact>]
-  let ``when model is updated, should never trigger PC`` () =  // because this binding should only trigger CC
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m1 = GenX.auto<Guid list>
-      let! m2 = GenX.auto<Guid list>
+    [<Fact>]
+    let ``given elements are the same, when model is updated, should not trigger CC`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! m = GenX.auto<Guid list>
 
-      let getModels = id
-      let getId = id
-      let toMsg = id
+            let getModels = id
+            let getId = id
+            let toMsg = id
 
-      let binding = subModelSeq name getModels getId toMsg []
-      let vm = TestVm(m1, binding)
+            let binding = subModelSeq name getModels getId toMsg []
+            let vm = TestVm(m, binding)
 
-      vm.UpdateModel m2
+            vm.TrackCcTriggersFor name
 
-      test <@ vm.NumPcTriggersFor name = 0 @>
-    }
+            vm.UpdateModel m
 
+            test <@ vm.NumCcTriggersFor name = 0 @>
+        }
 
-  [<Fact>]
-  let ``given elements are the same, when model is updated, should not trigger CC`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! m = GenX.auto<Guid list>
 
-      let getModels = id
-      let getId = id
-      let toMsg = id
+    [<Fact>]
+    let ``smoke test: when a sub-model OneWay binding is retrieved, returns the value returned by get`` () =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! subName = GenX.auto<string>
+            let! m = GenX.auto<Guid list>
 
-      let binding = subModelSeq name getModels getId toMsg []
-      let vm = TestVm(m, binding)
+            let getModels = id
+            let getId = id
+            let toMsg = id
+            let subGet = string
 
-      vm.TrackCcTriggersFor name
+            let subBinding = oneWay subGet subName
+            let binding = subModelSeq name getModels getId toMsg [ subBinding ]
+            let vm = TestVm(m, binding)
 
-      vm.UpdateModel m
+            let actual =
+                vm.Get name
+                |> unbox<ObservableCollection<DynamicViewModel<Guid, obj>>>
+                |> Seq.map (fun vm -> vm.Get subName |> unbox<string>)
+                |> Seq.toList
 
-      test <@ vm.NumCcTriggersFor name = 0 @>
-    }
+            let expected = getModels m |> Seq.map subGet |> Seq.toList
+            test <@ expected = actual @>
+        }
 
 
-  [<Fact>]
-  let ``smoke test: when a sub-model OneWay binding is retrieved, returns the value returned by get`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! subName = GenX.auto<string>
-      let! m = GenX.auto<Guid list>
+    [<Fact>]
+    let ``smoke test: when a sub-model TwoWay binding is set, dispatches the value returned by set transformed by toMsg``
+        ()
+        =
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! subName = GenX.auto<string>
+            let! m = GenX.auto<Guid list>
+            let! p = GenX.auto<string>
 
-      let getModels = id
-      let getId = id
-      let toMsg = id
-      let subGet = string
+            let getModels = id
+            let getId = string
+            let toMsg (id: string, subMsg: string) = (id + subMsg).Length
+            let subGet = string
+            let subSet (p: string) (m: Guid) = p + string m
 
-      let subBinding = oneWay subGet subName
-      let binding = subModelSeq name getModels getId toMsg [subBinding]
-      let vm = TestVm(m, binding)
+            let subBinding = twoWay subGet subSet subName
+            let binding = subModelSeq name getModels getId toMsg [ subBinding ]
+            let vm = TestVm(m, binding)
 
-      let actual =
-        vm.Get name
-        |> unbox<ObservableCollection<DynamicViewModel<Guid, obj>>>
-        |> Seq.map (fun vm -> vm.Get subName |> unbox<string>)
-        |> Seq.toList
+            vm.Get name
+            |> unbox<ObservableCollection<DynamicViewModel<Guid, string>>>
+            |> Seq.iter (fun vm -> vm.Set subName p)
 
-      let expected = getModels m |> Seq.map subGet |> Seq.toList
-      test <@ expected = actual @>
-    }
+            let expected = m |> getModels |> List.map (fun m -> (getId m, subSet p m) |> toMsg)
+            test <@ expected = vm.Dispatches @>
+        }
 
 
-  [<Fact>]
-  let ``smoke test: when a sub-model TwoWay binding is set, dispatches the value returned by set transformed by toMsg`` () =
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! subName = GenX.auto<string>
-      let! m = GenX.auto<Guid list>
-      let! p = GenX.auto<string>
 
-      let getModels = id
-      let getId = string
-      let toMsg (id: string, subMsg: string) = (id + subMsg).Length
-      let subGet = string
-      let subSet (p: string) (m: Guid) = p + string m
+module SubModelSelectedItem =
 
-      let subBinding = twoWay subGet subSet subName
-      let binding = subModelSeq name getModels getId toMsg [subBinding]
-      let vm = TestVm(m, binding)
 
-      vm.Get name
-      |> unbox<ObservableCollection<DynamicViewModel<Guid, string>>>
-      |> Seq.iter (fun vm -> vm.Set subName p)
+    [<Fact>]
+    let ``Should return the VM corresponding to the ID that has been set`` () =
+        Property.check
+        <| property {
+            let! subModelSeqName = GenX.auto<string>
+            let! selectedItemName = GenX.auto<string> |> GenX.notEqualTo subModelSeqName
+            let! m = GenX.auto<int * Guid list>
 
-      let expected = m |> getModels |> List.map (fun m -> (getId m, subSet p m) |> toMsg)
-      test <@ expected = vm.Dispatches @>
-    }
+            let! selectedSubModel =
+                match snd m with
+                | [] -> Gen.constant ValueNone
+                | xs -> Gen.item xs |> Gen.map ValueSome
 
+            let getModels: int * Guid list -> Guid list = snd
+            let getId: Guid -> string = string
+            let toMsg = snd
 
+            let get _ =
+                selectedSubModel |> ValueOption.map getId
 
-module SubModelSelectedItem =
+            let set _ _ = ()
 
+            let subModelSeqBinding = subModelSeq subModelSeqName getModels getId toMsg []
+
+            let selectedItemBinding =
+                subModelSelectedItem selectedItemName subModelSeqName get set
+
+            let vm = TestVm(m, [ subModelSeqBinding; selectedItemBinding ])
+
+            match selectedSubModel with
+            | ValueNone -> test <@ vm.Get selectedItemName = null @>
+            | ValueSome sm ->
+                test
+                    <@
+                        (vm.Get selectedItemName |> unbox<IViewModel<Guid, unit>>)
+                        |> Option.ofObj
+                        |> Option.map (fun vm -> vm.CurrentModel) = (m
+                                                                     |> getModels
+                                                                     |> List.tryFind (fun x -> getId x = getId sm))
+                    @>
+        }
 
-  [<Fact>]
-  let ``Should return the VM corresponding to the ID that has been set`` () =
-    Property.check <| property {
-      let! subModelSeqName = GenX.auto<string>
-      let! selectedItemName = GenX.auto<string> |> GenX.notEqualTo subModelSeqName
-      let! m = GenX.auto<int * Guid list>
-      let! selectedSubModel =
-        match snd m with
-        | [] -> Gen.constant ValueNone
-        | xs -> Gen.item xs |> Gen.map ValueSome
-
-      let getModels : int * Guid list -> Guid list = snd
-      let getId : Guid -> string = string
-      let toMsg = snd
-
-      let get _ = selectedSubModel |> ValueOption.map getId
-      let set _ _ = ()
-
-      let subModelSeqBinding = subModelSeq subModelSeqName getModels getId toMsg []
-      let selectedItemBinding = subModelSelectedItem selectedItemName subModelSeqName get set
-
-      let vm = TestVm(m, [subModelSeqBinding; selectedItemBinding])
-
-      match selectedSubModel with
-      | ValueNone ->
-          test <@ vm.Get selectedItemName = null @>
-      | ValueSome sm ->
-          test <@ (vm.Get selectedItemName |> unbox<IViewModel<Guid, unit>>) |> Option.ofObj |> Option.map (fun vm -> vm.CurrentModel)
-                   = (m |> getModels |> List.tryFind (fun x -> getId x = getId sm))
-               @>
-    }
-
-
-  [<Fact>]
-  let ``when set, should dispatch the message returned by set`` () =
-    Property.check <| property {
-      let! subModelSeqName = GenX.auto<string>
-      let! selectedItemName = GenX.auto<string> |> GenX.notEqualTo subModelSeqName
-      let! m = GenX.auto<int * Guid list>
-      let! selectedSubModel =
-        match snd m with
-        | [] -> Gen.constant ValueNone
-        | xs -> Gen.item xs |> Gen.map ValueSome
-
-      let getModels : int * Guid list -> Guid list = snd
-      let getId : Guid -> string = string
-      let toMsg = snd
-
-      let get _ = selectedSubModel |> ValueOption.map getId
-      let set (p: string voption) (m: int * Guid list) =
-        p |> ValueOption.map (String.length >> (+) (fst m))
-
-      let subModelSeqBinding = subModelSeq subModelSeqName getModels getId toMsg []
-      let selectedItemBinding = subModelSelectedItem selectedItemName subModelSeqName get set
-
-      let vm = TestVm(m, [subModelSeqBinding; selectedItemBinding])
-
-      let selectedVm =
-        selectedSubModel |> ValueOption.bind (fun sm ->
-          vm.Get subModelSeqName
-          |> unbox<ObservableCollection<DynamicViewModel<Guid, int voption>>>
-          |> Seq.tryFind (fun vm -> vm |> IViewModel.currentModel |> getId = getId sm)
-          |> ValueOption.ofOption
-        )
-        |> ValueOption.toObj
-
-      vm.Set selectedItemName selectedVm
-
-      test <@ vm.Dispatches = [ set (selectedSubModel |> ValueOption.map getId) m ] @>
-    }
-
-  [<Fact>]
-  let ``attempting to select a nonexistent item throws RuntimeBinderException`` () =
-    let selectedItemName = "Foo"
-    let subModelSeqName = "Bar"
-    let bindings =
-      [ selectedItemName |> Binding.subModelSelectedItem (subModelSeqName, Some, ignore)
-        subModelSeqName |> Binding.subModelSeq ((fun _ -> []), ignore, (fun () -> [])) ]
-    let mutable error : string option = None
-    let loggingArgs =
-      { LoggingViewModelArgs.none
-        with
-          log =
-            { new Microsoft.Extensions.Logging.ILogger
-              with
-                member _.BeginScope _ = { new IDisposable with member _.Dispose() = () }
-                member _.IsEnabled _ = true
-                member _.Log (_, _, state, ex, formatter) = error <- formatter.Invoke(state, ex) |> Some } }
-    let viewModelArgs = ViewModelArgs.create 0.0 ignore "main" loggingArgs
-    let vm = DynamicViewModel(viewModelArgs, bindings)
-
-    raises<Microsoft.CSharp.RuntimeBinder.RuntimeBinderException> <@ vm.Get selectedItemName @>
-    test <@ error.Value.Contains "TryGetMember FAILED: Failed to find an element" @>
+
+    [<Fact>]
+    let ``when set, should dispatch the message returned by set`` () =
+        Property.check
+        <| property {
+            let! subModelSeqName = GenX.auto<string>
+            let! selectedItemName = GenX.auto<string> |> GenX.notEqualTo subModelSeqName
+            let! m = GenX.auto<int * Guid list>
+
+            let! selectedSubModel =
+                match snd m with
+                | [] -> Gen.constant ValueNone
+                | xs -> Gen.item xs |> Gen.map ValueSome
+
+            let getModels: int * Guid list -> Guid list = snd
+            let getId: Guid -> string = string
+            let toMsg = snd
+
+            let get _ =
+                selectedSubModel |> ValueOption.map getId
+
+            let set (p: string voption) (m: int * Guid list) =
+                p |> ValueOption.map (String.length >> (+) (fst m))
+
+            let subModelSeqBinding = subModelSeq subModelSeqName getModels getId toMsg []
+
+            let selectedItemBinding =
+                subModelSelectedItem selectedItemName subModelSeqName get set
+
+            let vm = TestVm(m, [ subModelSeqBinding; selectedItemBinding ])
+
+            let selectedVm =
+                selectedSubModel
+                |> ValueOption.bind (fun sm ->
+                    vm.Get subModelSeqName
+                    |> unbox<ObservableCollection<DynamicViewModel<Guid, int voption>>>
+                    |> Seq.tryFind (fun vm -> vm |> IViewModel.currentModel |> getId = getId sm)
+                    |> ValueOption.ofOption)
+                |> ValueOption.toObj
+
+            vm.Set selectedItemName selectedVm
+
+            test <@ vm.Dispatches = [ set (selectedSubModel |> ValueOption.map getId) m ] @>
+        }
+
+    [<Fact>]
+    let ``attempting to select a nonexistent item throws RuntimeBinderException`` () =
+        let selectedItemName = "Foo"
+        let subModelSeqName = "Bar"
+
+        let bindings =
+            [ selectedItemName |> Binding.subModelSelectedItem (subModelSeqName, Some, ignore)
+              subModelSeqName |> Binding.subModelSeq ((fun _ -> []), ignore, (fun () -> [])) ]
+
+        let mutable error: string option = None
+
+        let loggingArgs =
+            { LoggingViewModelArgs.none with
+                log =
+                    { new Microsoft.Extensions.Logging.ILogger with
+                        member _.BeginScope _ =
+                            { new IDisposable with
+                                member _.Dispose() = () }
+
+                        member _.IsEnabled _ = true
+
+                        member _.Log(_, _, state, ex, formatter) =
+                            error <- formatter.Invoke(state, ex) |> Some } }
+
+        let viewModelArgs = ViewModelArgs.create 0.0 ignore "main" loggingArgs
+        let vm = DynamicViewModel(viewModelArgs, bindings)
+
+        raises<Microsoft.CSharp.RuntimeBinder.RuntimeBinderException> <@ vm.Get selectedItemName @>
+        test <@ error.Value.Contains "TryGetMember FAILED: Failed to find an element" @>
 
 
 
 module CacheEffect =
 
-  [<Fact>]
-  let ``model mapping called exactly once when Get called twice`` () =
+    [<Fact>]
+    let ``model mapping called exactly once when Get called twice`` () =
 
-    Property.check <| property {
-      let! name = GenX.auto<string>
-      let! model = GenX.auto<int>
-      let! bindingComponsitionOrder = Gen.bool
+        Property.check
+        <| property {
+            let! name = GenX.auto<string>
+            let! model = GenX.auto<int>
+            let! bindingComponsitionOrder = Gen.bool
 
-      let mapping = InvokeTester id
-      let cachingAndMapping =
-        if bindingComponsitionOrder
-        then Binding.mapModel mapping.Fn >> Binding.addCaching
-        else Binding.addCaching >> Binding.mapModel mapping.Fn
-      let binding =
-        name
-        |> Binding.OneWay.id
-        |> cachingAndMapping
-      let vm = TestVm(model, binding)
+            let mapping = InvokeTester id
+
+            let cachingAndMapping =
+                if bindingComponsitionOrder then
+                    Binding.mapModel mapping.Fn >> Binding.addCaching
+                else
+                    Binding.addCaching >> Binding.mapModel mapping.Fn
+
+            let binding = name |> Binding.OneWay.id |> cachingAndMapping
+            let vm = TestVm(model, binding)
+
+            vm.Get name |> ignore // populate cache
+            vm.Get name |> ignore
+
+            test <@ 1 = mapping.Count @>
+        }
 
-      vm.Get name |> ignore // populate cache
-      vm.Get name |> ignore
 
-      test <@ 1 = mapping.Count @>
-    }
+    [<Fact>]
+    let ``second Get returns new model after first Get and then Update`` () =
+        let name = ""
+        let model = 0
+        let newModel = 1
+        let binding = name |> Binding.OneWay.id |> Binding.addCaching
+        let vm = TestVm(model, binding)
 
+        vm.Get name |> ignore // populate cache
+        vm.UpdateModel newModel // clear cache
+        let actual = vm.Get name |> unbox
 
-  [<Fact>]
-  let ``second Get returns new model after first Get and then Update`` () =
-    let name = ""
-    let model = 0
-    let newModel = 1
-    let binding =
-      name
-      |> Binding.OneWay.id
-      |> Binding.addCaching
-    let vm = TestVm(model, binding)
+        test <@ newModel = actual @>
 
-    vm.Get name |> ignore   // populate cache
-    vm.UpdateModel newModel // clear cache
-    let actual = vm.Get name |> unbox
 
-    test <@ newModel = actual @>
+    [<Fact>]
+    let ``cache not cleared on Set`` () =
+        let name = ""
+        let initialModel = 0
+        let newModel = 1
+        let mapping = InvokeTester(fun x -> x)
 
+        let binding =
+            name |> Binding.TwoWay.id |> Binding.mapModel mapping.Fn |> Binding.addCaching
 
-  [<Fact>]
-  let ``cache not cleared on Set`` () =
-    let name = ""
-    let initialModel = 0
-    let newModel = 1
-    let mapping = InvokeTester (fun x -> x)
-    let binding =
-      name
-      |> Binding.TwoWay.id
-      |> Binding.mapModel mapping.Fn
-      |> Binding.addCaching
-    let vm = TestVm(initialModel, binding)
+        let vm = TestVm(initialModel, binding)
 
-    vm.Get name |> ignore // populate cache
-    vm.Set name newModel
-    mapping.Reset()       // Set calls mapping function, so reset count
-    let actual = vm.Get name |> unbox
+        vm.Get name |> ignore // populate cache
+        vm.Set name newModel
+        mapping.Reset() // Set calls mapping function, so reset count
+        let actual = vm.Get name |> unbox
 
-    test <@ initialModel = actual @>
-    test <@ 0 = mapping.Count @>
+        test <@ initialModel = actual @>
+        test <@ 0 = mapping.Count @>
 
 
 
 module LazyEffect =
 
-  [<Fact>]
-  let ``model mapping called exactly once on initialize`` () =
-    let name = ""
-    let model = 0
-    let mapping = InvokeTester id
-    let binding =
-      name
-      |> Binding.TwoWay.id<int>
-      |> Binding.addLazy (=)
-      |> Binding.addLazy (=)
-      |> Binding.mapModel mapping.Fn
+    [<Fact>]
+    let ``model mapping called exactly once on initialize`` () =
+        let name = ""
+        let model = 0
+        let mapping = InvokeTester id
 
-    TestVm(model, binding) |> ignore
+        let binding =
+            name
+            |> Binding.TwoWay.id<int>
+            |> Binding.addLazy (=)
+            |> Binding.addLazy (=)
+            |> Binding.mapModel mapping.Fn
 
-    test <@ 1 = mapping.Count @>
+        TestVm(model, binding) |> ignore
 
+        test <@ 1 = mapping.Count @>
 
-  [<Fact>]
-  let ``model mapping called exactly twice on update when new model is equal`` () =
-    let name = ""
-    let model = 0
-    let mapping = InvokeTester id
-    let binding =
-      name
-      |> Binding.TwoWay.id<int>
-      |> Binding.addLazy (=)
-      |> Binding.addLazy (=)
-      |> Binding.mapModel mapping.Fn
-    let vm = TestVm(model, binding)
-    mapping.Reset ()
 
-    vm.UpdateModel model
+    [<Fact>]
+    let ``model mapping called exactly twice on update when new model is equal`` () =
+        let name = ""
+        let model = 0
+        let mapping = InvokeTester id
 
-    test <@ 2 = mapping.Count @>
+        let binding =
+            name
+            |> Binding.TwoWay.id<int>
+            |> Binding.addLazy (=)
+            |> Binding.addLazy (=)
+            |> Binding.mapModel mapping.Fn
 
+        let vm = TestVm(model, binding)
+        mapping.Reset()
 
-  [<Fact>]
-  let ``model mapping called exactly twice on update when new model is unequal`` () =
-    let name = ""
-    let initialModel = 0
-    let newModel = 1
-    let mapping = InvokeTester id
-    let binding =
-      name
-      |> Binding.TwoWay.id<int>
-      |> Binding.addLazy (=)
-      |> Binding.addLazy (=)
-      |> Binding.mapModel mapping.Fn
-    let vm = TestVm(initialModel, binding)
-    mapping.Reset ()
+        vm.UpdateModel model
 
-    vm.UpdateModel newModel
+        test <@ 2 = mapping.Count @>
 
-    test <@ 2 = mapping.Count @>
+
+    [<Fact>]
+    let ``model mapping called exactly twice on update when new model is unequal`` () =
+        let name = ""
+        let initialModel = 0
+        let newModel = 1
+        let mapping = InvokeTester id
+
+        let binding =
+            name
+            |> Binding.TwoWay.id<int>
+            |> Binding.addLazy (=)
+            |> Binding.addLazy (=)
+            |> Binding.mapModel mapping.Fn
+
+        let vm = TestVm(initialModel, binding)
+        mapping.Reset()
+
+        vm.UpdateModel newModel
+
+        test <@ 2 = mapping.Count @>
 
 
 
 module AlterMsgStream =
 
-  [<Fact>]
-  let ``message stream alteration only invoked once when set called twice`` () =
-    let name = ""
-    let model = 0
-    let get = ignore
-    let set _ _ = ()
-    let alteration = InvokeTester id
-    let binding =
-      twoWay get set name
-      |> Binding.alterMsgStream alteration.Fn
-    let vm = TestVm(model, binding)
-
-    vm.Set name ()
-    vm.Set name ()
-
-    test <@ 1 = alteration.Count @>
+    [<Fact>]
+    let ``message stream alteration only invoked once when set called twice`` () =
+        let name = ""
+        let model = 0
+        let get = ignore
+        let set _ _ = ()
+        let alteration = InvokeTester id
+        let binding = twoWay get set name |> Binding.alterMsgStream alteration.Fn
+        let vm = TestVm(model, binding)
+
+        vm.Set name ()
+        vm.Set name ()
+
+        test <@ 1 = alteration.Count @>
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/MergeTests.fs b/src/Elmish.WPF.Tests/MergeTests.fs
index 3ab11048..839eeb03 100644
--- a/src/Elmish.WPF.Tests/MergeTests.fs
+++ b/src/Elmish.WPF.Tests/MergeTests.fs
@@ -18,267 +18,352 @@ let internal merge x = x |> Merge.keyed
 
 
 let private trackCC (observableCollection: ObservableCollection<_>) =
-  let collection = Collection<_> ()
-  observableCollection.CollectionChanged.Add collection.Add
-  collection
+    let collection = Collection<_>()
+    observableCollection.CollectionChanged.Add collection.Add
+    collection
 
 let private testObservableCollectionContainsDataInArray observableCollection array =
-  let actual = observableCollection |> Seq.toList
-  let expected = array |> Array.toList
-  test <@ expected = actual @>
+    let actual = observableCollection |> Seq.toList
+    let expected = array |> Array.toList
+    test <@ expected = actual @>
 
 
 [<Fact>]
-let ``starting from empty, when items merged, should contain those items and call create exactly once for each item and never call update`` () =
-  Property.check <| property {
-    let! array = GenX.auto<Guid array>
-
-    let observableCollection = ObservableCollection<_> ()
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array
-
-    testObservableCollectionContainsDataInArray observableCollection array
-    test <@ createTracker.Count = array.Length @>
-    test <@ updateTracker.Count = 0 @>
-  }
+let ``starting from empty, when items merged, should contain those items and call create exactly once for each item and never call update``
+    ()
+    =
+    Property.check
+    <| property {
+        let! array = GenX.auto<Guid array>
+
+        let observableCollection = ObservableCollection<_>()
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array
+
+        testObservableCollectionContainsDataInArray observableCollection array
+        test <@ createTracker.Count = array.Length @>
+        test <@ updateTracker.Count = 0 @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging the same items, should still contain those items and never call create and call update exactly once for each item and trigger no CC event`` () =
-  Property.check <| property {
-    let! array = GenX.auto<Guid array>
-
-    let observableCollection = ObservableCollection<_> array
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-    let ccEvents = trackCC observableCollection
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array
-
-    testObservableCollectionContainsDataInArray observableCollection array
-    test <@ createTracker.Count = 0 @>
-    test <@ updateTracker.Count = array.Length @>
-    test <@ ccEvents.Count = 0 @>
-  }
+let ``starting with random items, when merging the same items, should still contain those items and never call create and call update exactly once for each item and trigger no CC event``
+    ()
+    =
+    Property.check
+    <| property {
+        let! array = GenX.auto<Guid array>
+
+        let observableCollection = ObservableCollection<_> array
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+        let ccEvents = trackCC observableCollection
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array
+
+        testObservableCollectionContainsDataInArray observableCollection array
+        test <@ createTracker.Count = 0 @>
+        test <@ updateTracker.Count = array.Length @>
+        test <@ ccEvents.Count = 0 @>
+    }
 
 
 [<Fact>]
 let ``starting with random items, when merging random items, should contain the random items`` () =
-  Property.check <| property {
-    let! array1 = GenX.auto<Guid array>
-    let! array2 = GenX.auto<Guid array>
+    Property.check
+    <| property {
+        let! array1 = GenX.auto<Guid array>
+        let! array2 = GenX.auto<Guid array>
 
-    let observableCollection = ObservableCollection<_> array1
+        let observableCollection = ObservableCollection<_> array1
 
-    merge getIdAsId getIdAsId createAsId updateNoOp (observableCollection |> CollectionTarget.create) array2
+        merge getIdAsId getIdAsId createAsId updateNoOp (observableCollection |> CollectionTarget.create) array2
 
-    testObservableCollectionContainsDataInArray observableCollection array2
-  }
+        testObservableCollectionContainsDataInArray observableCollection array2
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after an addition, should contain the merged items and call create exactly once and call update exactly once for each original item`` () =
-  Property.check <| property {
-    let! list1 = GenX.auto<Guid list>
-    let! addedItem = Gen.guid
-    let! list2 = list1 |> Gen.constant |> GenX.addElement addedItem
-
-    let observableCollection = ObservableCollection<_> list1
-    let array2 = list2 |> List.toArray
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 1 @>
-    test <@ updateTracker.Count = array2.Length - 1 @>
-  }
+let ``starting with random items, when merging after an addition, should contain the merged items and call create exactly once and call update exactly once for each original item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list1 = GenX.auto<Guid list>
+        let! addedItem = Gen.guid
+        let! list2 = list1 |> Gen.constant |> GenX.addElement addedItem
+
+        let observableCollection = ObservableCollection<_> list1
+        let array2 = list2 |> List.toArray
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 1 @>
+        test <@ updateTracker.Count = array2.Length - 1 @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after a removal, should contain the merged items and never call create and call update exactly once for each remaining item`` () =
-  Property.check <| property {
-    let! list2 = GenX.auto<Guid list>
-    let! removedItem = Gen.guid
-    let! list1 = list2 |> Gen.constant |> GenX.addElement removedItem
-
-    let observableCollection = ObservableCollection<_> list1
-    let array2 = list2 |> List.toArray
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 0 @>
-    test <@ updateTracker.Count = array2.Length @>
-  }
+let ``starting with random items, when merging after a removal, should contain the merged items and never call create and call update exactly once for each remaining item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list2 = GenX.auto<Guid list>
+        let! removedItem = Gen.guid
+        let! list1 = list2 |> Gen.constant |> GenX.addElement removedItem
+
+        let observableCollection = ObservableCollection<_> list1
+        let array2 = list2 |> List.toArray
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 0 @>
+        test <@ updateTracker.Count = array2.Length @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after a move, should contain the merged items and never call create and call update exactly once for each item`` () =
-  Property.check <| property {
-    let! list = GenX.auto<Guid list>
-    let! movedItem = Gen.guid
-    let! additionalItem = Gen.guid
-    let! i1 = (0, list.Length + 1) ||> Range.constant |> Gen.int32
-    let! i2 = (0, list.Length + 1) ||> Range.constant |> Gen.int32 |> GenX.notEqualTo i1
-
-    let list = additionalItem :: list
-    let list1 = list |> List.insert i1 movedItem
-    let array2 = list |> List.insert i2 movedItem |> List.toArray
-    let observableCollection = ObservableCollection<_> list1
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 0 @>
-    test <@ updateTracker.Count = array2.Length @>
-  }
+let ``starting with random items, when merging after a move, should contain the merged items and never call create and call update exactly once for each item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list = GenX.auto<Guid list>
+        let! movedItem = Gen.guid
+        let! additionalItem = Gen.guid
+        let! i1 = (0, list.Length + 1) ||> Range.constant |> Gen.int32
+        let! i2 = (0, list.Length + 1) ||> Range.constant |> Gen.int32 |> GenX.notEqualTo i1
+
+        let list = additionalItem :: list
+        let list1 = list |> List.insert i1 movedItem
+        let array2 = list |> List.insert i2 movedItem |> List.toArray
+        let observableCollection = ObservableCollection<_> list1
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 0 @>
+        test <@ updateTracker.Count = array2.Length @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after a replacement, should contain the merged items and call create exactly once and call update exactly once for each original item that remains`` () =
-  Property.check <| property {
-    let! list1Head = Gen.guid
-    let! list1Tail = GenX.auto<Guid list>
-    let! list2Replacement = Gen.guid
-    let! replcementIndex = (0, list1Tail.Length) ||> Range.constant |> Gen.int32
-
-    let list1 = list1Head :: list1Tail
-    let observableCollection = ObservableCollection<_> list1
-    let array2 =
-      list1
-      |> List.replace replcementIndex list2Replacement
-      |> List.toArray
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 1 @>
-    test <@ updateTracker.Count = array2.Length - 1 @>
-  }
+let ``starting with random items, when merging after a replacement, should contain the merged items and call create exactly once and call update exactly once for each original item that remains``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list1Head = Gen.guid
+        let! list1Tail = GenX.auto<Guid list>
+        let! list2Replacement = Gen.guid
+        let! replcementIndex = (0, list1Tail.Length) ||> Range.constant |> Gen.int32
+
+        let list1 = list1Head :: list1Tail
+        let observableCollection = ObservableCollection<_> list1
+        let array2 = list1 |> List.replace replcementIndex list2Replacement |> List.toArray
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 1 @>
+        test <@ updateTracker.Count = array2.Length - 1 @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after swapping two adjacent items, should contain the merged items and never call create and call update exactly once for each item`` () =
-  Property.check <| property {
-    let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
-    let! firstSwapIndex = (0, list1.Length - 2) ||> Range.constant |> Gen.int32
-
-    let observableCollection = ObservableCollection<_> list1
-    let array2 =
-      list1
-      |> List.swap firstSwapIndex (firstSwapIndex + 1)
-      |> List.toArray
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 0 @>
-    test <@ updateTracker.Count = array2.Length @>
-  }
+let ``starting with random items, when merging after swapping two adjacent items, should contain the merged items and never call create and call update exactly once for each item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
+        let! firstSwapIndex = (0, list1.Length - 2) ||> Range.constant |> Gen.int32
+
+        let observableCollection = ObservableCollection<_> list1
+        let array2 = list1 |> List.swap firstSwapIndex (firstSwapIndex + 1) |> List.toArray
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 0 @>
+        test <@ updateTracker.Count = array2.Length @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after swapping two items, should contain the merged items and never call create and call update exactly once for each item`` () =
-  Property.check <| property {
-    let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
-    let! i = (0, list1.Length - 1) ||> Range.constant |> Gen.int32
-    let! j = (0, list1.Length - 1) ||> Range.constant |> Gen.int32 |> GenX.notEqualTo i
-
-    let observableCollection = ObservableCollection<_> list1
-    let array2 =
-      list1
-      |> List.swap i j
-      |> List.toArray
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 0 @>
-    test <@ updateTracker.Count = array2.Length @>
-  }
+let ``starting with random items, when merging after swapping two items, should contain the merged items and never call create and call update exactly once for each item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
+        let! i = (0, list1.Length - 1) ||> Range.constant |> Gen.int32
+        let! j = (0, list1.Length - 1) ||> Range.constant |> Gen.int32 |> GenX.notEqualTo i
+
+        let observableCollection = ObservableCollection<_> list1
+        let array2 = list1 |> List.swap i j |> List.toArray
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 0 @>
+        test <@ updateTracker.Count = array2.Length @>
+    }
 
 [<Fact>]
-let ``starting with random items, when merging after shuffling, should contain the merged items and never call create and call update eactly once for each item`` () =
-  Property.check <| property {
-    let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
-    let! list2 = list1 |> GenX.shuffle |> GenX.notEqualTo list1
-
-    let observableCollection = ObservableCollection<_> list1
-    let array2 = list2 |> List.toArray
-    let createTracker = InvokeTester2 createAsId
-    let updateTracker = InvokeTester3 updateNoOp
-
-    merge getIdAsId getIdAsId createTracker.Fn updateTracker.Fn (observableCollection |> CollectionTarget.create) array2
-
-    testObservableCollectionContainsDataInArray observableCollection array2
-    test <@ createTracker.Count = 0 @>
-    test <@ updateTracker.Count = array2.Length @>
-  }
-
-type TestClass (id: int, data: string) =
-  member _.Id = id
-  member _.Data = data
-  override __.GetHashCode() = 0
-  override __.Equals that =
-    // All instances of TestClass are considered equal.
-    // Not very helpful, but a valid implementation.
-    that :? TestClass
+let ``starting with random items, when merging after shuffling, should contain the merged items and never call create and call update eactly once for each item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
+        let! list2 = list1 |> GenX.shuffle |> GenX.notEqualTo list1
+
+        let observableCollection = ObservableCollection<_> list1
+        let array2 = list2 |> List.toArray
+        let createTracker = InvokeTester2 createAsId
+        let updateTracker = InvokeTester3 updateNoOp
+
+        merge
+            getIdAsId
+            getIdAsId
+            createTracker.Fn
+            updateTracker.Fn
+            (observableCollection |> CollectionTarget.create)
+            array2
+
+        testObservableCollectionContainsDataInArray observableCollection array2
+        test <@ createTracker.Count = 0 @>
+        test <@ updateTracker.Count = array2.Length @>
+    }
+
+type TestClass(id: int, data: string) =
+    member _.Id = id
+    member _.Data = data
+    override __.GetHashCode() = 0
+
+    override __.Equals that =
+        // All instances of TestClass are considered equal.
+        // Not very helpful, but a valid implementation.
+        that :? TestClass
 
 [<Fact>]
-let ``starting with two TestClass instances, when merging after removing the last one, should trigger CC-Remove for removed item`` () =
-  // In test name, using "CC-Remove" instead of "CC.Remove" to avoid this bug:
-  // https://developercommunity.visualstudio.com/t/test-explorer-doesnt-show-tests-correctly-when-dot/297822
-  Property.check <| property {
-    let! id1 = GenX.auto<int>
-    let! id2 = GenX.auto<int> |> GenX.notEqualTo id1
-    let! data1 = GenX.auto<string>
-    let! data2 = GenX.auto<string>
-
-    let tc1 = TestClass(id1, data1)
-    let tc2 = TestClass(id2, data2)
-    let array1 = [| tc1; tc2 |]
-    let array2 = [| tc1 |]
-    let observableCollection = ObservableCollection<_> array1
-    let ccEvents = trackCC observableCollection
-    let getId (tc: TestClass) = tc.Id
-
-    merge getId getId createAsId updateNoOp (observableCollection |> CollectionTarget.create) array2
-
-    test <@ ((ccEvents
-      |> Seq.filter (fun e -> e.Action = NotifyCollectionChangedAction.Remove)
-      |> Seq.head).OldItems.[0] :?> TestClass).Id = tc2.Id @>
-  }
+let ``starting with two TestClass instances, when merging after removing the last one, should trigger CC-Remove for removed item``
+    ()
+    =
+    // In test name, using "CC-Remove" instead of "CC.Remove" to avoid this bug:
+    // https://developercommunity.visualstudio.com/t/test-explorer-doesnt-show-tests-correctly-when-dot/297822
+    Property.check
+    <| property {
+        let! id1 = GenX.auto<int>
+        let! id2 = GenX.auto<int> |> GenX.notEqualTo id1
+        let! data1 = GenX.auto<string>
+        let! data2 = GenX.auto<string>
+
+        let tc1 = TestClass(id1, data1)
+        let tc2 = TestClass(id2, data2)
+        let array1 = [| tc1; tc2 |]
+        let array2 = [| tc1 |]
+        let observableCollection = ObservableCollection<_> array1
+        let ccEvents = trackCC observableCollection
+        let getId (tc: TestClass) = tc.Id
+
+        merge getId getId createAsId updateNoOp (observableCollection |> CollectionTarget.create) array2
+
+        test
+            <@
+                ((ccEvents
+                  |> Seq.filter (fun e -> e.Action = NotifyCollectionChangedAction.Remove)
+                  |> Seq.head)
+                    .OldItems.[0]
+                :?> TestClass)
+                    .Id = tc2.Id
+            @>
+    }
 
 [<Fact>]
-let ``starting with two TestClass instances, when merging after updating the last one, should call update on updated item`` () =
-  Property.check <| property {
-    let! id1 = GenX.auto<int>
-    let! id2 = GenX.auto<int> |> GenX.notEqualTo id1
-    let! data1 = GenX.auto<string>
-    let! data2 = GenX.auto<string>
-    let! data3 = GenX.auto<string> |> GenX.notEqualTo data2
-
-    let tc1 = TestClass(id1, data1)
-    let tc2 = TestClass(id2, data2)
-    let tc3 = TestClass(id2, data3)
-    let array1 = [| tc1; tc2 |]
-    let array2 = [| tc1; tc3 |]
-    let observableCollection = ObservableCollection<_> array1
-    let getId (tc: TestClass) = tc.Id
-
-    let mutable mTarget = None
-    let update target _ _ =
-      mTarget <- Some target
-
-    merge getId getId createAsId update (observableCollection |> CollectionTarget.create) array2
-
-    let actual = mTarget
-    test <@ actual.Value.Id = tc2.Id @>
-  }
+let ``starting with two TestClass instances, when merging after updating the last one, should call update on updated item``
+    ()
+    =
+    Property.check
+    <| property {
+        let! id1 = GenX.auto<int>
+        let! id2 = GenX.auto<int> |> GenX.notEqualTo id1
+        let! data1 = GenX.auto<string>
+        let! data2 = GenX.auto<string>
+        let! data3 = GenX.auto<string> |> GenX.notEqualTo data2
+
+        let tc1 = TestClass(id1, data1)
+        let tc2 = TestClass(id2, data2)
+        let tc3 = TestClass(id2, data3)
+        let array1 = [| tc1; tc2 |]
+        let array2 = [| tc1; tc3 |]
+        let observableCollection = ObservableCollection<_> array1
+        let getId (tc: TestClass) = tc.Id
+
+        let mutable mTarget = None
+        let update target _ _ = mTarget <- Some target
+
+        merge getId getId createAsId update (observableCollection |> CollectionTarget.create) array2
+
+        let actual = mTarget
+        test <@ actual.Value.Id = tc2.Id @>
+    }
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/StaticViewModelTests.fs b/src/Elmish.WPF.Tests/StaticViewModelTests.fs
index a494fcb7..5f4ddf59 100644
--- a/src/Elmish.WPF.Tests/StaticViewModelTests.fs
+++ b/src/Elmish.WPF.Tests/StaticViewModelTests.fs
@@ -15,69 +15,68 @@ open Elmish.WPF
 
 
 
-type internal TestVm<'model, 'msg, 'B1>(model, binding: string -> Binding<'model,'msg>) as this =
-  inherit ViewModelBase<'model, 'msg>({ initialModel = model; dispatch = (fun x -> this.Dispatch x); loggingArgs = LoggingViewModelArgs.none })
+type internal TestVm<'model, 'msg, 'B1>(model, binding: string -> Binding<'model, 'msg>) as this =
+    inherit
+        ViewModelBase<'model, 'msg>(
+            { initialModel = model
+              dispatch = (fun x -> this.Dispatch x)
+              loggingArgs = LoggingViewModelArgs.none }
+        )
 
-  let pcTriggers = ConcurrentDictionary<string, int>()
-  let ecTriggers = ConcurrentDictionary<string, int>()
-  let ccTriggers = ConcurrentDictionary<string, NotifyCollectionChangedEventArgs list>()
-  let cecTriggers = ConcurrentDictionary<string, int>()
-  let dispatchMsgs = ResizeArray<'msg> ()
+    let pcTriggers = ConcurrentDictionary<string, int>()
+    let ecTriggers = ConcurrentDictionary<string, int>()
 
+    let ccTriggers =
+        ConcurrentDictionary<string, NotifyCollectionChangedEventArgs list>()
 
-  do
-    (this :> INotifyPropertyChanged).PropertyChanged.Add (fun e ->
-      pcTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore
-    )
+    let cecTriggers = ConcurrentDictionary<string, int>()
+    let dispatchMsgs = ResizeArray<'msg>()
 
-    (this :> INotifyDataErrorInfo).ErrorsChanged.Add (fun e ->
-      ecTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore
-    )
 
-  member _.UpdateModel(m) = IViewModel.updateModel(this, m)
+    do
+        (this :> INotifyPropertyChanged)
+            .PropertyChanged.Add(fun e ->
+                pcTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore)
 
-  member x.GetPropertyName = nameof(x.GetProperty)
-  member _.GetProperty = base.Get<'B1>() (binding >> Binding.unboxT)
+        (this :> INotifyDataErrorInfo)
+            .ErrorsChanged.Add(fun e -> ecTriggers.AddOrUpdate(e.PropertyName, 1, (fun _ count -> count + 1)) |> ignore)
 
-  member private __.Dispatch x =
-    dispatchMsgs.Add x
+    member _.UpdateModel(m) = IViewModel.updateModel (this, m)
 
-  member __.NumPcTriggersFor propName =
-    pcTriggers.TryGetValue propName |> snd
+    member x.GetPropertyName = nameof (x.GetProperty)
+    member _.GetProperty = base.Get<'B1> () (binding >> Binding.unboxT)
 
-  member __.NumEcTriggersFor propName =
-    ecTriggers.TryGetValue propName |> snd
+    member private __.Dispatch x = dispatchMsgs.Add x
 
-  member __.NumCcTriggersFor propName =
-    ccTriggers.GetOrAdd(propName, []).Length
+    member __.NumPcTriggersFor propName = pcTriggers.TryGetValue propName |> snd
 
-  member __.NumCecTriggersFor propName =
-    cecTriggers.TryGetValue propName |> snd
+    member __.NumEcTriggersFor propName = ecTriggers.TryGetValue propName |> snd
 
-  member __.Dispatches =
-    dispatchMsgs |> Seq.toList
+    member __.NumCcTriggersFor propName =
+        ccTriggers.GetOrAdd(propName, []).Length
 
-  member __.CcTriggersFor propName =
-    ccTriggers.TryGetValue propName |> snd |> Seq.toList
+    member __.NumCecTriggersFor propName = cecTriggers.TryGetValue propName |> snd
 
-  /// Starts tracking CollectionChanged triggers for the specified prop.
-  /// Will cause the property to be retrieved.
-  member this.TrackCcTriggersForGetProperty () =
-    (this.GetProperty |> unbox<INotifyCollectionChanged>).CollectionChanged.Add
-      (fun e ->
-        ccTriggers.AddOrUpdate(
-          this.GetPropertyName,
-          [e],
-          (fun _ me -> e :: me)) |> ignore
-      )
+    member __.Dispatches = dispatchMsgs |> Seq.toList
 
-  /// Starts tracking CanExecuteChanged triggers for the specified prop.
-  /// Will cause the property to be retrieved.
-  member this.TrackCecTriggersForGetProperty () =
-    (this.GetProperty |> unbox<ICommand>).CanExecuteChanged.Add
-      (fun _ ->
-        cecTriggers.AddOrUpdate(this.GetPropertyName, 1, (fun _ count -> count + 1)) |> ignore
-      )
+    member __.CcTriggersFor propName =
+        ccTriggers.TryGetValue propName |> snd |> Seq.toList
+
+    /// Starts tracking CollectionChanged triggers for the specified prop.
+    /// Will cause the property to be retrieved.
+    member this.TrackCcTriggersForGetProperty() =
+        (this.GetProperty |> unbox<INotifyCollectionChanged>)
+            .CollectionChanged.Add(fun e ->
+                ccTriggers.AddOrUpdate(this.GetPropertyName, [ e ], (fun _ me -> e :: me))
+                |> ignore)
+
+    /// Starts tracking CanExecuteChanged triggers for the specified prop.
+    /// Will cause the property to be retrieved.
+    member this.TrackCecTriggersForGetProperty() =
+        (this.GetProperty |> unbox<ICommand>)
+            .CanExecuteChanged.Add(fun _ ->
+                cecTriggers.AddOrUpdate(this.GetPropertyName, 1, (fun _ count -> count + 1))
+                |> ignore)
 
 
 
@@ -85,263 +84,282 @@ type internal TestVm<'model, 'msg, 'B1>(model, binding: string -> Binding<'model
 module Helpers =
 
 
-  let internal oneWay x = x |> Binding.oneWay
-  let internal oneWayLazy x = x |> Func3.curry Binding.oneWayLazy
-  let internal oneWaySeqLazy x = x |> Func5.curry Binding.oneWaySeqLazy
-  let internal twoWay x = x |> Func2.curry Binding.twoWay
-  let internal twoWayValidate
-      name
-      (get: 'model -> 'a)
-      (set: 'a -> 'model -> 'msg)
-      (validate: 'model -> string voption) =
-    Binding.twoWayValidate (get, set, validate) name
+    let internal oneWay x = x |> Binding.oneWay
+    let internal oneWayLazy x = x |> Func3.curry Binding.oneWayLazy
+    let internal oneWaySeqLazy x = x |> Func5.curry Binding.oneWaySeqLazy
+    let internal twoWay x = x |> Func2.curry Binding.twoWay
 
+    let internal twoWayValidate
+        name
+        (get: 'model -> 'a)
+        (set: 'a -> 'model -> 'msg)
+        (validate: 'model -> string voption)
+        =
+        Binding.twoWayValidate (get, set, validate) name
 
-  let internal cmd x = x |> Binding.Cmd.create
 
+    let internal cmd x = x |> Binding.Cmd.create
 
 
-  let internal cmdParam
-      name
-      (exec: 'a -> 'model -> 'msg voption)
-      (canExec: 'a -> 'model -> bool)
-      (autoRequery: bool) =
-    ({ Exec = unbox >> exec
-       CanExec = unbox >> canExec
-       AutoRequery = autoRequery }
-     |> CmdData
-     |> BaseBindingData
-     |> createBinding) name
 
+    let internal cmdParam
+        name
+        (exec: 'a -> 'model -> 'msg voption)
+        (canExec: 'a -> 'model -> bool)
+        (autoRequery: bool)
+        =
+        ({ Exec = unbox >> exec
+           CanExec = unbox >> canExec
+           AutoRequery = autoRequery }
+         |> CmdData
+         |> BaseBindingData
+         |> createBinding)
+            name
 
-  let internal subModel
-      name
-      (getModel: 'model -> 'subModel voption)
-      (toMsg: 'subMsg -> 'msg)
-      (bindings: Binding<'subModel, 'subMsg> list)
-      (sticky: bool) =
-    Binding.subModelOpt(getModel, snd, toMsg, (fun () -> bindings), sticky) name
 
+    let internal subModel
+        name
+        (getModel: 'model -> 'subModel voption)
+        (toMsg: 'subMsg -> 'msg)
+        (bindings: Binding<'subModel, 'subMsg> list)
+        (sticky: bool)
+        =
+        Binding.subModelOpt (getModel, snd, toMsg, (fun () -> bindings), sticky) name
 
-  let internal subModelSeq
-      name
-      (getModels: 'model -> 'subModel list)
-      (getId: 'subModel -> 'id)
-      (toMsg: 'id * 'subMsg -> 'msg)
-      (bindings: Binding<'subModel, 'subMsg> list) =
-    name
-    |> Binding.subModelSeq (getBindings = (fun () -> bindings), getId = getId)
-    |> Binding.mapModel (fun m -> upcast getModels m)
-    |> Binding.mapMsg toMsg
 
+    let internal subModelSeq
+        name
+        (getModels: 'model -> 'subModel list)
+        (getId: 'subModel -> 'id)
+        (toMsg: 'id * 'subMsg -> 'msg)
+        (bindings: Binding<'subModel, 'subMsg> list)
+        =
+        name
+        |> Binding.subModelSeq (getBindings = (fun () -> bindings), getId = getId)
+        |> Binding.mapModel (fun m -> upcast getModels m)
+        |> Binding.mapMsg toMsg
 
 
-  let internal subModelSelectedItem
-      name
-      subModelSeqBindingName
-      (get: 'model -> 'id voption)
-      (set: 'id voption -> 'model -> 'msg) =
-    Binding.subModelSelectedItem (subModelSeqBindingName, get, set) name
+
+    let internal subModelSelectedItem
+        name
+        subModelSeqBindingName
+        (get: 'model -> 'id voption)
+        (set: 'id voption -> 'model -> 'msg)
+        =
+        Binding.subModelSelectedItem (subModelSeqBindingName, get, set) name
 
 
 module OneWay =
 
 
-  [<Fact>]
-  let ``when retrieved, should always return the value returned by get`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``when retrieved, should always return the value returned by get`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string<int>
+            let get = string<int>
 
-      let binding = oneWay get
-      let vm = TestVm(m1, binding)
+            let binding = oneWay get
+            let vm = TestVm(m1, binding)
 
-      test <@ vm.GetProperty = get m1 @>
+            test <@ vm.GetProperty = get m1 @>
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      test <@ vm.GetProperty = get m2 @>
-  }
+            test <@ vm.GetProperty = get m2 @>
+        }
 
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff the return value of get changes`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string<int>
+            let get = string<int>
 
-      let binding = oneWay get
-      let vm = TestVm(m1, binding)
-      let _ = vm.GetProperty
+            let binding = oneWay get
+            let vm = TestVm(m1, binding)
+            let _ = vm.GetProperty
 
-      vm.UpdateModel m2
-      test <@ vm.NumPcTriggersFor vm.GetPropertyName = if get m1 = get m2 then 0 else 1 @>
-  }
+            vm.UpdateModel m2
+            test <@ vm.NumPcTriggersFor vm.GetPropertyName = if get m1 = get m2 then 0 else 1 @>
+        }
 
-  [<Fact>]
-  let ``on model increment, sticky-to-even binding returns even number`` () =
-    let isEven x = x % 2 = 0
+    [<Fact>]
+    let ``on model increment, sticky-to-even binding returns even number`` () =
+        let isEven x = x % 2 = 0
 
-    let returnEven a =
-      function
-      | b when isEven b -> b
-      | _ -> a
+        let returnEven a =
+            function
+            | b when isEven b -> b
+            | _ -> a
 
-    Property.check <| property {
-      let! m = GenX.auto<int>
+        Property.check
+        <| property {
+            let! m = GenX.auto<int>
 
-      let binding = oneWay id >> Binding.addSticky isEven
-      let vm = TestVm(m, binding)
+            let binding = oneWay id >> Binding.addSticky isEven
+            let vm = TestVm(m, binding)
 
-      vm.UpdateModel (m + 1)
-      test <@ vm.GetProperty = returnEven m (m + 1) @>
-    }
+            vm.UpdateModel(m + 1)
+            test <@ vm.GetProperty = returnEven m (m + 1) @>
+        }
 
 module OneWayLazy =
 
 
-  [<Fact>]
-  let ``when retrieved initially, should return the value returned by map`` () =
-    Property.check <| property {
-      let! m = GenX.auto<int>
+    [<Fact>]
+    let ``when retrieved initially, should return the value returned by map`` () =
+        Property.check
+        <| property {
+            let! m = GenX.auto<int>
+
+            let get = string<int>
+            let equals = (=)
+            let map = String.length
 
-      let get = string<int>
-      let equals = (=)
-      let map = String.length
+            let binding = oneWayLazy get equals map
+            let vm = TestVm(m, binding)
 
-      let binding = oneWayLazy get equals map
-      let vm = TestVm(m, binding)
+            test <@ vm.GetProperty = (m |> get |> map) @>
+        }
 
-      test <@ vm.GetProperty = (m |> get |> map) @>
-  }
 
+    [<Fact>]
+    let ``when retrieved after update and equals returns false, should return the value returned by map`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-  [<Fact>]
-  let ``when retrieved after update and equals returns false, should return the value returned by map`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            let get = string<int>
+            let equals _ _ = false
+            let map = String.length
 
-      let get = string<int>
-      let equals _ _ = false
-      let map = String.length
+            let binding = oneWayLazy get equals map
+            let vm = TestVm(m1, binding)
+            vm.UpdateModel m2
 
-      let binding = oneWayLazy get equals map
-      let vm = TestVm(m1, binding)
-      vm.UpdateModel m2
+            test <@ vm.GetProperty = (m2 |> get |> map) @>
+        }
 
-      test <@ vm.GetProperty = (m2 |> get |> map) @>
-  }
 
+    [<Fact>]
+    let ``when retrieved after update and equals returns true, should return the previous value returned by map`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-  [<Fact>]
-  let ``when retrieved after update and equals returns true, should return the previous value returned by map`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+            let get = string<int>
+            let equals _ _ = true
+            let map = String.length
 
-      let get = string<int>
-      let equals _ _ = true
-      let map = String.length
+            let binding = oneWayLazy get equals map
+            let vm = TestVm(m1, binding)
+            let _ = vm.GetProperty // populate cache
+            vm.UpdateModel m2
 
-      let binding = oneWayLazy get equals map
-      let vm = TestVm(m1, binding)
-      let _ = vm.GetProperty  // populate cache
-      vm.UpdateModel m2
+            test <@ vm.GetProperty = (m1 |> get |> map) @>
+        }
 
-      test <@ vm.GetProperty = (m1 |> get |> map) @>
-  }
 
+    [<Fact>]
+    let ``when retrieved, updated, and retrieved again, should call map once after the update iff equals returns false``
+        ()
+        =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+            let! eq = Gen.bool
 
-  [<Fact>]
-  let ``when retrieved, updated, and retrieved again, should call map once after the update iff equals returns false`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
-      let! eq = Gen.bool
+            let get = string
+            let equals _ _ = eq
+            let map = InvokeTester String.length
 
-      let get = string
-      let equals _ _ = eq
-      let map = InvokeTester String.length
+            let binding = oneWayLazy get equals map.Fn
+            let vm = TestVm(m1, binding)
 
-      let binding = oneWayLazy get equals map.Fn
-      let vm = TestVm(m1, binding)
-      
-      let _ = vm.GetProperty
-      vm.UpdateModel m2
-      map.Reset ()
-      let _ = vm.GetProperty
+            let _ = vm.GetProperty
+            vm.UpdateModel m2
+            map.Reset()
+            let _ = vm.GetProperty
 
-      test <@ map.Count = if eq then 0 else 1 @>
-  }
+            test <@ map.Count = if eq then 0 else 1 @>
+        }
 
 
-  [<Fact>]
-  let ``map should never be called during model update`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``map should never be called during model update`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string
-      let equals = (=)
-      let map = InvokeTester String.length
+            let get = string
+            let equals = (=)
+            let map = InvokeTester String.length
 
-      let binding = oneWayLazy get equals map.Fn
-      let vm = TestVm(m1, binding)
-      let _ = vm.GetProperty
+            let binding = oneWayLazy get equals map.Fn
+            let vm = TestVm(m1, binding)
+            let _ = vm.GetProperty
 
-      test <@ map.Count = 1 @>
+            test <@ map.Count = 1 @>
 
-      vm.UpdateModel m2
+            vm.UpdateModel m2
 
-      test <@ map.Count = 1 @>
-  }
+            test <@ map.Count = 1 @>
+        }
 
 
-  [<Fact>]
-  let ``when retrieved several times between updates, map is called at most once`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
+    [<Fact>]
+    let ``when retrieved several times between updates, map is called at most once`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
 
-      let get = string
-      let equals = (=)
-      let map = InvokeTester String.length
+            let get = string
+            let equals = (=)
+            let map = InvokeTester String.length
 
-      let binding = oneWayLazy get equals map.Fn
-      let vm = TestVm(m1, binding)
-      
-      let _ = vm.GetProperty
-      let _ = vm.GetProperty
-      test <@ map.Count <= 1 @>
+            let binding = oneWayLazy get equals map.Fn
+            let vm = TestVm(m1, binding)
+
+            let _ = vm.GetProperty
+            let _ = vm.GetProperty
+            test <@ map.Count <= 1 @>
 
-      map.Reset ()
-      vm.UpdateModel m2
-      let _ = vm.GetProperty
-      let _ = vm.GetProperty
-      test <@ map.Count <= 1 @>
-    }
+            map.Reset()
+            vm.UpdateModel m2
+            let _ = vm.GetProperty
+            let _ = vm.GetProperty
+            test <@ map.Count <= 1 @>
+        }
 
 
-  [<Fact>]
-  let ``when model is updated, should trigger PC once iff equals is false`` () =
-    Property.check <| property {
-      let! m1 = GenX.auto<int>
-      let! m2 = GenX.auto<int>
-      let! eq = Gen.bool
+    [<Fact>]
+    let ``when model is updated, should trigger PC once iff equals is false`` () =
+        Property.check
+        <| property {
+            let! m1 = GenX.auto<int>
+            let! m2 = GenX.auto<int>
+            let! eq = Gen.bool
+
+            let get = string
+            let equals _ _ = eq
+            let map = String.length
 
-      let get = string
-      let equals _ _ = eq
-      let map = String.length
-
-      let binding = oneWayLazy get equals map
-      let vm = TestVm(m1, binding)
-      let _ = vm.GetProperty
-      vm.UpdateModel m2
+            let binding = oneWayLazy get equals map
+            let vm = TestVm(m1, binding)
+            let _ = vm.GetProperty
+            vm.UpdateModel m2
 
-      test <@ vm.NumPcTriggersFor vm.GetPropertyName = if not eq then 1 else 0 @>
-  }
+            test <@ vm.NumPcTriggersFor vm.GetPropertyName = if not eq then 1 else 0 @>
+        }
\ No newline at end of file
diff --git a/src/Elmish.WPF.Tests/UtilsTests.fs b/src/Elmish.WPF.Tests/UtilsTests.fs
index e8694cf3..5e93975d 100644
--- a/src/Elmish.WPF.Tests/UtilsTests.fs
+++ b/src/Elmish.WPF.Tests/UtilsTests.fs
@@ -10,159 +10,171 @@ open Elmish.WPF
 module refEq =
 
 
-  [<Fact>]
-  let ``returns true if the arguments are referentially equal`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int * string>
-      let y = x
-      test <@ refEq x y = true @>
-    }
-
-
-  [<Fact>]
-  let ``returns true if the arguments are not referentially equal`` () =
-    Property.check <| property {
-      let! x = GenX.auto<int * string>
-      let! y = GenX.auto<int * string>
-      test <@ refEq x y = false @>
-    }
-
-
-
-module elmEq =
-
-
-  type TestObj = { X: int }
-
-
-  module Tuples =
-
-
     [<Fact>]
-    let ``returns false if any non-string reference type member is not referentially equal`` () =
-      PropertyConfig.defaultConfig
-      |> PropertyConfig.withTests 1000<tests>
-      |> Property.checkWith <| property {
-        let! x1 = GenX.auto<int>
-        let! y1 = GenX.auto<int>
-        let! x2 = GenX.auto<string>
-        let! y2 = GenX.auto<string>
-        let! x3 = GenX.auto<TestObj>
-        let! y3 = GenX.auto<TestObj>
-        test <@ elmEq (x1, x2, x3) (y1, y2, y3) = false @>
-      }
+    let ``returns true if the arguments are referentially equal`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int * string>
+            let y = x
+            test <@ refEq x y = true @>
+        }
 
 
     [<Fact>]
-    let ``returns false if all non-string reference type members are referentially equal and all string and value type members are structurally equal`` () =
-      PropertyConfig.defaultConfig
-      |> PropertyConfig.withTests 1000<tests>
-      |> Property.checkWith <| property {
-        let! x1 = GenX.auto<int>
-        let! y1 = GenX.auto<int>
-        let! x2 = GenX.auto<string>
-        let! y2 = GenX.auto<string>
-        let! x3 = GenX.auto<TestObj>
-        let y3 = x3
-        test <@ elmEq (x1, x2, x3) (y1, y2, y3) = (x1 = y1 && x2 = y2) @>
-      }
-
+    let ``returns true if the arguments are not referentially equal`` () =
+        Property.check
+        <| property {
+            let! x = GenX.auto<int * string>
+            let! y = GenX.auto<int * string>
+            test <@ refEq x y = false @>
+        }
 
-  module Records =
 
 
-    type TestValues = { i: int; s: string; t: TestObj }
+module elmEq =
 
 
-    [<Fact>]
-    let ``returns false if any non-string reference type member is not referentially equal`` () =
-      PropertyConfig.defaultConfig
-      |> PropertyConfig.withTests 1000<tests>
-      |> Property.checkWith <| property {
-        let! t1 = GenX.auto<TestValues>
-        let! t2 = GenX.auto<TestValues>
-        test <@ elmEq t1 t2 = false @>
-      }
+    type TestObj = { X: int }
 
 
-    [<Fact>]
-    let ``returns false if all non-string reference type members are referentially equal and all string and value type members are structurally equal`` () =
-      PropertyConfig.defaultConfig
-      |> PropertyConfig.withTests 1000<tests>
-      |> Property.checkWith <| property {
-        let! t1 = GenX.auto<TestValues>
-        let! t2 = GenX.auto<TestValues>
-        let t2 = { t2 with t = t1.t }
-        test <@ elmEq t1 t2 = (t1.i = t2.i && t1.s = t2.s) @>
-      }
+    module Tuples =
 
 
-module ValueOption =
+        [<Fact>]
+        let ``returns false if any non-string reference type member is not referentially equal`` () =
+            PropertyConfig.defaultConfig
+            |> PropertyConfig.withTests 1000<tests>
+            |> Property.checkWith
+            <| property {
+                let! x1 = GenX.auto<int>
+                let! y1 = GenX.auto<int>
+                let! x2 = GenX.auto<string>
+                let! y2 = GenX.auto<string>
+                let! x3 = GenX.auto<TestObj>
+                let! y3 = GenX.auto<TestObj>
+                test <@ elmEq (x1, x2, x3) (y1, y2, y3) = false @>
+            }
 
-  open System
 
-  module toNull =
+        [<Fact>]
+        let ``returns false if all non-string reference type members are referentially equal and all string and value type members are structurally equal``
+            ()
+            =
+            PropertyConfig.defaultConfig
+            |> PropertyConfig.withTests 1000<tests>
+            |> Property.checkWith
+            <| property {
+                let! x1 = GenX.auto<int>
+                let! y1 = GenX.auto<int>
+                let! x2 = GenX.auto<string>
+                let! y2 = GenX.auto<string>
+                let! x3 = GenX.auto<TestObj>
+                let y3 = x3
+                test <@ elmEq (x1, x2, x3) (y1, y2, y3) = (x1 = y1 && x2 = y2) @>
+            }
 
-    let testNonNull (ga: Gen<'a>) =
-      Property.check <| property {
-        let! expected = ga
-        test <@ Ok expected = (expected |> ValueSome |> ValueOption.toNull) @>
-      }
 
-    [<Fact>]
-    let ``toNull returns contents of ValueSome when given ValueSome`` () =
-      testNonNull GenX.auto<obj>
-      testNonNull GenX.auto<string>
-      testNonNull GenX.auto<int>
-      testNonNull GenX.auto<bool>
+    module Records =
 
-    let testNullForNullable<'a when 'a : equality> () =
-      test <@ Ok Unchecked.defaultof<'a> = ValueOption.toNull<'a> ValueNone @>
 
-    [<Fact>]
-    let ``toNull returns null when given ValueNone for nullable type`` () =
-      testNullForNullable<obj> ()
-      testNullForNullable<string> ()
-      testNullForNullable<Nullable<int>> ()
-      testNullForNullable<Nullable<bool>> ()
+        type TestValues = { i: int; s: string; t: TestObj }
 
-    let testNullForNonNullable<'a when 'a : equality> () =
-      let expected = typeof<'a>.Name |> ValueOption.ToNullError.ValueCannotBeNull |> Error
-      test <@ expected = ValueOption.toNull<'a> ValueNone @>
 
-    [<Fact>]
-    let ``toNull returns ValueCannotBeNull Error when given ValueNone for non-nullable type`` () =
-      testNullForNonNullable<int> ()
-      testNullForNonNullable<bool> ()
+        [<Fact>]
+        let ``returns false if any non-string reference type member is not referentially equal`` () =
+            PropertyConfig.defaultConfig
+            |> PropertyConfig.withTests 1000<tests>
+            |> Property.checkWith
+            <| property {
+                let! t1 = GenX.auto<TestValues>
+                let! t2 = GenX.auto<TestValues>
+                test <@ elmEq t1 t2 = false @>
+            }
 
-    type Foo = { Foo: unit }
-    type Bar = Bar of unit
 
-    [<Fact>]
-    let ``toNull does not throw NullReferenceException given reference type`` () =
-      ValueOption.toNull<Foo> ValueNone |> ignore
-      ValueOption.toNull<Bar> ValueNone |> ignore
-
-  module ofNull =
-
-    let testNull<'a when 'a : equality> () =
-      let input = Unchecked.defaultof<'a>
-      test <@ ValueNone = ValueOption.ofNull input @>
+        [<Fact>]
+        let ``returns false if all non-string reference type members are referentially equal and all string and value type members are structurally equal``
+            ()
+            =
+            PropertyConfig.defaultConfig
+            |> PropertyConfig.withTests 1000<tests>
+            |> Property.checkWith
+            <| property {
+                let! t1 = GenX.auto<TestValues>
+                let! t2 = GenX.auto<TestValues>
+                let t2 = { t2 with t = t1.t }
+                test <@ elmEq t1 t2 = (t1.i = t2.i && t1.s = t2.s) @>
+            }
 
-    [<Fact>]
-    let ``ofNull returns ValueNone when input is null`` () =
-      testNull<obj> ()
-      testNull<string> ()
-      testNull<Nullable<int>> ()
 
-    let testNonNull (ga: Gen<'a>) =
-      Property.check <| property {
-        let! input = ga
-        test <@ ValueSome input = ValueOption.ofNull input @>
-      }
+module ValueOption =
 
-    [<Fact>]
-    let ``ofNull returns ValueSome of input when input is nonnull`` () =
-      testNonNull GenX.auto<obj>
-      testNonNull GenX.auto<string>
-      testNonNull GenX.auto<int>
+    open System
+
+    module toNull =
+
+        let testNonNull (ga: Gen<'a>) =
+            Property.check
+            <| property {
+                let! expected = ga
+                test <@ Ok expected = (expected |> ValueSome |> ValueOption.toNull) @>
+            }
+
+        [<Fact>]
+        let ``toNull returns contents of ValueSome when given ValueSome`` () =
+            testNonNull GenX.auto<obj>
+            testNonNull GenX.auto<string>
+            testNonNull GenX.auto<int>
+            testNonNull GenX.auto<bool>
+
+        let testNullForNullable<'a when 'a: equality> () =
+            test <@ Ok Unchecked.defaultof<'a> = ValueOption.toNull<'a> ValueNone @>
+
+        [<Fact>]
+        let ``toNull returns null when given ValueNone for nullable type`` () =
+            testNullForNullable<obj> ()
+            testNullForNullable<string> ()
+            testNullForNullable<Nullable<int>> ()
+            testNullForNullable<Nullable<bool>> ()
+
+        let testNullForNonNullable<'a when 'a: equality> () =
+            let expected = typeof<'a>.Name |> ValueOption.ToNullError.ValueCannotBeNull |> Error
+            test <@ expected = ValueOption.toNull<'a> ValueNone @>
+
+        [<Fact>]
+        let ``toNull returns ValueCannotBeNull Error when given ValueNone for non-nullable type`` () =
+            testNullForNonNullable<int> ()
+            testNullForNonNullable<bool> ()
+
+        type Foo = { Foo: unit }
+        type Bar = Bar of unit
+
+        [<Fact>]
+        let ``toNull does not throw NullReferenceException given reference type`` () =
+            ValueOption.toNull<Foo> ValueNone |> ignore
+            ValueOption.toNull<Bar> ValueNone |> ignore
+
+    module ofNull =
+
+        let testNull<'a when 'a: equality> () =
+            let input = Unchecked.defaultof<'a>
+            test <@ ValueNone = ValueOption.ofNull input @>
+
+        [<Fact>]
+        let ``ofNull returns ValueNone when input is null`` () =
+            testNull<obj> ()
+            testNull<string> ()
+            testNull<Nullable<int>> ()
+
+        let testNonNull (ga: Gen<'a>) =
+            Property.check
+            <| property {
+                let! input = ga
+                test <@ ValueSome input = ValueOption.ofNull input @>
+            }
+
+        [<Fact>]
+        let ``ofNull returns ValueSome of input when input is nonnull`` () =
+            testNonNull GenX.auto<obj>
+            testNonNull GenX.auto<string>
+            testNonNull GenX.auto<int>
\ No newline at end of file
diff --git a/src/Elmish.WPF/Binding.fs b/src/Elmish.WPF/Binding.fs
index c95c56d9..1a71758e 100644
--- a/src/Elmish.WPF/Binding.fs
+++ b/src/Elmish.WPF/Binding.fs
@@ -1,4190 +1,3944 @@
-namespace Elmish.WPF
-
-open System.Windows
-
-open Elmish
-open System.Windows.Input
-open System.Collections.ObjectModel
-
-
-module Binding =
-  open BindingData
-
-  let internal mapData f binding =
-    { Name = binding.Name
-      Data = binding.Data |> f }
-
-  /// Boxes the output parameter.
-  /// Allows using a strongly-typed submodel binding (from a module ending in "T")
-  /// in a binding list (rather than in a view model class member as normal).
-  let boxT (binding: Binding<'b, 'msg, 't>) = BindingData.boxT |> mapData <| binding
-
-  /// Unboxes the output parameter
-  let unboxT (binding: Binding<'b, 'msg>): Binding<'b, 'msg, 't> = BindingData.unboxT |> mapData <| binding
-
-  /// Maps the model of a binding via a contravariant mapping.
-  let mapModel (f: 'a -> 'b) (binding: Binding<'b, 'msg, 't>) = f |> mapModel |> mapData <| binding
-
-  /// Maps the message of a binding with access to the model via a covariant mapping.
-  let mapMsgWithModel (f: 'a -> 'model -> 'b) (binding: Binding<'model, 'a, 't>) = f |> mapMsgWithModel |> mapData <| binding
-
-  /// Maps the message of a binding via a covariant mapping.
-  let mapMsg (f: 'a -> 'b) (binding: Binding<'model, 'a, 't>) = f |> mapMsg |> mapData <| binding
-
-  /// Sets the message of a binding with access to the model.
-  let setMsgWithModel (f: 'model -> 'b) (binding: Binding<'model, 'a, 't>) = f |> setMsgWithModel |> mapData <| binding
-
-  /// Sets the message of a binding.
-  let setMsg (msg: 'b) (binding: Binding<'model, 'a, 't>) = msg |> setMsg |> mapData <| binding
-
-
-  /// Restricts the binding to models that satisfy the predicate after some model satisfies the predicate.
-  let addSticky (predicate: 'model -> bool) (binding: Binding<'model, 'msg, 't>) = predicate |> addSticky |> mapData <| binding
-
-  /// <summary>
-  ///   Adds caching to the given binding.  The cache holds a single value and
-  ///   is invalidated after the given binding raises the
-  ///   <c>PropertyChanged</c> event.
-  /// </summary>
-  /// <param name="binding">The binding to which caching is added.</param>
-  let addCaching (binding: Binding<'model, 'msg, 't>) : Binding<'model, 'msg, 't> =
-    binding
-    |> mapData addCaching
-
-  /// <summary>
-  ///   Adds validation to the given binding using <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="validate">Returns the errors associated with the given model.</param>
-  /// <param name="binding">The binding to which validation is added.</param>
-  let addValidation (validate: 'model -> string list) (binding: Binding<'model, 'msg, 't>) : Binding<'model, 'msg, 't> =
-    binding
-    |> mapData (addValidation validate)
-
-  /// <summary>
-  ///   Adds laziness to the updating of the given binding. If the models are considered equal,
-  ///   then updating of the given binding is skipped.
-  /// </summary>
-  /// <param name="equals">Updating skipped when this function returns <c>true</c>.</param>
-  /// <param name="binding">The binding to which the laziness is added.</param>
-  let addLazy (equals: 'model -> 'model -> bool) (binding: Binding<'model, 'msg, 't>) : Binding<'model, 'msg, 't> =
-    binding
-    |> mapData (addLazy equals)
-
-  /// <summary>
-  ///   Alters the message stream via the given function.
-  ///   Ideally suited for use with Reactive Extensions.
-  ///   <code>
-  ///     open FSharp.Control.Reactive
-  ///     let delay dispatch =
-  ///       let subject = Subject.broadcast
-  ///       let observable = subject :&gt; System.IObservable&lt;_&gt;
-  ///       observable
-  ///       |&gt; Observable.delay (System.TimeSpan.FromSeconds 1.0)
-  ///       |&gt; Observable.subscribe dispatch
-  ///       |&gt; ignore
-  ///       subject.OnNext
-  ///
-  ///     // ...
-  ///
-  ///     binding |&gt; Binding.alterMsgStream delay
-  ///   </code>
-  /// </summary>
-  /// <param name="alteration">The function that can alter the message stream.</param>
-  /// <param name="binding">The binding of the altered message stream.</param>
-  let alterMsgStream (alteration: ('b -> unit) -> 'a -> unit) (binding: Binding<'model, 'a, 't>) : Binding<'model, 'b, 't> =
-    binding
-    |> mapData (alterMsgStream alteration)
-
-
-  /// <summary>
-  ///   Strongly-typed bindings that update the view from the model.
-  /// </summary>
-  module OneWayT =
-
-    /// Elemental instance of a one-way binding.
-    let id<'a, 'msg> : string -> Binding<'a, 'msg, 'a> =
-      OneWay.id
-      |> createBindingT
-
-    /// Creates a one-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let opt x : Binding<'a option, 'msg, System.Nullable<'a>> =
-      x
-      |> id
-      |> mapModel Option.toNullable
-
-    /// Creates a one-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let vopt x : Binding<'a voption, 'msg, System.Nullable<'a>> =
-      x
-      |> id
-      |> mapModel ValueOption.toNullable
-
-    /// Creates a one-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let optobj<'a, 'msg when 'a : null> : string -> Binding<'a option, 'msg, 'a> =
-      id<'a, 'msg>
-      >> mapModel Option.toObj
-
-    /// Creates a one-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let voptobj<'a, 'msg when 'a : null> : string -> Binding<'a voption, 'msg, 'a> =
-      id<'a, 'msg>
-      >> mapModel ValueOption.toObj
-
-  /// <summary>
-  ///   Strongly-typed bindings that update the model from the view.
-  /// </summary>
-  module OneWayToSourceT =
-
-    /// Elemental instance of a one-way-to-source binding.
-    let id<'model, 'a> : string -> Binding<'model, 'a, 'a> =
-      OneWayToSource.id
-      |> createBindingT
-
-    /// Creates a one-way-to-source binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let optobj<'a, 'model when 'a : null> : string -> Binding<'model, 'a option, 'a> =
-      id<'model, 'a>
-      >> mapMsg Option.ofObj
-
-    /// Creates a one-way-to-source binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let voptobj<'a, 'model when 'a : null> : string -> Binding<'model, 'a voption, 'a> =
-      id<'model, 'a>
-      >> mapMsg ValueOption.ofObj
-
-    /// Creates a one-way-to-source binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let opt x : Binding<'model, 'a option, System.Nullable<'a>> =
-      x
-      |> id
-      |> mapMsg Option.ofNullable
-      
-    /// Creates a one-way-to-source binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let vopt x : Binding<'model, 'a voption, System.Nullable<'a>> =
-      x
-      |> id
-      |> mapMsg ValueOption.ofNullable
-
-  /// <summary>
-  ///   Strongly-typed bindings that update both ways
-  /// </summary>
-  module TwoWayT =
-
-    /// Elemental instance of a two-way binding.
-    let id<'a> : string -> Binding<'a, 'a, 'a> =
-      TwoWay.id
-      |> createBindingT
-
-    /// Creates a two-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let opt x : Binding<'a option, 'a option, System.Nullable<'a>> =
-      x
-      |> id
-      |> mapMsg Option.ofNullable
-      |> mapModel Option.toNullable
-
-    /// Creates a two-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let vopt x : Binding<'a voption, 'a voption, System.Nullable<'a>> =
-      x
-      |> id
-      |> mapMsg ValueOption.ofNullable
-      |> mapModel ValueOption.toNullable
-
-    /// Creates a two-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let optobj<'a when 'a : null> : string -> Binding<'a option, 'a option, 'a> =
-      id<'a>
-      >> mapModel Option.toObj
-      >> mapMsg Option.ofObj
-
-    /// Creates a two-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let voptobj<'a when 'a : null> : string -> Binding<'a voption, 'a voption, 'a> =
-      id<'a>
-      >> mapMsg ValueOption.ofObj
-      >> mapModel ValueOption.toObj
-      
-  /// <summary>
-  ///   The strongly-typed counterpart of <c>Binding.oneWaySeq</c> with parameter <c>getId</c>.
-  ///   Exposes an <c>ObservableCollection</c> of child items for binding.
-  ///   Allows a more efficient update than would be possible without using ids.
-  /// </summary>
-  module OneWaySeqT =
-
+namespace Elmish.WPF
+
+open System.Windows
+
+open Elmish
+open System.Windows.Input
+open System.Collections.ObjectModel
+
+
+module Binding =
+    open BindingData
+
+    let internal mapData f binding =
+        { Name = binding.Name
+          Data = binding.Data |> f }
+
+    /// Boxes the output parameter.
+    /// Allows using a strongly-typed submodel binding (from a module ending in "T")
+    /// in a binding list (rather than in a view model class member as normal).
+    let boxT (binding: Binding<'b, 'msg, 't>) = BindingData.boxT |> mapData <| binding
+
+    /// Unboxes the output parameter
+    let unboxT (binding: Binding<'b, 'msg>) : Binding<'b, 'msg, 't> =
+        BindingData.unboxT |> mapData <| binding
+
+    /// Maps the model of a binding via a contravariant mapping.
+    let mapModel (f: 'a -> 'b) (binding: Binding<'b, 'msg, 't>) = f |> mapModel |> mapData <| binding
+
+    /// Maps the message of a binding with access to the model via a covariant mapping.
+    let mapMsgWithModel (f: 'a -> 'model -> 'b) (binding: Binding<'model, 'a, 't>) =
+        f |> mapMsgWithModel |> mapData <| binding
+
+    /// Maps the message of a binding via a covariant mapping.
+    let mapMsg (f: 'a -> 'b) (binding: Binding<'model, 'a, 't>) = f |> mapMsg |> mapData <| binding
+
+    /// Sets the message of a binding with access to the model.
+    let setMsgWithModel (f: 'model -> 'b) (binding: Binding<'model, 'a, 't>) =
+        f |> setMsgWithModel |> mapData <| binding
+
+    /// Sets the message of a binding.
+    let setMsg (msg: 'b) (binding: Binding<'model, 'a, 't>) = msg |> setMsg |> mapData <| binding
+
+
+    /// Restricts the binding to models that satisfy the predicate after some model satisfies the predicate.
+    let addSticky (predicate: 'model -> bool) (binding: Binding<'model, 'msg, 't>) =
+        predicate |> addSticky |> mapData <| binding
+
     /// <summary>
-    /// Elemental instance of a OneWaySeqT binding
+    ///   Adds caching to the given binding.  The cache holds a single value and
+    ///   is invalidated after the given binding raises the
+    ///   <c>PropertyChanged</c> event.
     /// </summary>
-    /// <param name="itemEquals">Defines whether an item is "equal" and needs to be updated if the ids are the same</param>
-    /// <param name="getId">Unique identifier for each item in the list (for efficient updates).</param>
-    let id itemEquals (getId: 'a -> 'id) : string -> Binding<_, 'msg, _> =
-      OneWaySeq.create itemEquals getId
-      |> createBindingT
-
-  /// <summary>
-  ///   Strongly-typed bindings that dispatch messages from the view.
-  /// </summary>
-  module CmdT =
-
-    /// <summary>
-    ///   Elemental instance of a <c>Command</c> binding.
-    ///   Creates a <c>Command</c> binding that only passes the <c>CommandParameter</c>)
-    /// </summary>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    let id<'model> uiBoundCmdParam canExec
-        : string -> Binding<'model, obj, ICommand> =
-      Cmd.createWithParam
-        (fun p _ -> ValueSome p)
-        canExec
-        uiBoundCmdParam
-      |> createBindingT
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends only on the model (not the
-    ///   <c>CommandParameter</c>).
-    /// </summary>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    let model
-        canExec
-        (exec: 'model -> 'msg)
-        : string -> Binding<'model, 'msg, ICommand> =
-      id false (fun _ m -> m |> canExec)
-      >> mapMsgWithModel (fun _ y -> y |> exec)
-      >> addLazy (fun m1 m2 -> canExec m1 = canExec m2)
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that dispatches the specified message.
-    /// </summary>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    /// <param name="msg">The message to dispatch.</param>
-    let set
-        canExec
-        (msg: 'msg)
-        : string -> Binding<'model, 'msg, ICommand> =
-      id false (fun _ m -> m |> canExec)
-      >> setMsg msg
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends only on the model (not the
-    ///   <c>CommandParameter</c>) and always executes.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    let modelAlways
-        (exec: 'model -> 'msg)
-        : string -> Binding<'model, 'msg, ICommand> =
-      model (fun _ -> true) exec
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that dispatches the specified message
-    ///   and always executes.
-    /// </summary>
-    /// <param name="msg">The message to dispatch.</param>
-    let setAlways
-        (msg: 'msg)
-        : string -> Binding<'model, 'msg, ICommand> =
-      set (fun _ -> true) msg
-
-  module OneWay =
-
-    /// Elemental instance of a one-way binding.
-    let id<'a, 'msg> : string -> Binding<'a, 'msg> =
-      OneWay.id
-      |> createBinding
-
-    /// Creates a one-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let opt<'a, 'msg> : string -> Binding<'a option, 'msg> =
-      id<obj, 'msg>
-      >> mapModel Option.box
-
-    /// Creates a one-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let vopt<'a, 'msg> : string -> Binding<'a voption, 'msg> =
-      id<obj, 'msg>
-      >> mapModel ValueOption.box
-
-
-  module OneWayToSource =
-
-    /// Elemental instance of a one-way-to-source binding.
-    let id<'model, 'a> : string -> Binding<'model, 'a> =
-      OneWayToSource.id
-      |> createBinding
-
-    /// Creates a one-way-to-source binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let vopt<'model, 'a> : string -> Binding<'model, 'a voption> =
-      id<'model, obj>
-      >> mapMsg ValueOption.unbox
-
-    /// Creates a one-way-to-source binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let opt<'model, 'a> : string -> Binding<'model, 'a option> =
-      id<'model, obj>
-      >> mapMsg Option.unbox
-
-
-  module TwoWay =
-
-    /// Elemental instance of a two-way binding.
-    let id<'a> : string -> Binding<'a, 'a> =
-      TwoWay.id
-      |> createBinding
-
-    /// Creates a two-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let vopt<'a> : string -> Binding<'a voption, 'a voption> =
-      id<obj>
-      >> mapModel ValueOption.box
-      >> mapMsg ValueOption.unbox
-
-    /// Creates a two-way binding to an optional value. The binding
-    /// automatically converts between a missing value in the model and
-    /// a <c>null</c> value in the view.
-    let opt<'a> : string -> Binding<'a option, 'a option> =
-      id<obj>
-      >> mapModel Option.box
-      >> mapMsg Option.unbox
-
-
-  module SubModelSelectedItem =
-
-    /// Creates a two-way binding to a <c>SelectedItem</c>-like property where
-    /// the <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-    /// binding. Automatically converts the dynamically created Elmish.WPF view
-    /// models to/from their corresponding IDs, so the Elmish user code only has
-    /// to work with the IDs.
-    ///
-    /// Only use this if you are unable to use some kind of <c>SelectedValue</c>
-    /// or <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-    /// binding. This binding is less type-safe. It will throw when initializing
-    /// the bindings if <paramref name="subModelSeqBindingName" />
-    /// does not correspond to a <see cref="subModelSeq" /> binding, and it will
-    /// throw at runtime if the inferred <c>'id</c> type does not match the
-    /// actual ID type used in that binding.
-    let vopt subModelSeqBindingName : string -> Binding<'id voption, 'id voption> =
-      SubModelSelectedItem.create subModelSeqBindingName
-      |> createBinding
-      >> mapModel (ValueOption.map box)
-      >> mapMsg (ValueOption.map unbox)
-
-    /// Creates a two-way binding to a <c>SelectedItem</c>-like property where
-    /// the <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-    /// binding. Automatically converts the dynamically created Elmish.WPF view
-    /// models to/from their corresponding IDs, so the Elmish user code only has
-    /// to work with the IDs.
-    ///
-    /// Only use this if you are unable to use some kind of <c>SelectedValue</c>
-    /// or <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-    /// binding. This binding is less type-safe. It will throw when initializing
-    /// the bindings if <paramref name="subModelSeqBindingName" />
-    /// does not correspond to a <see cref="subModelSeq" /> binding, and it will
-    /// throw at runtime if the inferred <c>'id</c> type does not match the
-    /// actual ID type used in that binding.
-    let opt subModelSeqBindingName : string -> Binding<'id option, 'id option> =
-      vopt subModelSeqBindingName
-      >> mapModel ValueOption.ofOption
-      >> mapMsg ValueOption.toOption
-
-
-  module Cmd =
-
-    let internal createWithParam exec canExec autoRequery =
-      Cmd.createWithParam exec canExec autoRequery
-      |> createBinding
-
-    let internal create exec canExec =
-      createWithParam
-        (fun _ -> exec)
-        (fun _ -> canExec)
-        false
-      >> addLazy (fun m1 m2 -> canExec m1 = canExec m2)
-
-
-  module OneWaySeq =
-
-    let internal create get itemEquals getId =
-      OneWaySeq.create itemEquals getId
-      |> BindingData.mapModel get
-      |> createBinding
-
-
-  module SubModel =
-
-    /// <summary>
-    ///   Creates a binding to a sub-model/component. You typically bind this
-    ///   to the <c>DataContext</c> of a <c>UserControl</c> or similar.
-    /// </summary>
-    /// <param name="bindings">Returns the bindings for the sub-model.</param>
-    let vopt (bindings: unit -> Binding<'model, 'msg> list)
-        : string -> Binding<'model voption, 'msg> =
-      SubModel.create
-        (fun args -> DynamicViewModel<'model, 'msg>(args, bindings ()))
-        IViewModel.updateModel
-      |> createBinding
-
-    /// <summary>
-    ///   Creates a binding to a sub-model/component. You typically bind this
-    ///   to the <c>DataContext</c> of a <c>UserControl</c> or similar.
-    /// </summary>
-    /// <param name="bindings">Returns the bindings for the sub-model.</param>
-    let opt (bindings: unit -> Binding<'model, 'msg> list)
-        : string -> Binding<'model option, 'msg> =
-      vopt bindings
-      >> mapModel ValueOption.ofOption
-
-    /// <summary>
-    ///   Creates a binding to a sub-model/component. You typically bind this
-    ///   to the <c>DataContext</c> of a <c>UserControl</c> or similar.
-    /// </summary>
-    /// <param name="bindings">Returns the bindings for the sub-model.</param>
-    let required (bindings: unit -> Binding<'model, 'msg> list)
-        : string -> Binding<'model, 'msg> =
-      vopt bindings
-      >> mapModel ValueSome
-
-  /// <summary>
-  ///   The strongly-typed counterpart of module <c>SubModel</c>.
-  ///   For creating bindings to child view models that have their own bindings.
-  ///   Typically bound from WPF using <c>DataContext</c> and <c>Binding</c>.
-  ///   Can be used in binding lists if boxed using <see cref="boxT" />.
-  /// </summary>
-  module SubModelT =
-
-    /// Exposes an optional view model member for binding.
-    let opt
-      (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
-      : (string -> Binding<'bindingModel voption, 'msg, #IViewModel<'bindingModel, 'msg>>)
-      =
-      SubModel.create createVm IViewModel.updateModel
-      |> createBindingT
-
-    /// Exposes a non-optional view model member for binding.
-    let req
-      (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
-      : (string -> Binding<'bindingModel, 'msg, #IViewModel<'bindingModel, 'msg>>)
-      =
-      SubModel.create createVm IViewModel.updateModel
-      |> createBindingT
-      >> mapModel ValueSome
-
-    /// <summary>
-    ///   Exposes a <c>'a seq</c> (<c>IEnumerable&lt;'a&gt;</c>) view model member for binding.
-    ///   Used rarely; usually, you want to expose an <c>ObservableCollection&lt;'a&gt;</c>
-    ///   using <c>SubModelSeqKeyedT</c> or <c>SubModelSeqUnkeyedT</c>.
-    /// </summary>
-    let seq
-      (createVm: ViewModelArgs<'bindingModel, 'msg> -> #seq<#IViewModel<'bindingModel, 'msg>>)
-      : (string -> Binding<'bindingModel, 'msg, #seq<#IViewModel<'bindingModel, 'msg>>>)
-      =
-      SubModel.create createVm (fun (vms, m) -> vms |> Seq.iter (fun vm -> IViewModel.updateModel (vm, m)))
-      |> createBindingT
-      >> mapModel ValueSome
-
-  /// <summary>
-  ///   The strongly-typed counterpart of <c>Binding.subModelSeq</c> without parameter <c>getId</c>.
-  ///   Exposes an <c>ObservableCollection</c> of child view models for binding.
-  ///   Identifies elements by index;
-  ///   if possible, use <c>SubModelSeqKeyedT</c> (which uses parameter <c>getId</c>) instead.
-  ///   Typically bound from WPF using <c>DataContext</c> and <c>Binding</c>.
-  ///   Can be used in binding lists if boxed using <see cref="boxT" />.
-  /// </summary>
-  module SubModelSeqUnkeyedT =
-
-    /// <summary>
-    ///   Creates an elemental <c>SubModelSeqUnkeyedT</c> binding.
-    /// </summary>
-    /// <param name="createVm">
-    ///   The function applied to every element of the bound <c>ObservableCollection</c>
-    ///   to create a child view model.
-    /// </param>
-    let id
-      (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
-      : (string -> Binding<'bindingModelCollection, int * 'msg, ObservableCollection<#IViewModel<'bindingModel, 'msg>>>)
-      =
-      SubModelSeqUnkeyed.create createVm IViewModel.updateModel
-      |> createBindingT
-
-  /// <summary>
-  ///   The strongly-typed counterpart of <c>Binding.subModelSeq</c> with parameter <c>getId</c>.
-  ///   Exposes an <c>ObservableCollection</c> of child view models for binding.
-  ///   Typically bound from WPF using <c>DataContext</c> and <c>Binding</c>.
-  ///   Can be used in binding lists if boxed using <see cref="boxT" />.
-  /// </summary>
-  module SubModelSeqKeyedT =
-
-    /// <summary>
-    ///   Creates an elemental <c>SubModelSeqUnkeyedT</c> binding.
-    /// </summary>
-    /// <param name="createVm">
-    ///   The function applied to every element of the bound <c>ObservableCollection</c>
-    ///   to create a child view model.
-    /// </param>
-    /// <param name="getId">
-    ///   The function applied to every element of the bound <c>ObservableCollection</c>
-    ///   to get a key used to identify that element.
-    ///   Should not return duplicate keys for different elements.
-    /// </param>
-    let id
-      (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
-      (getId: 'bindingModel -> 'id)
-      : (string -> Binding<'bindingModelCollection, 'id * 'msg, ObservableCollection<#IViewModel<'bindingModel, 'msg>>>)
-      =
-      SubModelSeqKeyed.create createVm IViewModel.updateModel getId (IViewModel.currentModel >> getId)
-      |> createBindingT
-
-  /// <summary>
-  ///   The strongly-typed counterpart of <c>Binding.subModelWin</c>.
-  ///   Like <see cref="SubModelT.opt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (either in code
-  ///   or in XAML).
-  ///
-  ///   Can be used in binding lists if boxed using <see cref="boxT" />.
-  /// </summary>
-  module SubModelWinT =
-
-    /// <summary>
-    ///   Creates an elemental <c>SubModelWinT</c> binding.
-    ///   Like <see cref="SubModelT.opt" />, but uses the <c>WindowState</c> wrapper
-    ///   to show/hide/close a new window that will have the specified bindings as
-    ///   its <c>DataContext</c>.
-    ///
-    ///   You do not need to set the <c>DataContext</c> yourself (either in code
-    ///   or in XAML).
-    ///   The window can only be closed/hidden by changing the return value of
-    ///   <paramref name="getState" />, and cannot be directly closed by the
-    ///   user. External close attempts (the Close/X button, Alt+F4, or System
-    ///   Menu -> Close) will cause the message specified by
-    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-    ///   will not confuse a user trying to close the window (e.g. by closing it
-    ///   or displaying relevant feedback to the user).
-    /// </summary>
-    /// <param name="getState">Gets the window state and a sub-model.</param>
-    /// <param name="createVM">Returns the view model for the window.</param>
-    /// <param name="getWindow">
-    ///   The function used to get and configure the window.
-    /// </param>
-    /// <param name="isModal">
-    ///   Specifies whether the window will be shown modally (using
-    ///   <c>Window.ShowDialog</c>, blocking the rest of the app) or non-modally (using
-    ///   <c>Window.Show</c>).
-    /// </param>
-    /// <param name="onCloseRequested">
-    ///   The message to be dispatched on external close attempts (the Close/X
-    ///   button, Alt+F4, or System Menu -> Close).
-    /// </param>
-    let id
-      (getState: 'model -> WindowState<'bindingModel>)
-      (createVM: ViewModelArgs<'bindingModel, 'bindingMsg> -> #IViewModel<'bindingModel, 'bindingMsg>)
-      getWindow isModal onCloseRequested =
-      SubModelWin.create getState createVM IViewModel.updateModel Func2.id2 getWindow isModal onCloseRequested
-      |> createBindingT
-
-
-  module SelectedIndex =
-    /// Prebuilt binding intended for use with <code>Selector.SelectedIndex</code>.
-    let vopt =
-      TwoWay.id
-      >> mapModel (ValueOption.defaultValue -1)
-      >> mapMsg (fun i -> if i < 0 then ValueNone else ValueSome i)
-
-    /// Prebuilt binding intended for use with <code>Selector.SelectedIndex</code>.
-    let opt =
-      vopt
-      >> mapModel ValueOption.ofOption
-      >> mapMsg ValueOption.toOption
-
-
-  module SubModelWin =
-
-    let internal create getState createViewModel updateViewModel toMsg getWindow isModal onCloseRequested =
-      SubModelWin.create getState createViewModel updateViewModel toMsg getWindow isModal onCloseRequested
-      |> createBinding
-
-
-  module SubModelSeqUnkeyed =
-
-    let internal create createViewModel updateViewModel =
-      SubModelSeqUnkeyed.create createViewModel updateViewModel
-      |> createBinding
-
-
-  module SubModelSeqKeyed =
-
-    let internal create createViewModel updateViewModel bmToId vmToId =
-      SubModelSeqKeyed.create createViewModel updateViewModel bmToId vmToId
-      |> createBinding
-
-
-module Bindings =
-
-  /// Maps the model of a list of bindings via a contravariant mapping.
-  let mapModel (f: 'a -> 'b) (bindings: Binding<'b, 'msg> list) = f |> Binding.mapModel |> List.map <| bindings
-
-  /// Maps the message of a list of bindings with access to the model via a covariant mapping.
-  let mapMsgWithModel (f: 'a -> 'model -> 'b) (bindings: Binding<'model, 'a> list) = f |> Binding.mapMsgWithModel |> List.map <| bindings
-
-  /// Maps the message of a list of bindings via a covariant mapping.
-  let mapMsg (f: 'a -> 'b) (bindings: Binding<'model, 'a> list) = f |> Binding.mapMsg |> List.map <| bindings
-
-
-[<AbstractClass; Sealed>]
-type Binding private () =
-
-  /// <summary>
-  ///   Creates a binding intended for use with <code>Selector.SelectedIndex</code>.
-  /// </summary>
-  /// <param name="get">Gets the selected index from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member selectedIndex
-      (get: 'model -> int voption,
-       set: int voption -> 'msg) =
-    Binding.SelectedIndex.vopt
-    >> Binding.mapModel get
-    >> Binding.mapMsg set
-
-  /// <summary>
-  ///   Creates a binding intended for use with <code>Selector.SelectedIndex</code>.
-  /// </summary>
-  /// <param name="get">Gets the selected index from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member selectedIndex
-      (get: 'model -> int option,
-       set: int option -> 'msg) =
-    Binding.SelectedIndex.opt
-    >> Binding.mapModel get
-    >> Binding.mapMsg set
-
-
-  /// <summary>Creates a one-way binding.</summary>
-  /// <param name="get">Gets the value from the model.</param>
-  static member oneWay
-      (get: 'model -> 'a)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWay.id<'a, 'msg>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-
-
-  /// <summary>
-  ///   Creates a one-way binding to an optional value. The binding
-  ///   automatically converts between the optional source value and an
-  ///   unwrapped (possibly
-  ///   <c>null</c>) value on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  static member oneWayOpt
-      (get: 'model -> 'a option)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWay.opt<'a, 'msg>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-
-
-  /// <summary>
-  ///   Creates a one-way binding to an optional value. The binding
-  ///   automatically converts between the optional source value and an
-  ///   unwrapped (possibly
-  ///   <c>null</c>) value on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  static member oneWayOpt
-      (get: 'model -> 'a voption)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWay.vopt<'a, 'msg>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-
-
-  /// <summary>
-  ///   Creates a lazily evaluated one-way binding. <paramref name="map" />
-  ///   will be called only when the output of <paramref name="get" /> changes,
-  ///   as determined by <paramref name="equals" />. This may have better
-  ///   performance than <see cref="oneWay" /> for expensive computations (but
-  ///   may be less performant for non-expensive functions due to additional
-  ///   overhead).
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="equals">
-  ///   Indicates whether two intermediate values are equal. Good candidates are
-  ///   <c>elmEq</c> and <c>refEq</c>.
-  /// </param>
-  /// <param name="map">Transforms the value into the final type.</param>
-  static member oneWayLazy
-      (get: 'model -> 'a,
-       equals: 'a -> 'a -> bool,
-       map: 'a -> 'b)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWay.id<'b, 'msg>
-    >> Binding.mapModel map
-    >> Binding.addLazy equals
-    >> Binding.mapModel get
-    >> Binding.addCaching
-
-
-  /// <summary>
-  ///   Creates a lazily evaluated one-way binding to an optional value. The
-  ///   binding automatically converts between the optional source value and an
-  ///   unwrapped (possibly <c>null</c>) value on the view side. <paramref
-  ///   name="map" /> will be called only when the output of <paramref
-  ///   name="get" /> changes, as determined by <paramref name="equals" />.
-  ///
-  ///   This may have better performance than a non-lazy binding for expensive
-  ///   computations (but may be less performant for non-expensive functions due
-  ///   to additional overhead).
-  /// </summary>
-  /// <param name="get">Gets the intermediate value from the model.</param>
-  /// <param name="equals">
-  ///   Indicates whether two intermediate values are equal. Good candidates are
-  ///   <c>elmEq</c> and <c>refEq</c>.
-  /// </param>
-  /// <param name="map">Transforms the intermediate value into the final
-  /// type.</param>
-  static member oneWayOptLazy
-      (get: 'model -> 'a,
-       equals: 'a -> 'a -> bool,
-       map: 'a -> 'b option)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWay.opt<'b, 'msg>
-    >> Binding.mapModel map
-    >> Binding.addLazy equals
-    >> Binding.mapModel get
-    >> Binding.addCaching
-
-
-  /// <summary>
-  ///   Creates a lazily evaluated one-way binding to an optional value. The
-  ///   binding automatically converts between the optional source value and an
-  ///   unwrapped (possibly <c>null</c>) value on the view side. <paramref
-  ///   name="map" /> will be called only when the output of <paramref
-  ///   name="get" /> changes, as determined by <paramref name="equals" />.
-  ///
-  ///   This may have better performance than a non-lazy binding for expensive
-  ///   computations (but may be less performant for non-expensive functions due
-  ///   to additional overhead).
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="equals">
-  ///   Indicates whether two intermediate values are equal. Good candidates are
-  ///   <c>elmEq</c> and <c>refEq</c>.
-  /// </param>
-  /// <param name="map">Transforms the intermediate value into the final
-  /// type.</param>
-  static member oneWayOptLazy
-      (get: 'model -> 'a,
-       equals: 'a -> 'a -> bool,
-       map: 'a -> 'b voption)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWay.vopt<'b, 'msg>
-    >> Binding.mapModel map
-    >> Binding.addLazy equals
-    >> Binding.mapModel get
-    >> Binding.addCaching
-
-
-  /// <summary>Creates a one-way-to-source binding.</summary>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member oneWayToSource
-      (set: 'a -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWayToSource.id<'model, 'a>
-    >> Binding.mapMsgWithModel set
-
-  /// <summary>
-  ///   Creates a one-way-to-source binding to an optional value. The binding
-  ///   automatically converts between a missing value in the model and
-  ///   a <c>null</c> value in the view.
-  /// </summary>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member oneWayToSourceOpt
-      (set: 'a option -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWayToSource.opt
-    >> Binding.mapMsgWithModel set
-
-  /// <summary>
-  ///   Creates a one-way-to-source binding to an optional value. The binding
-  ///   automatically converts between a missing value in the model and
-  ///   a <c>null</c> value in the view.
-  /// </summary>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member oneWayToSourceOpt
-      (set: 'a voption -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWayToSource.vopt
-    >> Binding.mapMsgWithModel set
-
-
-  /// <summary>
-  ///   Creates a one-way binding to a sequence of items, each uniquely
-  ///   identified by the value returned by <paramref name="getId"/>. The
-  ///   binding will not be updated if the output of <paramref name="get"/>
-  ///   does not change, as determined by <paramref name="equals"/>.
-  ///   The binding is backed by a persistent <c>ObservableCollection</c>, so
-  ///   only changed items (as determined by <paramref name="itemEquals"/>)
-  ///   will be replaced. If the items are complex and you want them updated
-  ///   instead of replaced, consider using <see cref="subModelSeq"/>.
-  /// </summary>
-  /// <param name="get">Gets the intermediate value from the model.</param>
-  /// <param name="equals">
-  ///   Indicates whether two intermediate values are equal. Good candidates are
-  ///   <c>elmEq</c> and <c>refEq</c>.
-  /// </param>
-  /// <param name="map">Transforms the value into the final collection.</param>
-  /// <param name="itemEquals">
-  ///   Indicates whether two collection items are equal. Good candidates are
-  ///   <c>elmEq</c>, <c>refEq</c>, or simply <c>(=)</c>.
-  /// </param>
-  /// <param name="getId">Gets a unique identifier for a collection
-  /// item.</param>
-  static member oneWaySeqLazy
-      (get: 'model -> 'a,
-       equals: 'a -> 'a -> bool,
-       map: 'a -> #seq<'b>,
-       itemEquals: 'b -> 'b -> bool,
-       getId: 'b -> 'id)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWaySeq.create map itemEquals getId
-    >> Binding.addLazy equals
-    >> Binding.mapModel get
-
-
-  /// <summary>
-  ///   Creates a one-way binding to a sequence of items, each uniquely
-  ///   identified by the value returned by <paramref name="getId"/>. The
-  ///   binding will not be updated if the output of <paramref name="get"/>
-  ///   is referentially equal. This is the same as calling
-  ///   <see cref="oneWaySeqLazy"/> with <c>equals = refEq</c> and
-  ///   <c>map = id</c>. The binding is backed by a persistent
-  ///   <c>ObservableCollection</c>, so only changed items (as determined by
-  ///   <paramref name="itemEquals"/>) will be replaced. If the items are
-  ///   complex and you want them updated instead of replaced, consider using
-  ///   <see cref="subModelSeq"/>.
-  /// </summary>
-  /// <param name="get">Gets the collection from the model.</param>
-  /// <param name="itemEquals">
-  ///   Indicates whether two collection items are equal. Good candidates are
-  ///   <c>elmEq</c>, <c>refEq</c>, or simply <c>(=)</c>.
-  /// </param>
-  /// <param name="getId">Gets a unique identifier for a collection
-  /// item.</param>
-  static member oneWaySeq
-      (get: 'model -> #seq<'a>,
-       itemEquals: 'a -> 'a -> bool,
-       getId: 'a -> 'id)
-      : string -> Binding<'model, 'msg> =
-    Binding.OneWaySeq.create id itemEquals getId
-    >> Binding.addLazy refEq
-    >> Binding.mapModel get
-
-
-  /// <summary>Creates a two-way binding.</summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member twoWay
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.id<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-
-  /// <summary>Creates a two-way binding.</summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWay
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWay (get, set)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value. The binding
-  ///   automatically converts between the optional source value and an
-  ///   unwrapped (possibly <c>null</c>) value on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member twoWayOpt
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.opt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value. The binding
-  ///   automatically converts between the optional source value and an
-  ///   unwrapped (possibly <c>null</c>) value on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOpt
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOpt (get, set)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value. The binding
-  ///   automatically converts between the optional source value and an
-  ///   unwrapped (possibly <c>null</c>) value on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  static member twoWayOpt
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.vopt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value. The binding
-  ///   automatically converts between the optional source value and an
-  ///   unwrapped (possibly <c>null</c>) value on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOpt
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOpt (get, set)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation messages from the updated model.
-  /// </param>
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> string list)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.id<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation validate
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation messages from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> string list,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> string voption)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.id<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> ValueOption.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> string voption,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> string option)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.id<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> Option.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> string option,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> Result<'ignored, string>)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.id<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding with validation using
-  ///   <c>INotifyDataErrorInfo</c>.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayValidate
-      (get: 'model -> 'a,
-       set: 'a -> 'model -> 'msg,
-       validate: 'model -> Result<'ignored, string>,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation messages from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> string list)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.vopt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation validate
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation messages from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> string list,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> string voption)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.vopt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> ValueOption.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> string voption,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> string option)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.vopt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> Option.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> string option,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> Result<'ignored, string>)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.vopt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a voption,
-       set: 'a voption -> 'model -> 'msg,
-       validate: 'model -> Result<'ignored, string>,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation messages from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> string list)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.opt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation validate
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation messages from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> string list,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> string voption)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.opt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> ValueOption.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> string voption,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> string option)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.opt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> Option.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> string option,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> Result<'ignored, string>)
-      : string -> Binding<'model, 'msg> =
-    Binding.TwoWay.opt<'a>
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
-
-  /// <summary>
-  ///   Creates a two-way binding to an optional value with validation using
-  ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
-  ///   the optional source value and an unwrapped (possibly <c>null</c>) value
-  ///   on the view side.
-  /// </summary>
-  /// <param name="get">Gets the value from the model.</param>
-  /// <param name="set">Returns the message to dispatch.</param>
-  /// <param name="validate">
-  ///   Returns the validation message from the updated model.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member twoWayOptValidate
-      (get: 'model -> 'a option,
-       set: 'a option -> 'model -> 'msg,
-       validate: 'model -> Result<'ignored, string>,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.twoWayOptValidate (get, set, validate)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends only on the model (not the
-  ///   <c>CommandParameter</c>) and can always execute.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  static member cmd
-      (exec: 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.create
-      (exec >> ValueSome)
-      (fun _ -> true)
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends only on the model (not the
-  ///   <c>CommandParameter</c>) and can always execute.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmd
-      (exec: 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmd exec
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="canExec" />
-  ///   returns <c>true</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="canExec">Indicates whether the command can execute.</param>
-  static member cmdIf
-      (exec: 'model -> 'msg,
-       canExec: 'model -> bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.create
-      (exec >> ValueSome)
-      canExec
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="canExec" />
-  ///   returns <c>true</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="canExec">Indicates whether the command can execute.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdIf
-      (exec: 'model -> 'msg,
-       canExec: 'model -> bool,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdIf (exec, canExec)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="exec" />
-  ///   returns <c>ValueSome</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  static member cmdIf
-      (exec: 'model -> 'msg voption)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.create
-      exec
-      (exec >> ValueOption.isSome)
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="exec" />
-  ///   returns <c>ValueSome</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdIf
-      (exec: 'model -> 'msg voption,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdIf exec
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="exec" />
-  ///   returns <c>Some</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  static member cmdIf
-      (exec: 'model -> 'msg option)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.create
-      (exec >> ValueOption.ofOption)
-      (exec >> Option.isSome)
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="exec" />
-  ///   returns <c>Some</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdIf
-      (exec: 'model -> 'msg option,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdIf exec
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="exec" />
-  ///   returns <c>Ok</c>.
-  ///
-  ///   This overload allows more easily re-using the same validation functions
-  ///   for inputs and commands.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  static member cmdIf
-      (exec: 'model -> Result<'msg, 'ignored>)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.create
-      (exec >> ValueOption.ofOk)
-      (exec >> Result.isOk)
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends only on the
-  ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
-  ///   name="exec" />
-  ///   returns <c>Ok</c>.
-  ///
-  ///   This overload allows more easily re-using the same validation functions
-  ///   for inputs and commands.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdIf
-      (exec: 'model -> Result<'msg, 'ignored>,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdIf exec
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can always execute.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  static member cmdParam
-      (exec: obj -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.createWithParam
-      (fun p model -> exec p model |> ValueSome)
-      (fun _ _ -> true)
-      false
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can always execute.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParam
-      (exec: obj -> 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParam exec
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="canExec">Indicates whether the command can execute.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg,
-       canExec: obj -> 'model -> bool,
-       ?uiBoundCmdParam: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.createWithParam
-      (fun p m -> exec p m |> ValueSome)
-      canExec
-      (defaultArg uiBoundCmdParam false)
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="canExec">Indicates whether the command can execute.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg,
-       canExec: obj -> 'model -> bool,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf (exec, canExec)
-    >> Binding.alterMsgStream wrapDispatch
-
-  /// <summary>
-  ///   Creates a <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="canExec">Indicates whether the command can execute.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg,
-       canExec: obj -> 'model -> bool,
-       uiBoundCmdParam: bool,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf (exec, canExec, uiBoundCmdParam)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg voption,
-       ?uiBoundCmdParam: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.createWithParam
-      exec
-      (fun p m -> exec p m |> ValueOption.isSome)
-      (defaultArg uiBoundCmdParam false)
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg voption,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf exec
-    >> Binding.alterMsgStream wrapDispatch
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg voption,
-       uiBoundCmdParam: bool,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf (exec, uiBoundCmdParam)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg option,
-       ?uiBoundCmdParam: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.createWithParam
-      (fun p m -> exec p m |> ValueOption.ofOption)
-      (fun p m -> exec p m |> Option.isSome)
-      (defaultArg uiBoundCmdParam false)
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg option,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf exec
-    >> Binding.alterMsgStream wrapDispatch
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> 'msg option,
-       uiBoundCmdParam: bool,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf (exec, uiBoundCmdParam)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
-  ///
-  ///   This overload allows more easily re-using the same validation functions
-  ///   for inputs and commands.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  static member cmdParamIf
-      (exec: obj -> 'model -> Result<'msg, 'ignored>,
-       ?uiBoundCmdParam: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.Cmd.createWithParam
-      (fun p m -> exec p m |> ValueOption.ofOk)
-      (fun p m -> exec p m |> Result.isOk)
-      (defaultArg uiBoundCmdParam false)
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
-  ///
-  ///   This overload allows more easily re-using the same validation functions
-  ///   for inputs and commands.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> Result<'msg, 'ignored>,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf exec
-    >> Binding.alterMsgStream wrapDispatch
-
-  /// <summary>
-  ///   Creates a conditional <c>Command</c> binding that depends on the
-  ///   <c>CommandParameter</c>
-  ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
-  ///
-  ///   This overload allows more easily re-using the same validation functions
-  ///   for inputs and commands.
-  /// </summary>
-  /// <param name="exec">Returns the message to dispatch.</param>
-  /// <param name="uiBoundCmdParam">
-  ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-  ///   <c>CommandManager</c>
-  ///   detects UI changes that could potentially influence the command's
-  ///   ability to execute. This will likely lead to many more triggers than
-  ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-  ///   to another UI property.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member cmdParamIf
-      (exec: obj -> 'model -> Result<'msg, 'ignored>,
-       uiBoundCmdParam: bool,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.cmdParamIf (exec, uiBoundCmdParam)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings and
-  ///   message type. You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="toBindingModel">
-  ///   Converts the models to the model used by the bindings.
-  /// </param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use \"Binding.SubModel.required\" followed by model and message mapping functions as needed.  For an example, see how this method is implemented.")>]
-  static member subModel
-      (getSubModel: 'model -> 'subModel,
-       toBindingModel: 'model * 'subModel -> 'bindingModel,
-       toMsg: 'bindingMsg -> 'msg,
-       bindings: unit -> Binding<'bindingModel, 'bindingMsg> list)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.required bindings
-    >> Binding.mapModel (fun m -> toBindingModel (m, getSubModel m))
-    >> Binding.mapMsg toMsg
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings and
-  ///   message type. You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use \"Binding.SubModel.required\" followed by model and message mapping functions as needed.  For an example, see how this method is implemented.")>]
-  static member subModel
-      (getSubModel: 'model -> 'subModel,
-       toMsg: 'subMsg -> 'msg,
-       bindings: unit -> Binding<'model * 'subModel, 'subMsg> list)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.required bindings
-    >> Binding.mapModel (fun m -> (m, getSubModel m))
-    >> Binding.mapMsg toMsg
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings.
-  ///   You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  [<System.Obsolete("In version 5, the type of the argument \"bindings\" will be changed to \"unit -> Binding<'model, 'msg> list\".  To avoid a compile error when upgrading, replace this method call with its implementation.")>]
-  static member subModel
-      (getSubModel: 'model -> 'subModel,
-       bindings: unit -> Binding<'model * 'subModel, 'msg> list)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.required bindings
-    >> Binding.mapModel (fun m -> (m, getSubModel m))
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings and
-  ///   message type, and may not exist. If it does not exist, bindings to this
-  ///   model will return <c>null</c> unless <paramref name="sticky" /> is
-  ///   <c>true</c>, in which case the last non-<c>null</c> model will be
-  ///   returned. You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  ///
-  ///   The 'sticky' part is useful if you want to e.g. animate away a
-  ///   <c>UserControl</c> when the model is missing, but don't want the data
-  ///   used by that control to be cleared once the animation starts. (The
-  ///   animation must be triggered using another binding since this will never
-  ///   return <c>null</c>.)
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="toBindingModel">
-  ///   Converts the models to the model used by the bindings.
-  /// </param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="sticky">
-  ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
-  ///   model will be returned instead of <c>null</c>.
-  /// </param>
-  [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
-  static member subModelOpt
-      (getSubModel: 'model -> 'subModel voption,
-       toBindingModel: 'model * 'subModel -> 'bindingModel,
-       toMsg: 'bindingMsg -> 'msg,
-       bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
-       ?sticky: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.vopt bindings
-    >> if (defaultArg sticky false) then Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone) else id
-    >> Binding.mapModel (fun m -> getSubModel m |> ValueOption.map (fun sub -> toBindingModel (m, sub)))
-    >> Binding.mapMsg toMsg
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings and
-  ///   message type, and may not exist. If it does not exist, bindings to this
-  ///   model will return <c>null</c> unless <paramref name="sticky" /> is
-  ///   <c>true</c>, in which case the last non-<c>null</c> model will be
-  ///   returned. You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  ///
-  ///   The 'sticky' part is useful if you want to e.g. animate away a
-  ///   <c>UserControl</c> when the model is missing, but don't want the data
-  ///   used by that control to be cleared once the animation starts. (The
-  ///   animation must be triggered using another binding since this will never
-  ///   return <c>null</c>.)
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="toBindingModel">
-  ///   Converts the models to the model used by the bindings.
-  /// </param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="sticky">
-  ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
-  ///   model will be returned instead of <c>null</c>.
-  /// </param>
-  [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
-  static member subModelOpt
-      (getSubModel: 'model -> 'subModel option,
-       toBindingModel: 'model * 'subModel -> 'bindingModel,
-       toMsg: 'bindingMsg -> 'msg,
-       bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
-       ?sticky: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.opt bindings
-    >> if (defaultArg sticky false) then Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone) else id
-    >> Binding.mapModel (fun m -> getSubModel m |> Option.map (fun sub -> toBindingModel (m, sub)))
-    >> Binding.mapMsg toMsg
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings and
-  ///   message type, and may not exist. If it does not exist, bindings to this
-  ///   model will return <c>null</c> unless <paramref name="sticky" /> is
-  ///   <c>true</c>, in which case the last non-<c>null</c> model will be
-  ///   returned. You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  ///
-  ///   The 'sticky' part is useful if you want to e.g. animate away a
-  ///   <c>UserControl</c> when the model is missing, but don't want the data
-  ///   used by that control to be cleared once the animation starts. (The
-  ///   animation must be triggered using another binding since this will never
-  ///   return <c>null</c>.)
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="sticky">
-  ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
-  ///   model will be returned instead of <c>null</c>.
-  /// </param>
-  [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
-  static member subModelOpt
-      (getSubModel: 'model -> 'subModel voption,
-       toMsg: 'subMsg -> 'msg,
-       bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
-       ?sticky: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.vopt bindings
-    >> if (defaultArg sticky false) then Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone) else id
-    >> Binding.mapModel (fun m -> getSubModel m |> ValueOption.map (fun sub -> (m, sub)))
-    >> Binding.mapMsg toMsg
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings and
-  ///   message type, and may not exist. If it does not exist, bindings to this
-  ///   model will return <c>null</c> unless <paramref name="sticky" /> is
-  ///   <c>true</c>, in which case the last non-<c>null</c> model will be
-  ///   returned. You typically bind this to the <c>DataContext</c> of a
-  ///   <c>UserControl</c> or similar.
-  ///
-  ///   The 'sticky' part is useful if you want to e.g. animate away a
-  ///   <c>UserControl</c> when the model is missing, but don't want the data
-  ///   used by that control to be cleared once the animation starts. (The
-  ///   animation must be triggered using another binding since this will never
-  ///   return <c>null</c>.)
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="sticky">
-  ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
-  ///   model will be returned instead of <c>null</c>.
-  /// </param>
-  [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
-  static member subModelOpt
-      (getSubModel: 'model -> 'subModel option,
-       toMsg: 'subMsg -> 'msg,
-       bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
-       ?sticky: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.opt bindings
-    >> if (defaultArg sticky false) then Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone) else id
-    >> Binding.mapModel (fun m -> getSubModel m |> Option.map (fun sub -> (m, sub)))
-    >> Binding.mapMsg toMsg
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings,
-  ///   and may not exist. If it does not exist, bindings to this model will
-  ///   return <c>null</c> unless <paramref name="sticky" /> is <c>true</c>, in
-  ///   which case the last non-<c>null</c> model will be returned. You
-  ///   typically bind this to the <c>DataContext</c> of a <c>UserControl</c> or
-  ///   similar.
-  ///
-  ///   The 'sticky' part is useful if you want to e.g. animate away a
-  ///   <c>UserControl</c> when the model is missing, but don't want the data
-  ///   used by that control to be cleared once the animation starts. (The
-  ///   animation must be triggered using another binding since this will never
-  ///   return <c>null</c>.)
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="sticky">
-  ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
-  ///   model will be returned instead of <c>null</c>.
-  /// </param>
-  [<System.Obsolete("In version 5, the type of the argument \"bindings\" will be changed to \"unit -> Binding<'model, 'msg> list\".  To avoid a compile error when upgrading, replace this method call with (a specialization of) its implementation.")>]
-  static member subModelOpt
-      (getSubModel: 'model -> 'subModel voption,
-       bindings: unit -> Binding<'model * 'subModel, 'msg> list,
-       ?sticky: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.vopt bindings
-    >> if (defaultArg sticky false) then Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone) else id
-    >> Binding.mapModel (fun m -> getSubModel m |> ValueOption.map (fun sub -> (m, sub)))
-
-
-  /// <summary>
-  ///   Creates a binding to a sub-model/component that has its own bindings,
-  ///   and may not exist. If it does not exist, bindings to this model will
-  ///   return <c>null</c> unless <paramref name="sticky" /> is <c>true</c>, in
-  ///   which case the last non-<c>null</c> model will be returned. You
-  ///   typically bind this to the <c>DataContext</c> of a <c>UserControl</c> or
-  ///   similar.
-  ///
-  ///   The 'sticky' part is useful if you want to e.g. animate away a
-  ///   <c>UserControl</c> when the model is missing, but don't want the data
-  ///   used by that control to be cleared once the animation starts. (The
-  ///   animation must be triggered using another binding since this will never
-  ///   return <c>null</c>.)
-  /// </summary>
-  /// <param name="getSubModel">Gets the sub-model from the model.</param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="sticky">
-  ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
-  ///   model will be returned instead of <c>null</c>.
-  /// </param>
-  [<System.Obsolete("In version 5, the type of the argument \"bindings\" will be changed to \"unit -> Binding<'model, 'msg> list\".  To avoid a compile error when upgrading, replace this method call with (a specialization of) its implementation.")>]
-  static member subModelOpt
-      (getSubModel: 'model -> 'subModel option,
-       bindings: unit -> Binding<'model * 'subModel, 'msg> list,
-       ?sticky: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModel.opt bindings
-    >> if (defaultArg sticky false) then Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone) else id
-    >> Binding.mapModel (fun m -> getSubModel m |> Option.map (fun sub -> (m, sub)))
-
-
-  /// <summary>
-  ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (neither in code
-  ///   nor XAML).
-  ///
-  ///   The window can only be closed/hidden by changing the return value of
-  ///   <paramref name="getState" />, and can not be directly closed by the
-  ///   user. External close attempts (the Close/X button, Alt+F4, or System
-  ///   Menu -> Close) will cause the message specified by
-  ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-  ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-  ///   will not confuse a user trying to close the window (e.g. by closing it,
-  ///   or displaying relevant feedback to the user.)
-  ///
-  ///   If you don't need a sub-model, you can use
-  ///   <c>WindowState&lt;unit&gt;</c> to just control the Window visibility,
-  ///   and pass <c>fst</c> to <paramref name="toBindingModel" />.
-  /// </summary>
-  /// <param name="getState">Gets the window state and a sub-model.</param>
-  /// <param name="toBindingModel">
-  ///   Converts the models to the model used by the bindings.
-  /// </param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="getWindow">
-  ///   The function used to get and configure the window.
-  /// </param>
-  /// <param name="onCloseRequested">
-  ///   The message to be dispatched on external close attempts (the Close/X
-  ///   button, Alt+F4, or System Menu -> Close).
-  /// </param>
-  /// <param name="isModal">
-  ///   Specifies whether the window will be shown modally (using
-  ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
-  ///   window.Show).
-  /// </param>
-  static member subModelWin
-      (getState: 'model -> WindowState<'subModel>,
-       toBindingModel: 'model * 'subModel -> 'bindingModel,
-       toMsg: 'bindingMsg -> 'msg,
-       bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
-       getWindow: 'model -> Dispatch<'msg> -> #Window,
-       ?onCloseRequested: 'msg,
-       ?isModal: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelWin.create
-      (fun m -> getState m |> WindowState.map (fun sub -> toBindingModel (m, sub)))
-      (fun args -> DynamicViewModel<'bindingModel, 'bindingMsg>(args, bindings ()))
-      IViewModel.updateModel
-      (fun _ -> toMsg)
-      (fun m d -> upcast getWindow m d)
-      (defaultArg isModal false)
-      (fun _ -> defaultArg (onCloseRequested |> Option.map ValueSome) ValueNone)
-
-
-  /// <summary>
-  ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (neither in code
-  ///   nor XAML).
-  ///
-  ///   The window can only be closed/hidden by changing the return value of
-  ///   <paramref name="getState" />, and can not be directly closed by the
-  ///   user. External close attempts (the Close/X button, Alt+F4, or System
-  ///   Menu -> Close) will cause the message specified by
-  ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-  ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-  ///   will not confuse a user trying to close the window (e.g. by closing it,
-  ///   or displaying relevant feedback to the user.)
-  ///
-  ///   If you don't need a sub-model, you can use
-  ///   <c>WindowState&lt;unit&gt;</c> to just control the Window visibility,
-  ///   and pass <c>fst</c> to <paramref name="toBindingModel" />.
-  /// </summary>
-  /// <param name="getState">Gets the window state and a sub-model.</param>
-  /// <param name="toBindingModel">
-  ///   Converts the models to the model used by the bindings.
-  /// </param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="getWindow">
-  ///   The function used to get and configure the window.
-  /// </param>
-  /// <param name="onCloseRequested">
-  ///   The message to be dispatched on external close attempts (the Close/X
-  ///   button, Alt+F4, or System Menu -> Close).
-  /// </param>
-  /// <param name="isModal">
-  ///   Specifies whether the window will be shown modally (using
-  ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
-  ///   window.Show).
-  /// </param>
-  static member subModelWin
-      (getState: 'model -> WindowState<'subModel>,
-       toBindingModel: 'model * 'subModel -> 'bindingModel,
-       toMsg: 'bindingMsg -> 'msg,
-       bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
-       getWindow: unit -> #Window,
-       ?onCloseRequested: 'msg,
-       ?isModal: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.subModelWin(
-      getState,
-      toBindingModel,
-      toMsg,
-      bindings,
-      (fun _ _ -> getWindow ()),
-      ?onCloseRequested = onCloseRequested,
-      ?isModal = isModal
-    )
-
-
-  /// <summary>
-  ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (neither in code
-  ///   nor XAML).
-  ///
-  ///   The window can only be closed/hidden by changing the return value of
-  ///   <paramref name="getState" />, and can not be directly closed by the
-  ///   user. External close attempts (the Close/X button, Alt+F4, or System
-  ///   Menu -> Close) will cause the message specified by
-  ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-  ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-  ///   will not confuse a user trying to close the window (e.g. by closing it,
-  ///   or displaying relevant feedback to the user.)
-  /// </summary>
-  /// <param name="getState">Gets the window state and a sub-model.</param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="getWindow">
-  ///   The function used to get and configure the window.
-  /// </param>
-  /// <param name="onCloseRequested">
-  ///   The message to be dispatched on external close attempts (the Close/X
-  ///   button, Alt+F4, or System Menu -> Close).
-  /// </param>
-  /// <param name="isModal">
-  ///   Specifies whether the window will be shown modally (using
-  ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
-  ///   window.Show).
-  /// </param>
-  static member subModelWin
-      (getState: 'model -> WindowState<'subModel>,
-       toMsg: 'subMsg -> 'msg,
-       bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
-       getWindow: 'model -> Dispatch<'msg> -> #Window,
-       ?onCloseRequested: 'msg,
-       ?isModal: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelWin.create
-      (fun m -> getState m |> WindowState.map (fun sub -> (m, sub)))
-      (fun args -> DynamicViewModel<'model * 'subModel, 'subMsg>(args, bindings ()))
-      IViewModel.updateModel
-      (fun _ -> toMsg)
-      (fun m d -> upcast getWindow m d)
-      (defaultArg isModal false)
-      (fun _ -> defaultArg (onCloseRequested |> Option.map ValueSome) ValueNone)
-
-
-  /// <summary>
-  ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (neither in code
-  ///   nor XAML).
-  ///
-  ///   The window can only be closed/hidden by changing the return value of
-  ///   <paramref name="getState" />, and can not be directly closed by the
-  ///   user. External close attempts (the Close/X button, Alt+F4, or System
-  ///   Menu -> Close) will cause the message specified by
-  ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-  ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-  ///   will not confuse a user trying to close the window (e.g. by closing it,
-  ///   or displaying relevant feedback to the user.)
-  /// </summary>
-  /// <param name="getState">Gets the window state and a sub-model.</param>
-  /// <param name="toMsg">
-  ///   Converts the messages used in the bindings to parent model messages
-  ///   (e.g. a parent message union case that wraps the child message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="getWindow">
-  ///   The function used to get and configure the window.
-  /// </param>
-  /// <param name="onCloseRequested">
-  ///   The message to be dispatched on external close attempts (the Close/X
-  ///   button, Alt+F4, or System Menu -> Close).
-  /// </param>
-  /// <param name="isModal">
-  ///   Specifies whether the window will be shown modally (using
-  ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
-  ///   window.Show).
-  /// </param>
-  static member subModelWin
-      (getState: 'model -> WindowState<'subModel>,
-       toMsg: 'subMsg -> 'msg,
-       bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
-       getWindow: unit -> #Window,
-       ?onCloseRequested: 'msg,
-       ?isModal: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.subModelWin(
-      getState,
-      toMsg,
-      bindings,
-      (fun _ _ -> getWindow ()),
-      ?onCloseRequested = onCloseRequested,
-      ?isModal = isModal
-    )
-
-
-  /// <summary>
-  ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (neither in code
-  ///   nor XAML).
-  ///
-  ///   The window can only be closed/hidden by changing the return value of
-  ///   <paramref name="getState" />, and can not be directly closed by the
-  ///   user. External close attempts (the Close/X button, Alt+F4, or System
-  ///   Menu -> Close) will cause the message specified by
-  ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-  ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-  ///   will not confuse a user trying to close the window (e.g. by closing it,
-  ///   or displaying relevant feedback to the user.)
-  /// </summary>
-  /// <param name="getState">Gets the window state and a sub-model.</param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="getWindow">
-  ///   The function used to get and configure the window.
-  /// </param>
-  /// <param name="onCloseRequested">
-  ///   The message to be dispatched on external close attempts (the Close/X
-  ///   button, Alt+F4, or System Menu -> Close).
-  /// </param>
-  /// <param name="isModal">
-  ///   Specifies whether the window will be shown modally (using
-  ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
-  ///   window.Show).
-  /// </param>
-  static member subModelWin
-      (getState: 'model -> WindowState<'subModel>,
-       bindings: unit -> Binding<'model * 'subModel, 'msg> list,
-       getWindow: 'model -> Dispatch<'msg> -> #Window,
-       ?onCloseRequested: 'msg,
-       ?isModal: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelWin.create
-      (fun m -> getState m |> WindowState.map (fun sub -> (m, sub)))
-      (fun args -> DynamicViewModel<'model * 'subModel, 'msg>(args, bindings ()))
-      IViewModel.updateModel
-      (fun _ -> id)
-      (fun m d -> upcast getWindow m d)
-      (defaultArg isModal false)
-      (fun _ -> defaultArg (onCloseRequested |> Option.map ValueSome) ValueNone)
-
-
-  /// <summary>
-  ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
-  ///   to show/hide/close a new window that will have the specified bindings as
-  ///   its <c>DataContext</c>.
-  ///
-  ///   You do not need to set the <c>DataContext</c> yourself (neither in code
-  ///   nor XAML).
-  ///
-  ///   The window can only be closed/hidden by changing the return value of
-  ///   <paramref name="getState" />, and can not be directly closed by the
-  ///   user. External close attempts (the Close/X button, Alt+F4, or System
-  ///   Menu -> Close) will cause the message specified by
-  ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
-  ///   <paramref name="onCloseRequested" /> and react to this in a manner that
-  ///   will not confuse a user trying to close the window (e.g. by closing it,
-  ///   or displaying relevant feedback to the user.)
-  /// </summary>
-  /// <param name="getState">Gets the window state and a sub-model.</param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  /// <param name="getWindow">
-  ///   The function used to get and configure the window.
-  /// </param>
-  /// <param name="onCloseRequested">
-  ///   The message to be dispatched on external close attempts (the Close/X
-  ///   button, Alt+F4, or System Menu -> Close).
-  /// </param>
-  /// <param name="isModal">
-  ///   Specifies whether the window will be shown modally (using
-  ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
-  ///   window.Show).
-  /// </param>
-  static member subModelWin
-      (getState: 'model -> WindowState<'subModel>,
-       bindings: unit -> Binding<'model * 'subModel, 'msg> list,
-       getWindow: unit -> #Window,
-       ?onCloseRequested: 'msg,
-       ?isModal: bool)
-      : string -> Binding<'model, 'msg> =
-    Binding.subModelWin(
-      getState,
-      bindings,
-      (fun _ _ -> getWindow ()),
-      ?onCloseRequested = onCloseRequested,
-      ?isModal = isModal
-    )
-
-  static member subModelSeq // TODO: make into function
-      (getBindings: unit -> Binding<'model, 'msg> list)
-      : string -> Binding<'model seq, int * 'msg> =
-    Binding.SubModelSeqUnkeyed.create
-      (fun args -> DynamicViewModel<'model, 'msg>(args, getBindings ()))
-      IViewModel.updateModel
-
-  static member subModelSeq // TODO: make into function
-      (getBindings: unit -> Binding<'model, 'msg> list,
-       getId: 'model -> 'id)
-      : string -> Binding<'model seq, 'id * 'msg> =
-    Binding.SubModelSeqKeyed.create
-      (fun args -> DynamicViewModel<'model, 'msg>(args, getBindings ()))
-      IViewModel.updateModel
-      getId
-      (IViewModel.currentModel >> getId)
-
-
-  /// <summary>
-  ///   Creates a binding to a sequence of sub-models, each uniquely identified
-  ///   by the value returned by <paramref name="getId" />. The sub-models have
-  ///   their own bindings and message type. You typically bind this to the
-  ///   <c>ItemsSource</c> of an <c>ItemsControl</c>, <c>ListView</c>,
-  ///   <c>TreeView</c>, etc.
-  /// </summary>
-  /// <param name="getSubModels">Gets the sub-models from the model.</param>
-  /// <param name="toBindingModel">
-  ///   Converts the models to the model used by the bindings.
-  /// </param>
-  /// <param name="getId">Gets a unique identifier for a sub-model.</param>
-  /// <param name="toMsg">
-  ///   Converts the sub-model ID and messages used in the bindings to parent
-  ///   model messages (e.g. a parent message union case that wraps the
-  ///   sub-model ID and message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  static member subModelSeq
-      (getSubModels: 'model -> #seq<'subModel>,
-       toBindingModel: 'model * 'subModel -> 'bindingModel,
-       getId: 'bindingModel -> 'id,
-       toMsg: 'id * 'bindingMsg -> 'msg,
-       bindings: unit -> Binding<'bindingModel, 'bindingMsg> list)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelSeqKeyed.create
-      (fun args -> DynamicViewModel<'bindingModel, 'bindingMsg>(args, bindings ()))
-      IViewModel.updateModel
-      getId
-      (IViewModel.currentModel >> getId)
-    >> Binding.mapModel (fun m -> getSubModels m |> Seq.map (fun sub -> toBindingModel (m, sub)))
-    >> Binding.mapMsg toMsg
-
-
-  /// <summary>
-  ///   Creates a binding to a sequence of sub-models, each uniquely identified
-  ///   by the value returned by <paramref name="getId" />. The sub-models have
-  ///   their own bindings and message type. You typically bind this to the
-  ///   <c>ItemsSource</c> of an <c>ItemsControl</c>, <c>ListView</c>,
-  ///   <c>TreeView</c>, etc.
-  /// </summary>
-  /// <param name="getSubModels">Gets the sub-models from the model.</param>
-  /// <param name="getId">Gets a unique identifier for a sub-model.</param>
-  /// <param name="toMsg">
-  ///   Converts the sub-model ID and messages used in the bindings to parent
-  ///   model messages (e.g. a parent message union case that wraps the
-  ///   sub-model ID and message type).
-  /// </param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  static member subModelSeq
-      (getSubModels: 'model -> #seq<'subModel>,
-       getId: 'subModel -> 'id,
-       toMsg: 'id * 'subMsg -> 'msg,
-       bindings: unit -> Binding<'model * 'subModel, 'subMsg> list)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelSeqKeyed.create
-      (fun args -> DynamicViewModel<'model * 'subModel, 'subMsg>(args, bindings ()))
-      IViewModel.updateModel
-      (snd >> getId)
-      (IViewModel.currentModel >> snd >> getId)
-    >> Binding.mapModel (fun m -> getSubModels m |> Seq.map (fun sub -> (m, sub)))
-    >> Binding.mapMsg toMsg
-
-
-  /// <summary>
-  ///   Creates a binding to a sequence of sub-models, each uniquely identified
-  ///   by the value returned by <paramref name="getId" />. The sub-models have
-  ///   their own bindings. You typically bind this to the <c>ItemsSource</c> of
-  ///   an
-  ///   <c>ItemsControl</c>, <c>ListView</c>, <c>TreeView</c>, etc.
-  /// </summary>
-  /// <param name="getSubModels">Gets the sub-models from the model.</param>
-  /// <param name="getId">Gets a unique identifier for a sub-model.</param>
-  /// <param name="bindings">Returns the bindings for the sub-model.</param>
-  static member subModelSeq
-      (getSubModels: 'model -> #seq<'subModel>,
-       getId: 'subModel -> 'id,
-       bindings: unit -> Binding<'model * 'subModel, 'msg> list)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelSeqKeyed.create
-      (fun args -> DynamicViewModel<'model * 'subModel, 'msg>(args, bindings ()))
-      IViewModel.updateModel
-      (snd >> getId)
-      (IViewModel.currentModel >> snd >> getId)
-    >> Binding.mapModel (fun m -> getSubModels m |> Seq.map (fun sub -> (m, sub)))
-    >> Binding.mapMsg snd
-
-
-  /// <summary>
-  ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-  ///   the
-  ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-  ///   binding. Automatically converts the dynamically created Elmish.WPF view
-  ///   models to/from their corresponding IDs, so the Elmish user code only has
-  ///   to work with the IDs.
-  ///
-  ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
-  ///   or
-  ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-  ///   binding. This binding is less type-safe. It will throw when initializing
-  ///   the bindings if <paramref name="subModelSeqBindingName" />
-  ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
-  ///   throw at runtime if the inferred <c>'id</c> type does not match the
-  ///   actual ID type used in that binding.
-  /// </summary>
-  /// <param name="subModelSeqBindingName">
-  ///   The name of the <see cref="subModelSeq" /> binding used as the items
-  ///   source.
-  /// </param>
-  /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-  /// model.</param>
-  /// <param name="set">
-  ///   Returns the message to dispatch on selections/de-selections.
-  /// </param>
-  static member subModelSelectedItem
-      (subModelSeqBindingName: string,
-       get: 'model -> 'id voption,
-       set: 'id voption -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelSelectedItem.vopt subModelSeqBindingName
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addCaching
-
-  /// <summary>
-  ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-  ///   the
-  ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-  ///   binding. Automatically converts the dynamically created Elmish.WPF view
-  ///   models to/from their corresponding IDs, so the Elmish user code only has
-  ///   to work with the IDs.
-  ///
-  ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
-  ///   or
-  ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-  ///   binding. This binding is less type-safe. It will throw when initializing
-  ///   the bindings if <paramref name="subModelSeqBindingName" />
-  ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
-  ///   throw at runtime if the inferred <c>'id</c> type does not match the
-  ///   actual ID type used in that binding.
-  /// </summary>
-  /// <param name="subModelSeqBindingName">
-  ///   The name of the <see cref="subModelSeq" /> binding used as the items
-  ///   source.
-  /// </param>
-  /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-  /// model.</param>
-  /// <param name="set">
-  ///   Returns the message to dispatch on selections/de-selections.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member subModelSelectedItem
-      (subModelSeqBindingName: string,
-       get: 'model -> 'id voption,
-       set: 'id voption -> 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-  /// <summary>
-  ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-  ///   the
-  ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-  ///   binding. Automatically converts the dynamically created Elmish.WPF view
-  ///   models to/from their corresponding IDs, so the Elmish user code only has
-  ///   to work with the IDs.
-  ///
-  ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
-  ///   or
-  ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-  ///   binding. This binding is less type-safe. It will throw when initializing
-  ///   the bindings if <paramref name="subModelSeqBindingName" />
-  ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
-  ///   throw at runtime if the inferred <c>'id</c> type does not match the
-  ///   actual ID type used in that binding.
-  /// </summary>
-  /// <param name="subModelSeqBindingName">
-  ///   The name of the <see cref="subModelSeq" /> binding used as the items
-  ///   source.
-  /// </param>
-  /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-  /// model.</param>
-  /// <param name="set">
-  ///   Returns the message to dispatch on selections/de-selections.
-  /// </param>
-  static member subModelSelectedItem
-      (subModelSeqBindingName: string,
-       get: 'model -> 'id option,
-       set: 'id option -> 'model -> 'msg)
-      : string -> Binding<'model, 'msg> =
-    Binding.SubModelSelectedItem.opt subModelSeqBindingName
-    >> Binding.addLazy (=)
-    >> Binding.mapModel get
-    >> Binding.mapMsgWithModel set
-    >> Binding.addCaching
-
-  /// <summary>
-  ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-  ///   the
-  ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-  ///   binding. Automatically converts the dynamically created Elmish.WPF view
-  ///   models to/from their corresponding IDs, so the Elmish user code only has
-  ///   to work with the IDs.
-  ///
-  ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
-  ///   or
-  ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-  ///   binding. This binding is less type-safe. It will throw when initializing
-  ///   the bindings if <paramref name="subModelSeqBindingName" />
-  ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
-  ///   throw at runtime if the inferred <c>'id</c> type does not match the
-  ///   actual ID type used in that binding.
-  /// </summary>
-  /// <param name="subModelSeqBindingName">
-  ///   The name of the <see cref="subModelSeq" /> binding used as the items
-  ///   source.
-  /// </param>
-  /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-  /// model.</param>
-  /// <param name="set">
-  ///   Returns the message to dispatch on selections/de-selections.
-  /// </param>
-  /// <param name="wrapDispatch">
-  ///   Wraps the dispatch function with additional behavior, such as
-  ///   throttling, debouncing, or limiting.
-  /// </param>
-  [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-  static member subModelSelectedItem
-      (subModelSeqBindingName: string,
-       get: 'model -> 'id option,
-       set: 'id option -> 'model -> 'msg,
-       wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-      : string -> Binding<'model, 'msg> =
-    Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
-    >> Binding.alterMsgStream wrapDispatch
-
-
-
-// Some members are implemented as extensions to help overload resolution
-[<AutoOpen>]
-module Extensions =
-
-  type Binding with
-
-    /// <summary>Creates a one-way-to-source binding.</summary>
-    /// <param name="set">Returns the message to dispatch.</param>
-    static member oneWayToSource
-        (set: 'a -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.OneWayToSource.id<'model, 'a>
-      >> Binding.mapMsg set
-
-    /// <summary>
-    ///   Creates a one-way-to-source binding to an optional value. The binding
-    ///   automatically converts between a missing value in the model and
-    ///   a <c>null</c> value in the view.
-    /// </summary>
-    /// <param name="set">Returns the message to dispatch.</param>
-    static member oneWayToSourceOpt
-        (set: 'a option -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.OneWayToSource.opt
-      >> Binding.mapMsg set
-
-    /// <summary>
-    ///   Creates a one-way-to-source binding to an optional value. The binding
-    ///   automatically converts between a missing value in the model and
-    ///   a <c>null</c> value in the view.
-    /// </summary>
-    /// <param name="set">Returns the message to dispatch.</param>
-    static member oneWayToSourceOpt
-        (set: 'a voption -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.OneWayToSource.vopt
-      >> Binding.mapMsg set
-
-
-    /// <summary>Creates a two-way binding.</summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    static member twoWay
-        (get: 'model -> 'a,
-         set: 'a -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.id<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-
-    /// <summary>Creates a two-way binding.</summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWay
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWay (get, set)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value. The binding
-    ///   automatically converts between the optional source value and an
-    ///   unwrapped (possibly <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    static member twoWayOpt
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.opt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value. The binding
-    ///   automatically converts between the optional source value and an
-    ///   unwrapped (possibly <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOpt
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOpt (get, set)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value. The binding
-    ///   automatically converts between the optional source value and an
-    ///   unwrapped (possibly <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    static member twoWayOpt
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.vopt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value. The binding
-    ///   automatically converts between the optional source value and an
-    ///   unwrapped (possibly <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOpt
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOpt (get, set)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation messages from the updated model.
-    /// </param>
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> string list)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.id<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation validate
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation messages from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> string list,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> string voption)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.id<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> ValueOption.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> string voption,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> string option)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.id<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> Option.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> string option,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> Result<'ignored, string>)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.id<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding with validation using
-    ///   <c>INotifyDataErrorInfo</c>.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayValidate
-        (get: 'model -> 'a,
-         set: 'a -> 'msg,
-         validate: 'model -> Result<'ignored, string>,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation messages from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> string list)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.vopt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation validate
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation messages from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> string list,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> string voption)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.vopt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> ValueOption.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> string voption,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> string option)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.vopt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> Option.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> string option,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> Result<'ignored, string>)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.vopt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a voption,
-         set: 'a voption -> 'msg,
-         validate: 'model -> Result<'ignored, string>,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation messages from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> string list)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.opt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation validate
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation messages from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> string list,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> string voption)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.opt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> ValueOption.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> string voption,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> string option)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.opt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> Option.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> string option,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> Result<'ignored, string>)
-        : string -> Binding<'model, 'msg> =
-      Binding.TwoWay.opt<'a>
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
-
-    /// <summary>
-    ///   Creates a two-way binding to an optional value with validation using
-    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
-    ///   between the optional source value and an unwrapped (possibly
-    ///   <c>null</c>) value on the view side.
-    /// </summary>
-    /// <param name="get">Gets the value from the model.</param>
-    /// <param name="set">Returns the message to dispatch.</param>
-    /// <param name="validate">
-    ///   Returns the validation message from the updated model.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member twoWayOptValidate
-        (get: 'model -> 'a option,
-         set: 'a option -> 'msg,
-         validate: 'model -> Result<'ignored, string>,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.twoWayOptValidate (get, set, validate)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that dispatches the specified message
-    ///   and can always execute.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    static member cmd
-        (exec: 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.create
-        (fun _ -> exec |> ValueSome)
-        (fun _ -> true)
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that dispatches the specified message
-    ///   and can always execute.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmd
-        (exec: 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmd exec
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that dispatches the specified message
-    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    static member cmdIf
-        (exec: 'msg,
-         canExec: 'model -> bool)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.create
-        (fun _ -> exec |> ValueSome)
-        canExec
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that dispatches the specified message
-    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdIf
-        (exec: 'msg,
-         canExec: 'model -> bool,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdIf (exec, canExec)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can always execute.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    static member cmdParam
-        (exec: obj -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.createWithParam
-        (fun p _ -> exec p |> ValueSome)
-        (fun _ _ -> true)
-        false
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can always execute.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParam
-        (exec: obj -> 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParam exec
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    static member cmdParamIf
-        (exec: obj -> 'msg voption,
-         ?uiBoundCmdParam: bool)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.createWithParam
-        (fun p _ -> exec p)
-        (fun p _ -> exec p |> ValueOption.isSome)
-        (defaultArg uiBoundCmdParam false)
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> 'msg voption,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf exec
-      >> Binding.alterMsgStream wrapDispatch
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> 'msg voption,
-         uiBoundCmdParam: bool,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf (exec, uiBoundCmdParam)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    static member cmdParamIf
-        (exec: obj -> 'msg option,
-         ?uiBoundCmdParam: bool)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.createWithParam
-        (fun p _ -> exec p |> ValueOption.ofOption)
-        (fun p _ -> exec p |> Option.isSome)
-        (defaultArg uiBoundCmdParam false)
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> 'msg option,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf exec
-      >> Binding.alterMsgStream wrapDispatch
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> 'msg option,
-         uiBoundCmdParam: bool,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf (exec, uiBoundCmdParam)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
-    ///
-    ///   This overload allows more easily re-using the same validation
-    ///   functions for inputs and commands.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    static member cmdParamIf
-        (exec: obj -> Result<'msg, 'ignored>,
-         ?uiBoundCmdParam: bool)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.createWithParam
-        (fun p _ -> exec p |> ValueOption.ofOk)
-        (fun p _ -> exec p |> Result.isOk)
-        (defaultArg uiBoundCmdParam false)
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
-    ///
-    ///   This overload allows more easily re-using the same validation
-    ///   functions for inputs and commands.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> Result<'msg, 'ignored>,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf exec
-      >> Binding.alterMsgStream wrapDispatch
-
-    /// <summary>
-    ///   Creates a conditional <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
-    ///
-    ///   This overload allows more easily re-using the same validation
-    ///   functions for inputs and commands.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> Result<'msg, 'ignored>,
-         uiBoundCmdParam: bool,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf (exec, uiBoundCmdParam)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    static member cmdParamIf
-        (exec: obj -> 'msg,
-         canExec: obj -> bool,
-         ?uiBoundCmdParam: bool)
-        : string -> Binding<'model, 'msg> =
-      Binding.Cmd.createWithParam
-        (fun p _ -> exec p |> ValueSome)
-        (fun p _ -> canExec p)
-        (defaultArg uiBoundCmdParam false)
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> 'msg,
-         canExec: obj -> bool,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf (exec, canExec)
-      >> Binding.alterMsgStream wrapDispatch
-
-    /// <summary>
-    ///   Creates a <c>Command</c> binding that depends on the
-    ///   <c>CommandParameter</c>
-    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
-    /// </summary>
-    /// <param name="exec">Returns the message to dispatch.</param>
-    /// <param name="canExec">Indicates whether the command can execute.</param>
-    /// <param name="uiBoundCmdParam">
-    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
-    ///   <c>CommandManager</c>
-    ///   detects UI changes that could potentially influence the command's
-    ///   ability to execute. This will likely lead to many more triggers than
-    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
-    ///   to another UI property.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member cmdParamIf
-        (exec: obj -> 'msg,
-         canExec: obj -> bool,
-         uiBoundCmdParam: bool,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.cmdParamIf (exec, canExec, uiBoundCmdParam)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-    ///   the
-    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-    ///   binding. Automatically converts the dynamically created Elmish.WPF
-    ///   view models to/from their corresponding IDs, so the Elmish user code
-    ///   only has to work with the IDs.
-    ///
-    ///   Only use this if you are unable to use some kind of
-    ///   <c>SelectedValue</c> or
-    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-    ///   binding. This binding is less type-safe. It will throw when
-    ///   initializing the bindings if <paramref name="subModelSeqBindingName"
-    ///   />
-    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
-    ///   will throw at runtime if the inferred <c>'id</c> type does not
-    ///   match the actual ID type used in that binding.
-    /// </summary>
-    /// <param name="subModelSeqBindingName">
-    ///   The name of the <see cref="subModelSeq" /> binding used as the items
-    ///   source.
-    /// </param>
-    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-    /// model.</param>
-    /// <param name="set">
-    ///   Returns the message to dispatch on selections/de-selections.
-    /// </param>
-    static member subModelSelectedItem
-        (subModelSeqBindingName: string,
-         get: 'model -> 'id voption,
-         set: 'id voption -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.SubModelSelectedItem.vopt subModelSeqBindingName
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addCaching
-
-    /// <summary>
-    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-    ///   the
-    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-    ///   binding. Automatically converts the dynamically created Elmish.WPF
-    ///   view models to/from their corresponding IDs, so the Elmish user code
-    ///   only has to work with the IDs.
-    ///
-    ///   Only use this if you are unable to use some kind of
-    ///   <c>SelectedValue</c> or
-    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-    ///   binding. This binding is less type-safe. It will throw when
-    ///   initializing the bindings if <paramref name="subModelSeqBindingName"
-    ///   />
-    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
-    ///   will throw at runtime if the inferred <c>'id</c> type does not
-    ///   match the actual ID type used in that binding.
-    /// </summary>
-    /// <param name="subModelSeqBindingName">
-    ///   The name of the <see cref="subModelSeq" /> binding used as the items
-    ///   source.
-    /// </param>
-    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-    /// model.</param>
-    /// <param name="set">
-    ///   Returns the message to dispatch on selections/de-selections.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member subModelSelectedItem
-        (subModelSeqBindingName: string,
-         get: 'model -> 'id voption,
-         set: 'id voption -> 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
-      >> Binding.alterMsgStream wrapDispatch
-
-
-    /// <summary>
-    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-    ///   the
-    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-    ///   binding. Automatically converts the dynamically created Elmish.WPF
-    ///   view models to/from their corresponding IDs, so the Elmish user code
-    ///   only has to work with the IDs.
-    ///
-    ///   Only use this if you are unable to use some kind of
-    ///   <c>SelectedValue</c> or
-    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-    ///   binding. This binding is less type-safe. It will throw when
-    ///   initializing the bindings if <paramref name="subModelSeqBindingName"
-    ///   />
-    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
-    ///   will throw at runtime if the inferred <c>'id</c> type does not
-    ///   match the actual ID type used in that binding.
-    /// </summary>
-    /// <param name="subModelSeqBindingName">
-    ///   The name of the <see cref="subModelSeq" /> binding used as the items
-    ///   source.
-    /// </param>
-    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-    /// model.</param>
-    /// <param name="set">
-    ///   Returns the message to dispatch on selections/de-selections.
-    /// </param>
-    static member subModelSelectedItem
-        (subModelSeqBindingName: string,
-         get: 'model -> 'id option,
-         set: 'id option -> 'msg)
-        : string -> Binding<'model, 'msg> =
-      Binding.SubModelSelectedItem.opt subModelSeqBindingName
-      >> Binding.addLazy (=)
-      >> Binding.mapModel get
-      >> Binding.mapMsg set
-      >> Binding.addCaching
-
-    /// <summary>
-    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
-    ///   the
-    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
-    ///   binding. Automatically converts the dynamically created Elmish.WPF
-    ///   view models to/from their corresponding IDs, so the Elmish user code
-    ///   only has to work with the IDs.
-    ///
-    ///   Only use this if you are unable to use some kind of
-    ///   <c>SelectedValue</c> or
-    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
-    ///   binding. This binding is less type-safe. It will throw when
-    ///   initializing the bindings if <paramref name="subModelSeqBindingName"
-    ///   />
-    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
-    ///   will throw at runtime if the inferred <c>'id</c> type does not
-    ///   match the actual ID type used in that binding.
-    /// </summary>
-    /// <param name="subModelSeqBindingName">
-    ///   The name of the <see cref="subModelSeq" /> binding used as the items
-    ///   source.
-    /// </param>
-    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
-    /// model.</param>
-    /// <param name="set">
-    ///   Returns the message to dispatch on selections/de-selections.
-    /// </param>
-    /// <param name="wrapDispatch">
-    ///   Wraps the dispatch function with additional behavior, such as
-    ///   throttling, debouncing, or limiting.
-    /// </param>
-    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
-    static member subModelSelectedItem
-        (subModelSeqBindingName: string,
-         get: 'model -> 'id option,
-         set: 'id option -> 'msg,
-         wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
-        : string -> Binding<'model, 'msg> =
-      Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
-      >> Binding.alterMsgStream wrapDispatch
+    /// <param name="binding">The binding to which caching is added.</param>
+    let addCaching (binding: Binding<'model, 'msg, 't>) : Binding<'model, 'msg, 't> = binding |> mapData addCaching
+
+    /// <summary>
+    ///   Adds validation to the given binding using <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="validate">Returns the errors associated with the given model.</param>
+    /// <param name="binding">The binding to which validation is added.</param>
+    let addValidation
+        (validate: 'model -> string list)
+        (binding: Binding<'model, 'msg, 't>)
+        : Binding<'model, 'msg, 't> =
+        binding |> mapData (addValidation validate)
+
+    /// <summary>
+    ///   Adds laziness to the updating of the given binding. If the models are considered equal,
+    ///   then updating of the given binding is skipped.
+    /// </summary>
+    /// <param name="equals">Updating skipped when this function returns <c>true</c>.</param>
+    /// <param name="binding">The binding to which the laziness is added.</param>
+    let addLazy (equals: 'model -> 'model -> bool) (binding: Binding<'model, 'msg, 't>) : Binding<'model, 'msg, 't> =
+        binding |> mapData (addLazy equals)
+
+    /// <summary>
+    ///   Alters the message stream via the given function.
+    ///   Ideally suited for use with Reactive Extensions.
+    ///   <code>
+    ///     open FSharp.Control.Reactive
+    ///     let delay dispatch =
+    ///       let subject = Subject.broadcast
+    ///       let observable = subject :&gt; System.IObservable&lt;_&gt;
+    ///       observable
+    ///       |&gt; Observable.delay (System.TimeSpan.FromSeconds 1.0)
+    ///       |&gt; Observable.subscribe dispatch
+    ///       |&gt; ignore
+    ///       subject.OnNext
+    ///
+    ///     // ...
+    ///
+    ///     binding |&gt; Binding.alterMsgStream delay
+    ///   </code>
+    /// </summary>
+    /// <param name="alteration">The function that can alter the message stream.</param>
+    /// <param name="binding">The binding of the altered message stream.</param>
+    let alterMsgStream
+        (alteration: ('b -> unit) -> 'a -> unit)
+        (binding: Binding<'model, 'a, 't>)
+        : Binding<'model, 'b, 't> =
+        binding |> mapData (alterMsgStream alteration)
+
+
+    /// <summary>
+    ///   Strongly-typed bindings that update the view from the model.
+    /// </summary>
+    module OneWayT =
+
+        /// Elemental instance of a one-way binding.
+        let id<'a, 'msg> : string -> Binding<'a, 'msg, 'a> = OneWay.id |> createBindingT
+
+        /// Creates a one-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let opt x : Binding<'a option, 'msg, System.Nullable<'a>> = x |> id |> mapModel Option.toNullable
+
+        /// Creates a one-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let vopt x : Binding<'a voption, 'msg, System.Nullable<'a>> =
+            x |> id |> mapModel ValueOption.toNullable
+
+        /// Creates a one-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let optobj<'a, 'msg when 'a: null> : string -> Binding<'a option, 'msg, 'a> =
+            id<'a, 'msg> >> mapModel Option.toObj
+
+        /// Creates a one-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let voptobj<'a, 'msg when 'a: null> : string -> Binding<'a voption, 'msg, 'a> =
+            id<'a, 'msg> >> mapModel ValueOption.toObj
+
+    /// <summary>
+    ///   Strongly-typed bindings that update the model from the view.
+    /// </summary>
+    module OneWayToSourceT =
+
+        /// Elemental instance of a one-way-to-source binding.
+        let id<'model, 'a> : string -> Binding<'model, 'a, 'a> =
+            OneWayToSource.id |> createBindingT
+
+        /// Creates a one-way-to-source binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let optobj<'a, 'model when 'a: null> : string -> Binding<'model, 'a option, 'a> =
+            id<'model, 'a> >> mapMsg Option.ofObj
+
+        /// Creates a one-way-to-source binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let voptobj<'a, 'model when 'a: null> : string -> Binding<'model, 'a voption, 'a> =
+            id<'model, 'a> >> mapMsg ValueOption.ofObj
+
+        /// Creates a one-way-to-source binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let opt x : Binding<'model, 'a option, System.Nullable<'a>> = x |> id |> mapMsg Option.ofNullable
+
+        /// Creates a one-way-to-source binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let vopt x : Binding<'model, 'a voption, System.Nullable<'a>> =
+            x |> id |> mapMsg ValueOption.ofNullable
+
+    /// <summary>
+    ///   Strongly-typed bindings that update both ways
+    /// </summary>
+    module TwoWayT =
+
+        /// Elemental instance of a two-way binding.
+        let id<'a> : string -> Binding<'a, 'a, 'a> = TwoWay.id |> createBindingT
+
+        /// Creates a two-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let opt x : Binding<'a option, 'a option, System.Nullable<'a>> =
+            x |> id |> mapMsg Option.ofNullable |> mapModel Option.toNullable
+
+        /// Creates a two-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let vopt x : Binding<'a voption, 'a voption, System.Nullable<'a>> =
+            x |> id |> mapMsg ValueOption.ofNullable |> mapModel ValueOption.toNullable
+
+        /// Creates a two-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let optobj<'a when 'a: null> : string -> Binding<'a option, 'a option, 'a> =
+            id<'a> >> mapModel Option.toObj >> mapMsg Option.ofObj
+
+        /// Creates a two-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let voptobj<'a when 'a: null> : string -> Binding<'a voption, 'a voption, 'a> =
+            id<'a> >> mapMsg ValueOption.ofObj >> mapModel ValueOption.toObj
+
+    /// <summary>
+    ///   The strongly-typed counterpart of <c>Binding.oneWaySeq</c> with parameter <c>getId</c>.
+    ///   Exposes an <c>ObservableCollection</c> of child items for binding.
+    ///   Allows a more efficient update than would be possible without using ids.
+    /// </summary>
+    module OneWaySeqT =
+
+        /// <summary>
+        /// Elemental instance of a OneWaySeqT binding
+        /// </summary>
+        /// <param name="itemEquals">Defines whether an item is "equal" and needs to be updated if the ids are the same</param>
+        /// <param name="getId">Unique identifier for each item in the list (for efficient updates).</param>
+        let id itemEquals (getId: 'a -> 'id) : string -> Binding<_, 'msg, _> =
+            OneWaySeq.create itemEquals getId |> createBindingT
+
+    /// <summary>
+    ///   Strongly-typed bindings that dispatch messages from the view.
+    /// </summary>
+    module CmdT =
+
+        /// <summary>
+        ///   Elemental instance of a <c>Command</c> binding.
+        ///   Creates a <c>Command</c> binding that only passes the <c>CommandParameter</c>)
+        /// </summary>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        let id<'model> uiBoundCmdParam canExec : string -> Binding<'model, obj, ICommand> =
+            Cmd.createWithParam (fun p _ -> ValueSome p) canExec uiBoundCmdParam
+            |> createBindingT
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends only on the model (not the
+        ///   <c>CommandParameter</c>).
+        /// </summary>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        let model canExec (exec: 'model -> 'msg) : string -> Binding<'model, 'msg, ICommand> =
+            id false (fun _ m -> m |> canExec)
+            >> mapMsgWithModel (fun _ y -> y |> exec)
+            >> addLazy (fun m1 m2 -> canExec m1 = canExec m2)
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that dispatches the specified message.
+        /// </summary>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        /// <param name="msg">The message to dispatch.</param>
+        let set canExec (msg: 'msg) : string -> Binding<'model, 'msg, ICommand> =
+            id false (fun _ m -> m |> canExec) >> setMsg msg
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends only on the model (not the
+        ///   <c>CommandParameter</c>) and always executes.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        let modelAlways (exec: 'model -> 'msg) : string -> Binding<'model, 'msg, ICommand> = model (fun _ -> true) exec
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that dispatches the specified message
+        ///   and always executes.
+        /// </summary>
+        /// <param name="msg">The message to dispatch.</param>
+        let setAlways (msg: 'msg) : string -> Binding<'model, 'msg, ICommand> = set (fun _ -> true) msg
+
+    module OneWay =
+
+        /// Elemental instance of a one-way binding.
+        let id<'a, 'msg> : string -> Binding<'a, 'msg> = OneWay.id |> createBinding
+
+        /// Creates a one-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let opt<'a, 'msg> : string -> Binding<'a option, 'msg> =
+            id<obj, 'msg> >> mapModel Option.box
+
+        /// Creates a one-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let vopt<'a, 'msg> : string -> Binding<'a voption, 'msg> =
+            id<obj, 'msg> >> mapModel ValueOption.box
+
+
+    module OneWayToSource =
+
+        /// Elemental instance of a one-way-to-source binding.
+        let id<'model, 'a> : string -> Binding<'model, 'a> =
+            OneWayToSource.id |> createBinding
+
+        /// Creates a one-way-to-source binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let vopt<'model, 'a> : string -> Binding<'model, 'a voption> =
+            id<'model, obj> >> mapMsg ValueOption.unbox
+
+        /// Creates a one-way-to-source binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let opt<'model, 'a> : string -> Binding<'model, 'a option> =
+            id<'model, obj> >> mapMsg Option.unbox
+
+
+    module TwoWay =
+
+        /// Elemental instance of a two-way binding.
+        let id<'a> : string -> Binding<'a, 'a> = TwoWay.id |> createBinding
+
+        /// Creates a two-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let vopt<'a> : string -> Binding<'a voption, 'a voption> =
+            id<obj> >> mapModel ValueOption.box >> mapMsg ValueOption.unbox
+
+        /// Creates a two-way binding to an optional value. The binding
+        /// automatically converts between a missing value in the model and
+        /// a <c>null</c> value in the view.
+        let opt<'a> : string -> Binding<'a option, 'a option> =
+            id<obj> >> mapModel Option.box >> mapMsg Option.unbox
+
+
+    module SubModelSelectedItem =
+
+        /// Creates a two-way binding to a <c>SelectedItem</c>-like property where
+        /// the <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+        /// binding. Automatically converts the dynamically created Elmish.WPF view
+        /// models to/from their corresponding IDs, so the Elmish user code only has
+        /// to work with the IDs.
+        ///
+        /// Only use this if you are unable to use some kind of <c>SelectedValue</c>
+        /// or <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+        /// binding. This binding is less type-safe. It will throw when initializing
+        /// the bindings if <paramref name="subModelSeqBindingName" />
+        /// does not correspond to a <see cref="subModelSeq" /> binding, and it will
+        /// throw at runtime if the inferred <c>'id</c> type does not match the
+        /// actual ID type used in that binding.
+        let vopt subModelSeqBindingName : string -> Binding<'id voption, 'id voption> =
+            SubModelSelectedItem.create subModelSeqBindingName
+            |> createBinding
+            >> mapModel (ValueOption.map box)
+            >> mapMsg (ValueOption.map unbox)
+
+        /// Creates a two-way binding to a <c>SelectedItem</c>-like property where
+        /// the <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+        /// binding. Automatically converts the dynamically created Elmish.WPF view
+        /// models to/from their corresponding IDs, so the Elmish user code only has
+        /// to work with the IDs.
+        ///
+        /// Only use this if you are unable to use some kind of <c>SelectedValue</c>
+        /// or <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+        /// binding. This binding is less type-safe. It will throw when initializing
+        /// the bindings if <paramref name="subModelSeqBindingName" />
+        /// does not correspond to a <see cref="subModelSeq" /> binding, and it will
+        /// throw at runtime if the inferred <c>'id</c> type does not match the
+        /// actual ID type used in that binding.
+        let opt subModelSeqBindingName : string -> Binding<'id option, 'id option> =
+            vopt subModelSeqBindingName
+            >> mapModel ValueOption.ofOption
+            >> mapMsg ValueOption.toOption
+
+
+    module Cmd =
+
+        let internal createWithParam exec canExec autoRequery =
+            Cmd.createWithParam exec canExec autoRequery |> createBinding
+
+        let internal create exec canExec =
+            createWithParam (fun _ -> exec) (fun _ -> canExec) false
+            >> addLazy (fun m1 m2 -> canExec m1 = canExec m2)
+
+
+    module OneWaySeq =
+
+        let internal create get itemEquals getId =
+            OneWaySeq.create itemEquals getId |> BindingData.mapModel get |> createBinding
+
+
+    module SubModel =
+
+        /// <summary>
+        ///   Creates a binding to a sub-model/component. You typically bind this
+        ///   to the <c>DataContext</c> of a <c>UserControl</c> or similar.
+        /// </summary>
+        /// <param name="bindings">Returns the bindings for the sub-model.</param>
+        let vopt (bindings: unit -> Binding<'model, 'msg> list) : string -> Binding<'model voption, 'msg> =
+            SubModel.create (fun args -> DynamicViewModel<'model, 'msg>(args, bindings ())) IViewModel.updateModel
+            |> createBinding
+
+        /// <summary>
+        ///   Creates a binding to a sub-model/component. You typically bind this
+        ///   to the <c>DataContext</c> of a <c>UserControl</c> or similar.
+        /// </summary>
+        /// <param name="bindings">Returns the bindings for the sub-model.</param>
+        let opt (bindings: unit -> Binding<'model, 'msg> list) : string -> Binding<'model option, 'msg> =
+            vopt bindings >> mapModel ValueOption.ofOption
+
+        /// <summary>
+        ///   Creates a binding to a sub-model/component. You typically bind this
+        ///   to the <c>DataContext</c> of a <c>UserControl</c> or similar.
+        /// </summary>
+        /// <param name="bindings">Returns the bindings for the sub-model.</param>
+        let required (bindings: unit -> Binding<'model, 'msg> list) : string -> Binding<'model, 'msg> =
+            vopt bindings >> mapModel ValueSome
+
+    /// <summary>
+    ///   The strongly-typed counterpart of module <c>SubModel</c>.
+    ///   For creating bindings to child view models that have their own bindings.
+    ///   Typically bound from WPF using <c>DataContext</c> and <c>Binding</c>.
+    ///   Can be used in binding lists if boxed using <see cref="boxT" />.
+    /// </summary>
+    module SubModelT =
+
+        /// Exposes an optional view model member for binding.
+        let opt
+            (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
+            : (string -> Binding<'bindingModel voption, 'msg, #IViewModel<'bindingModel, 'msg>>) =
+            SubModel.create createVm IViewModel.updateModel |> createBindingT
+
+        /// Exposes a non-optional view model member for binding.
+        let req
+            (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
+            : (string -> Binding<'bindingModel, 'msg, #IViewModel<'bindingModel, 'msg>>) =
+            SubModel.create createVm IViewModel.updateModel
+            |> createBindingT
+            >> mapModel ValueSome
+
+        /// <summary>
+        ///   Exposes a <c>'a seq</c> (<c>IEnumerable&lt;'a&gt;</c>) view model member for binding.
+        ///   Used rarely; usually, you want to expose an <c>ObservableCollection&lt;'a&gt;</c>
+        ///   using <c>SubModelSeqKeyedT</c> or <c>SubModelSeqUnkeyedT</c>.
+        /// </summary>
+        let seq
+            (createVm: ViewModelArgs<'bindingModel, 'msg> -> #seq<#IViewModel<'bindingModel, 'msg>>)
+            : (string -> Binding<'bindingModel, 'msg, #seq<#IViewModel<'bindingModel, 'msg>>>) =
+            SubModel.create createVm (fun (vms, m) -> vms |> Seq.iter (fun vm -> IViewModel.updateModel (vm, m)))
+            |> createBindingT
+            >> mapModel ValueSome
+
+    /// <summary>
+    ///   The strongly-typed counterpart of <c>Binding.subModelSeq</c> without parameter <c>getId</c>.
+    ///   Exposes an <c>ObservableCollection</c> of child view models for binding.
+    ///   Identifies elements by index;
+    ///   if possible, use <c>SubModelSeqKeyedT</c> (which uses parameter <c>getId</c>) instead.
+    ///   Typically bound from WPF using <c>DataContext</c> and <c>Binding</c>.
+    ///   Can be used in binding lists if boxed using <see cref="boxT" />.
+    /// </summary>
+    module SubModelSeqUnkeyedT =
+
+        /// <summary>
+        ///   Creates an elemental <c>SubModelSeqUnkeyedT</c> binding.
+        /// </summary>
+        /// <param name="createVm">
+        ///   The function applied to every element of the bound <c>ObservableCollection</c>
+        ///   to create a child view model.
+        /// </param>
+        let id
+            (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
+            : (string
+                  -> Binding<'bindingModelCollection, int * 'msg, ObservableCollection<#IViewModel<'bindingModel, 'msg>>>)
+            =
+            SubModelSeqUnkeyed.create createVm IViewModel.updateModel |> createBindingT
+
+    /// <summary>
+    ///   The strongly-typed counterpart of <c>Binding.subModelSeq</c> with parameter <c>getId</c>.
+    ///   Exposes an <c>ObservableCollection</c> of child view models for binding.
+    ///   Typically bound from WPF using <c>DataContext</c> and <c>Binding</c>.
+    ///   Can be used in binding lists if boxed using <see cref="boxT" />.
+    /// </summary>
+    module SubModelSeqKeyedT =
+
+        /// <summary>
+        ///   Creates an elemental <c>SubModelSeqUnkeyedT</c> binding.
+        /// </summary>
+        /// <param name="createVm">
+        ///   The function applied to every element of the bound <c>ObservableCollection</c>
+        ///   to create a child view model.
+        /// </param>
+        /// <param name="getId">
+        ///   The function applied to every element of the bound <c>ObservableCollection</c>
+        ///   to get a key used to identify that element.
+        ///   Should not return duplicate keys for different elements.
+        /// </param>
+        let id
+            (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
+            (getId: 'bindingModel -> 'id)
+            : (string
+                  -> Binding<'bindingModelCollection, 'id * 'msg, ObservableCollection<#IViewModel<'bindingModel, 'msg>>>)
+            =
+            SubModelSeqKeyed.create createVm IViewModel.updateModel getId (IViewModel.currentModel >> getId)
+            |> createBindingT
+
+    /// <summary>
+    ///   The strongly-typed counterpart of <c>Binding.subModelWin</c>.
+    ///   Like <see cref="SubModelT.opt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (either in code
+    ///   or in XAML).
+    ///
+    ///   Can be used in binding lists if boxed using <see cref="boxT" />.
+    /// </summary>
+    module SubModelWinT =
+
+        /// <summary>
+        ///   Creates an elemental <c>SubModelWinT</c> binding.
+        ///   Like <see cref="SubModelT.opt" />, but uses the <c>WindowState</c> wrapper
+        ///   to show/hide/close a new window that will have the specified bindings as
+        ///   its <c>DataContext</c>.
+        ///
+        ///   You do not need to set the <c>DataContext</c> yourself (either in code
+        ///   or in XAML).
+        ///   The window can only be closed/hidden by changing the return value of
+        ///   <paramref name="getState" />, and cannot be directly closed by the
+        ///   user. External close attempts (the Close/X button, Alt+F4, or System
+        ///   Menu -> Close) will cause the message specified by
+        ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+        ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+        ///   will not confuse a user trying to close the window (e.g. by closing it
+        ///   or displaying relevant feedback to the user).
+        /// </summary>
+        /// <param name="getState">Gets the window state and a sub-model.</param>
+        /// <param name="createVM">Returns the view model for the window.</param>
+        /// <param name="getWindow">
+        ///   The function used to get and configure the window.
+        /// </param>
+        /// <param name="isModal">
+        ///   Specifies whether the window will be shown modally (using
+        ///   <c>Window.ShowDialog</c>, blocking the rest of the app) or non-modally (using
+        ///   <c>Window.Show</c>).
+        /// </param>
+        /// <param name="onCloseRequested">
+        ///   The message to be dispatched on external close attempts (the Close/X
+        ///   button, Alt+F4, or System Menu -> Close).
+        /// </param>
+        let id
+            (getState: 'model -> WindowState<'bindingModel>)
+            (createVM: ViewModelArgs<'bindingModel, 'bindingMsg> -> #IViewModel<'bindingModel, 'bindingMsg>)
+            getWindow
+            isModal
+            onCloseRequested
+            =
+            SubModelWin.create getState createVM IViewModel.updateModel Func2.id2 getWindow isModal onCloseRequested
+            |> createBindingT
+
+
+    module SelectedIndex =
+        /// Prebuilt binding intended for use with <code>Selector.SelectedIndex</code>.
+        let vopt =
+            TwoWay.id
+            >> mapModel (ValueOption.defaultValue -1)
+            >> mapMsg (fun i -> if i < 0 then ValueNone else ValueSome i)
+
+        /// Prebuilt binding intended for use with <code>Selector.SelectedIndex</code>.
+        let opt = vopt >> mapModel ValueOption.ofOption >> mapMsg ValueOption.toOption
+
+
+    module SubModelWin =
+
+        let internal create getState createViewModel updateViewModel toMsg getWindow isModal onCloseRequested =
+            SubModelWin.create getState createViewModel updateViewModel toMsg getWindow isModal onCloseRequested
+            |> createBinding
+
+
+    module SubModelSeqUnkeyed =
+
+        let internal create createViewModel updateViewModel =
+            SubModelSeqUnkeyed.create createViewModel updateViewModel |> createBinding
+
+
+    module SubModelSeqKeyed =
+
+        let internal create createViewModel updateViewModel bmToId vmToId =
+            SubModelSeqKeyed.create createViewModel updateViewModel bmToId vmToId
+            |> createBinding
+
+
+module Bindings =
+
+    /// Maps the model of a list of bindings via a contravariant mapping.
+    let mapModel (f: 'a -> 'b) (bindings: Binding<'b, 'msg> list) =
+        f |> Binding.mapModel |> List.map <| bindings
+
+    /// Maps the message of a list of bindings with access to the model via a covariant mapping.
+    let mapMsgWithModel (f: 'a -> 'model -> 'b) (bindings: Binding<'model, 'a> list) =
+        f |> Binding.mapMsgWithModel |> List.map <| bindings
+
+    /// Maps the message of a list of bindings via a covariant mapping.
+    let mapMsg (f: 'a -> 'b) (bindings: Binding<'model, 'a> list) =
+        f |> Binding.mapMsg |> List.map <| bindings
+
+
+[<AbstractClass; Sealed>]
+type Binding private () =
+
+    /// <summary>
+    ///   Creates a binding intended for use with <code>Selector.SelectedIndex</code>.
+    /// </summary>
+    /// <param name="get">Gets the selected index from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member selectedIndex(get: 'model -> int voption, set: int voption -> 'msg) =
+        Binding.SelectedIndex.vopt >> Binding.mapModel get >> Binding.mapMsg set
+
+    /// <summary>
+    ///   Creates a binding intended for use with <code>Selector.SelectedIndex</code>.
+    /// </summary>
+    /// <param name="get">Gets the selected index from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member selectedIndex(get: 'model -> int option, set: int option -> 'msg) =
+        Binding.SelectedIndex.opt >> Binding.mapModel get >> Binding.mapMsg set
+
+
+    /// <summary>Creates a one-way binding.</summary>
+    /// <param name="get">Gets the value from the model.</param>
+    static member oneWay(get: 'model -> 'a) : string -> Binding<'model, 'msg> =
+        Binding.OneWay.id<'a, 'msg> >> Binding.addLazy (=) >> Binding.mapModel get
+
+
+    /// <summary>
+    ///   Creates a one-way binding to an optional value. The binding
+    ///   automatically converts between the optional source value and an
+    ///   unwrapped (possibly
+    ///   <c>null</c>) value on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    static member oneWayOpt(get: 'model -> 'a option) : string -> Binding<'model, 'msg> =
+        Binding.OneWay.opt<'a, 'msg> >> Binding.addLazy (=) >> Binding.mapModel get
+
+
+    /// <summary>
+    ///   Creates a one-way binding to an optional value. The binding
+    ///   automatically converts between the optional source value and an
+    ///   unwrapped (possibly
+    ///   <c>null</c>) value on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    static member oneWayOpt(get: 'model -> 'a voption) : string -> Binding<'model, 'msg> =
+        Binding.OneWay.vopt<'a, 'msg> >> Binding.addLazy (=) >> Binding.mapModel get
+
+
+    /// <summary>
+    ///   Creates a lazily evaluated one-way binding. <paramref name="map" />
+    ///   will be called only when the output of <paramref name="get" /> changes,
+    ///   as determined by <paramref name="equals" />. This may have better
+    ///   performance than <see cref="oneWay" /> for expensive computations (but
+    ///   may be less performant for non-expensive functions due to additional
+    ///   overhead).
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="equals">
+    ///   Indicates whether two intermediate values are equal. Good candidates are
+    ///   <c>elmEq</c> and <c>refEq</c>.
+    /// </param>
+    /// <param name="map">Transforms the value into the final type.</param>
+    static member oneWayLazy
+        (get: 'model -> 'a, equals: 'a -> 'a -> bool, map: 'a -> 'b)
+        : string -> Binding<'model, 'msg> =
+        Binding.OneWay.id<'b, 'msg>
+        >> Binding.mapModel map
+        >> Binding.addLazy equals
+        >> Binding.mapModel get
+        >> Binding.addCaching
+
+
+    /// <summary>
+    ///   Creates a lazily evaluated one-way binding to an optional value. The
+    ///   binding automatically converts between the optional source value and an
+    ///   unwrapped (possibly <c>null</c>) value on the view side. <paramref
+    ///   name="map" /> will be called only when the output of <paramref
+    ///   name="get" /> changes, as determined by <paramref name="equals" />.
+    ///
+    ///   This may have better performance than a non-lazy binding for expensive
+    ///   computations (but may be less performant for non-expensive functions due
+    ///   to additional overhead).
+    /// </summary>
+    /// <param name="get">Gets the intermediate value from the model.</param>
+    /// <param name="equals">
+    ///   Indicates whether two intermediate values are equal. Good candidates are
+    ///   <c>elmEq</c> and <c>refEq</c>.
+    /// </param>
+    /// <param name="map">Transforms the intermediate value into the final
+    /// type.</param>
+    static member oneWayOptLazy
+        (get: 'model -> 'a, equals: 'a -> 'a -> bool, map: 'a -> 'b option)
+        : string -> Binding<'model, 'msg> =
+        Binding.OneWay.opt<'b, 'msg>
+        >> Binding.mapModel map
+        >> Binding.addLazy equals
+        >> Binding.mapModel get
+        >> Binding.addCaching
+
+
+    /// <summary>
+    ///   Creates a lazily evaluated one-way binding to an optional value. The
+    ///   binding automatically converts between the optional source value and an
+    ///   unwrapped (possibly <c>null</c>) value on the view side. <paramref
+    ///   name="map" /> will be called only when the output of <paramref
+    ///   name="get" /> changes, as determined by <paramref name="equals" />.
+    ///
+    ///   This may have better performance than a non-lazy binding for expensive
+    ///   computations (but may be less performant for non-expensive functions due
+    ///   to additional overhead).
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="equals">
+    ///   Indicates whether two intermediate values are equal. Good candidates are
+    ///   <c>elmEq</c> and <c>refEq</c>.
+    /// </param>
+    /// <param name="map">Transforms the intermediate value into the final
+    /// type.</param>
+    static member oneWayOptLazy
+        (get: 'model -> 'a, equals: 'a -> 'a -> bool, map: 'a -> 'b voption)
+        : string -> Binding<'model, 'msg> =
+        Binding.OneWay.vopt<'b, 'msg>
+        >> Binding.mapModel map
+        >> Binding.addLazy equals
+        >> Binding.mapModel get
+        >> Binding.addCaching
+
+
+    /// <summary>Creates a one-way-to-source binding.</summary>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member oneWayToSource(set: 'a -> 'model -> 'msg) : string -> Binding<'model, 'msg> =
+        Binding.OneWayToSource.id<'model, 'a> >> Binding.mapMsgWithModel set
+
+    /// <summary>
+    ///   Creates a one-way-to-source binding to an optional value. The binding
+    ///   automatically converts between a missing value in the model and
+    ///   a <c>null</c> value in the view.
+    /// </summary>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member oneWayToSourceOpt(set: 'a option -> 'model -> 'msg) : string -> Binding<'model, 'msg> =
+        Binding.OneWayToSource.opt >> Binding.mapMsgWithModel set
+
+    /// <summary>
+    ///   Creates a one-way-to-source binding to an optional value. The binding
+    ///   automatically converts between a missing value in the model and
+    ///   a <c>null</c> value in the view.
+    /// </summary>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member oneWayToSourceOpt(set: 'a voption -> 'model -> 'msg) : string -> Binding<'model, 'msg> =
+        Binding.OneWayToSource.vopt >> Binding.mapMsgWithModel set
+
+
+    /// <summary>
+    ///   Creates a one-way binding to a sequence of items, each uniquely
+    ///   identified by the value returned by <paramref name="getId"/>. The
+    ///   binding will not be updated if the output of <paramref name="get"/>
+    ///   does not change, as determined by <paramref name="equals"/>.
+    ///   The binding is backed by a persistent <c>ObservableCollection</c>, so
+    ///   only changed items (as determined by <paramref name="itemEquals"/>)
+    ///   will be replaced. If the items are complex and you want them updated
+    ///   instead of replaced, consider using <see cref="subModelSeq"/>.
+    /// </summary>
+    /// <param name="get">Gets the intermediate value from the model.</param>
+    /// <param name="equals">
+    ///   Indicates whether two intermediate values are equal. Good candidates are
+    ///   <c>elmEq</c> and <c>refEq</c>.
+    /// </param>
+    /// <param name="map">Transforms the value into the final collection.</param>
+    /// <param name="itemEquals">
+    ///   Indicates whether two collection items are equal. Good candidates are
+    ///   <c>elmEq</c>, <c>refEq</c>, or simply <c>(=)</c>.
+    /// </param>
+    /// <param name="getId">Gets a unique identifier for a collection
+    /// item.</param>
+    static member oneWaySeqLazy
+        (
+            get: 'model -> 'a,
+            equals: 'a -> 'a -> bool,
+            map: 'a -> #seq<'b>,
+            itemEquals: 'b -> 'b -> bool,
+            getId: 'b -> 'id
+        ) : string -> Binding<'model, 'msg> =
+        Binding.OneWaySeq.create map itemEquals getId
+        >> Binding.addLazy equals
+        >> Binding.mapModel get
+
+
+    /// <summary>
+    ///   Creates a one-way binding to a sequence of items, each uniquely
+    ///   identified by the value returned by <paramref name="getId"/>. The
+    ///   binding will not be updated if the output of <paramref name="get"/>
+    ///   is referentially equal. This is the same as calling
+    ///   <see cref="oneWaySeqLazy"/> with <c>equals = refEq</c> and
+    ///   <c>map = id</c>. The binding is backed by a persistent
+    ///   <c>ObservableCollection</c>, so only changed items (as determined by
+    ///   <paramref name="itemEquals"/>) will be replaced. If the items are
+    ///   complex and you want them updated instead of replaced, consider using
+    ///   <see cref="subModelSeq"/>.
+    /// </summary>
+    /// <param name="get">Gets the collection from the model.</param>
+    /// <param name="itemEquals">
+    ///   Indicates whether two collection items are equal. Good candidates are
+    ///   <c>elmEq</c>, <c>refEq</c>, or simply <c>(=)</c>.
+    /// </param>
+    /// <param name="getId">Gets a unique identifier for a collection
+    /// item.</param>
+    static member oneWaySeq
+        (get: 'model -> #seq<'a>, itemEquals: 'a -> 'a -> bool, getId: 'a -> 'id)
+        : string -> Binding<'model, 'msg> =
+        Binding.OneWaySeq.create id itemEquals getId
+        >> Binding.addLazy refEq
+        >> Binding.mapModel get
+
+
+    /// <summary>Creates a two-way binding.</summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member twoWay(get: 'model -> 'a, set: 'a -> 'model -> 'msg) : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.id<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+
+    /// <summary>Creates a two-way binding.</summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWay
+        (get: 'model -> 'a, set: 'a -> 'model -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.twoWay (get, set) >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value. The binding
+    ///   automatically converts between the optional source value and an
+    ///   unwrapped (possibly <c>null</c>) value on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member twoWayOpt
+        (get: 'model -> 'a option, set: 'a option -> 'model -> 'msg)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.opt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value. The binding
+    ///   automatically converts between the optional source value and an
+    ///   unwrapped (possibly <c>null</c>) value on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOpt
+        (get: 'model -> 'a option, set: 'a option -> 'model -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.twoWayOpt (get, set) >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value. The binding
+    ///   automatically converts between the optional source value and an
+    ///   unwrapped (possibly <c>null</c>) value on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    static member twoWayOpt
+        (get: 'model -> 'a voption, set: 'a voption -> 'model -> 'msg)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.vopt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value. The binding
+    ///   automatically converts between the optional source value and an
+    ///   unwrapped (possibly <c>null</c>) value on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOpt
+        (get: 'model -> 'a voption, set: 'a voption -> 'model -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.twoWayOpt (get, set) >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation messages from the updated model.
+    /// </param>
+    static member twoWayValidate
+        (get: 'model -> 'a, set: 'a -> 'model -> 'msg, validate: 'model -> string list)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.id<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation validate
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation messages from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayValidate
+        (
+            get: 'model -> 'a,
+            set: 'a -> 'model -> 'msg,
+            validate: 'model -> string list,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayValidate
+        (get: 'model -> 'a, set: 'a -> 'model -> 'msg, validate: 'model -> string voption)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.id<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> ValueOption.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayValidate
+        (
+            get: 'model -> 'a,
+            set: 'a -> 'model -> 'msg,
+            validate: 'model -> string voption,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayValidate
+        (get: 'model -> 'a, set: 'a -> 'model -> 'msg, validate: 'model -> string option)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.id<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> Option.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayValidate
+        (
+            get: 'model -> 'a,
+            set: 'a -> 'model -> 'msg,
+            validate: 'model -> string option,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayValidate
+        (get: 'model -> 'a, set: 'a -> 'model -> 'msg, validate: 'model -> Result<'ignored, string>)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.id<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding with validation using
+    ///   <c>INotifyDataErrorInfo</c>.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayValidate
+        (
+            get: 'model -> 'a,
+            set: 'a -> 'model -> 'msg,
+            validate: 'model -> Result<'ignored, string>,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation messages from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a voption, set: 'a voption -> 'model -> 'msg, validate: 'model -> string list)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.vopt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation validate
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation messages from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a voption,
+            set: 'a voption -> 'model -> 'msg,
+            validate: 'model -> string list,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a voption, set: 'a voption -> 'model -> 'msg, validate: 'model -> string voption)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.vopt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> ValueOption.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a voption,
+            set: 'a voption -> 'model -> 'msg,
+            validate: 'model -> string voption,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a voption, set: 'a voption -> 'model -> 'msg, validate: 'model -> string option)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.vopt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> Option.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a voption,
+            set: 'a voption -> 'model -> 'msg,
+            validate: 'model -> string option,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a voption, set: 'a voption -> 'model -> 'msg, validate: 'model -> Result<'ignored, string>)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.vopt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a voption,
+            set: 'a voption -> 'model -> 'msg,
+            validate: 'model -> Result<'ignored, string>,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation messages from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a option, set: 'a option -> 'model -> 'msg, validate: 'model -> string list)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.opt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation validate
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation messages from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a option,
+            set: 'a option -> 'model -> 'msg,
+            validate: 'model -> string list,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a option, set: 'a option -> 'model -> 'msg, validate: 'model -> string voption)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.opt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> ValueOption.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a option,
+            set: 'a option -> 'model -> 'msg,
+            validate: 'model -> string voption,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a option, set: 'a option -> 'model -> 'msg, validate: 'model -> string option)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.opt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> Option.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a option,
+            set: 'a option -> 'model -> 'msg,
+            validate: 'model -> string option,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    static member twoWayOptValidate
+        (get: 'model -> 'a option, set: 'a option -> 'model -> 'msg, validate: 'model -> Result<'ignored, string>)
+        : string -> Binding<'model, 'msg> =
+        Binding.TwoWay.opt<'a>
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
+
+    /// <summary>
+    ///   Creates a two-way binding to an optional value with validation using
+    ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts between
+    ///   the optional source value and an unwrapped (possibly <c>null</c>) value
+    ///   on the view side.
+    /// </summary>
+    /// <param name="get">Gets the value from the model.</param>
+    /// <param name="set">Returns the message to dispatch.</param>
+    /// <param name="validate">
+    ///   Returns the validation message from the updated model.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member twoWayOptValidate
+        (
+            get: 'model -> 'a option,
+            set: 'a option -> 'model -> 'msg,
+            validate: 'model -> Result<'ignored, string>,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.twoWayOptValidate (get, set, validate)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends only on the model (not the
+    ///   <c>CommandParameter</c>) and can always execute.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    static member cmd(exec: 'model -> 'msg) : string -> Binding<'model, 'msg> =
+        Binding.Cmd.create (exec >> ValueSome) (fun _ -> true)
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends only on the model (not the
+    ///   <c>CommandParameter</c>) and can always execute.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmd
+        (exec: 'model -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmd exec >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="canExec" />
+    ///   returns <c>true</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="canExec">Indicates whether the command can execute.</param>
+    static member cmdIf(exec: 'model -> 'msg, canExec: 'model -> bool) : string -> Binding<'model, 'msg> =
+        Binding.Cmd.create (exec >> ValueSome) canExec
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="canExec" />
+    ///   returns <c>true</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="canExec">Indicates whether the command can execute.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdIf
+        (exec: 'model -> 'msg, canExec: 'model -> bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdIf (exec, canExec) >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="exec" />
+    ///   returns <c>ValueSome</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    static member cmdIf(exec: 'model -> 'msg voption) : string -> Binding<'model, 'msg> =
+        Binding.Cmd.create exec (exec >> ValueOption.isSome)
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="exec" />
+    ///   returns <c>ValueSome</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdIf
+        (exec: 'model -> 'msg voption, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdIf exec >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="exec" />
+    ///   returns <c>Some</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    static member cmdIf(exec: 'model -> 'msg option) : string -> Binding<'model, 'msg> =
+        Binding.Cmd.create (exec >> ValueOption.ofOption) (exec >> Option.isSome)
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="exec" />
+    ///   returns <c>Some</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdIf
+        (exec: 'model -> 'msg option, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdIf exec >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="exec" />
+    ///   returns <c>Ok</c>.
+    ///
+    ///   This overload allows more easily re-using the same validation functions
+    ///   for inputs and commands.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    static member cmdIf(exec: 'model -> Result<'msg, 'ignored>) : string -> Binding<'model, 'msg> =
+        Binding.Cmd.create (exec >> ValueOption.ofOk) (exec >> Result.isOk)
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends only on the
+    ///   model (not the <c>CommandParameter</c>) and can execute if <paramref
+    ///   name="exec" />
+    ///   returns <c>Ok</c>.
+    ///
+    ///   This overload allows more easily re-using the same validation functions
+    ///   for inputs and commands.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdIf
+        (exec: 'model -> Result<'msg, 'ignored>, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdIf exec >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can always execute.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    static member cmdParam(exec: obj -> 'model -> 'msg) : string -> Binding<'model, 'msg> =
+        Binding.Cmd.createWithParam (fun p model -> exec p model |> ValueSome) (fun _ _ -> true) false
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can always execute.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParam
+        (exec: obj -> 'model -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParam exec >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="canExec">Indicates whether the command can execute.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg, canExec: obj -> 'model -> bool, ?uiBoundCmdParam: bool)
+        : string -> Binding<'model, 'msg> =
+        Binding.Cmd.createWithParam (fun p m -> exec p m |> ValueSome) canExec (defaultArg uiBoundCmdParam false)
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="canExec">Indicates whether the command can execute.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg, canExec: obj -> 'model -> bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf (exec, canExec) >> Binding.alterMsgStream wrapDispatch
+
+    /// <summary>
+    ///   Creates a <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="canExec">Indicates whether the command can execute.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (
+            exec: obj -> 'model -> 'msg,
+            canExec: obj -> 'model -> bool,
+            uiBoundCmdParam: bool,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf (exec, canExec, uiBoundCmdParam)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg voption, ?uiBoundCmdParam: bool)
+        : string -> Binding<'model, 'msg> =
+        Binding.Cmd.createWithParam exec (fun p m -> exec p m |> ValueOption.isSome) (defaultArg uiBoundCmdParam false)
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg voption, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf exec >> Binding.alterMsgStream wrapDispatch
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg voption, uiBoundCmdParam: bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf (exec, uiBoundCmdParam)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg option, ?uiBoundCmdParam: bool)
+        : string -> Binding<'model, 'msg> =
+        Binding.Cmd.createWithParam
+            (fun p m -> exec p m |> ValueOption.ofOption)
+            (fun p m -> exec p m |> Option.isSome)
+            (defaultArg uiBoundCmdParam false)
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg option, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf exec >> Binding.alterMsgStream wrapDispatch
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (exec: obj -> 'model -> 'msg option, uiBoundCmdParam: bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf (exec, uiBoundCmdParam)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
+    ///
+    ///   This overload allows more easily re-using the same validation functions
+    ///   for inputs and commands.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    static member cmdParamIf
+        (exec: obj -> 'model -> Result<'msg, 'ignored>, ?uiBoundCmdParam: bool)
+        : string -> Binding<'model, 'msg> =
+        Binding.Cmd.createWithParam
+            (fun p m -> exec p m |> ValueOption.ofOk)
+            (fun p m -> exec p m |> Result.isOk)
+            (defaultArg uiBoundCmdParam false)
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
+    ///
+    ///   This overload allows more easily re-using the same validation functions
+    ///   for inputs and commands.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (exec: obj -> 'model -> Result<'msg, 'ignored>, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+        : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf exec >> Binding.alterMsgStream wrapDispatch
+
+    /// <summary>
+    ///   Creates a conditional <c>Command</c> binding that depends on the
+    ///   <c>CommandParameter</c>
+    ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
+    ///
+    ///   This overload allows more easily re-using the same validation functions
+    ///   for inputs and commands.
+    /// </summary>
+    /// <param name="exec">Returns the message to dispatch.</param>
+    /// <param name="uiBoundCmdParam">
+    ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+    ///   <c>CommandManager</c>
+    ///   detects UI changes that could potentially influence the command's
+    ///   ability to execute. This will likely lead to many more triggers than
+    ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+    ///   to another UI property.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member cmdParamIf
+        (
+            exec: obj -> 'model -> Result<'msg, 'ignored>,
+            uiBoundCmdParam: bool,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.cmdParamIf (exec, uiBoundCmdParam)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings and
+    ///   message type. You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="toBindingModel">
+    ///   Converts the models to the model used by the bindings.
+    /// </param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use \"Binding.SubModel.required\" followed by model and message mapping functions as needed.  For an example, see how this method is implemented.")>]
+    static member subModel
+        (
+            getSubModel: 'model -> 'subModel,
+            toBindingModel: 'model * 'subModel -> 'bindingModel,
+            toMsg: 'bindingMsg -> 'msg,
+            bindings: unit -> Binding<'bindingModel, 'bindingMsg> list
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.required bindings
+        >> Binding.mapModel (fun m -> toBindingModel (m, getSubModel m))
+        >> Binding.mapMsg toMsg
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings and
+    ///   message type. You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use \"Binding.SubModel.required\" followed by model and message mapping functions as needed.  For an example, see how this method is implemented.")>]
+    static member subModel
+        (
+            getSubModel: 'model -> 'subModel,
+            toMsg: 'subMsg -> 'msg,
+            bindings: unit -> Binding<'model * 'subModel, 'subMsg> list
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.required bindings
+        >> Binding.mapModel (fun m -> (m, getSubModel m))
+        >> Binding.mapMsg toMsg
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings.
+    ///   You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    [<System.Obsolete("In version 5, the type of the argument \"bindings\" will be changed to \"unit -> Binding<'model, 'msg> list\".  To avoid a compile error when upgrading, replace this method call with its implementation.")>]
+    static member subModel
+        (getSubModel: 'model -> 'subModel, bindings: unit -> Binding<'model * 'subModel, 'msg> list)
+        : string -> Binding<'model, 'msg> =
+        Binding.SubModel.required bindings
+        >> Binding.mapModel (fun m -> (m, getSubModel m))
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings and
+    ///   message type, and may not exist. If it does not exist, bindings to this
+    ///   model will return <c>null</c> unless <paramref name="sticky" /> is
+    ///   <c>true</c>, in which case the last non-<c>null</c> model will be
+    ///   returned. You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    ///
+    ///   The 'sticky' part is useful if you want to e.g. animate away a
+    ///   <c>UserControl</c> when the model is missing, but don't want the data
+    ///   used by that control to be cleared once the animation starts. (The
+    ///   animation must be triggered using another binding since this will never
+    ///   return <c>null</c>.)
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="toBindingModel">
+    ///   Converts the models to the model used by the bindings.
+    /// </param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="sticky">
+    ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
+    ///   model will be returned instead of <c>null</c>.
+    /// </param>
+    [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
+    static member subModelOpt
+        (
+            getSubModel: 'model -> 'subModel voption,
+            toBindingModel: 'model * 'subModel -> 'bindingModel,
+            toMsg: 'bindingMsg -> 'msg,
+            bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
+            ?sticky: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.vopt bindings
+        >> if (defaultArg sticky false) then
+               Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone)
+           else
+               id
+        >> Binding.mapModel (fun m -> getSubModel m |> ValueOption.map (fun sub -> toBindingModel (m, sub)))
+        >> Binding.mapMsg toMsg
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings and
+    ///   message type, and may not exist. If it does not exist, bindings to this
+    ///   model will return <c>null</c> unless <paramref name="sticky" /> is
+    ///   <c>true</c>, in which case the last non-<c>null</c> model will be
+    ///   returned. You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    ///
+    ///   The 'sticky' part is useful if you want to e.g. animate away a
+    ///   <c>UserControl</c> when the model is missing, but don't want the data
+    ///   used by that control to be cleared once the animation starts. (The
+    ///   animation must be triggered using another binding since this will never
+    ///   return <c>null</c>.)
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="toBindingModel">
+    ///   Converts the models to the model used by the bindings.
+    /// </param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="sticky">
+    ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
+    ///   model will be returned instead of <c>null</c>.
+    /// </param>
+    [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
+    static member subModelOpt
+        (
+            getSubModel: 'model -> 'subModel option,
+            toBindingModel: 'model * 'subModel -> 'bindingModel,
+            toMsg: 'bindingMsg -> 'msg,
+            bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
+            ?sticky: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.opt bindings
+        >> if (defaultArg sticky false) then
+               Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone)
+           else
+               id
+        >> Binding.mapModel (fun m -> getSubModel m |> Option.map (fun sub -> toBindingModel (m, sub)))
+        >> Binding.mapMsg toMsg
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings and
+    ///   message type, and may not exist. If it does not exist, bindings to this
+    ///   model will return <c>null</c> unless <paramref name="sticky" /> is
+    ///   <c>true</c>, in which case the last non-<c>null</c> model will be
+    ///   returned. You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    ///
+    ///   The 'sticky' part is useful if you want to e.g. animate away a
+    ///   <c>UserControl</c> when the model is missing, but don't want the data
+    ///   used by that control to be cleared once the animation starts. (The
+    ///   animation must be triggered using another binding since this will never
+    ///   return <c>null</c>.)
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="sticky">
+    ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
+    ///   model will be returned instead of <c>null</c>.
+    /// </param>
+    [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
+    static member subModelOpt
+        (
+            getSubModel: 'model -> 'subModel voption,
+            toMsg: 'subMsg -> 'msg,
+            bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
+            ?sticky: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.vopt bindings
+        >> if (defaultArg sticky false) then
+               Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone)
+           else
+               id
+        >> Binding.mapModel (fun m -> getSubModel m |> ValueOption.map (fun sub -> (m, sub)))
+        >> Binding.mapMsg toMsg
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings and
+    ///   message type, and may not exist. If it does not exist, bindings to this
+    ///   model will return <c>null</c> unless <paramref name="sticky" /> is
+    ///   <c>true</c>, in which case the last non-<c>null</c> model will be
+    ///   returned. You typically bind this to the <c>DataContext</c> of a
+    ///   <c>UserControl</c> or similar.
+    ///
+    ///   The 'sticky' part is useful if you want to e.g. animate away a
+    ///   <c>UserControl</c> when the model is missing, but don't want the data
+    ///   used by that control to be cleared once the animation starts. (The
+    ///   animation must be triggered using another binding since this will never
+    ///   return <c>null</c>.)
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="sticky">
+    ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
+    ///   model will be returned instead of <c>null</c>.
+    /// </param>
+    [<System.Obsolete("In version 6, this method will be removed.  Its replacement method does not yet exist (because it will be one of the existing methods with a different type signature).  Either wait for version 5 when this message will change or replace this method with (a specialization of) the implementation of this method.")>]
+    static member subModelOpt
+        (
+            getSubModel: 'model -> 'subModel option,
+            toMsg: 'subMsg -> 'msg,
+            bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
+            ?sticky: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.opt bindings
+        >> if (defaultArg sticky false) then
+               Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone)
+           else
+               id
+        >> Binding.mapModel (fun m -> getSubModel m |> Option.map (fun sub -> (m, sub)))
+        >> Binding.mapMsg toMsg
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings,
+    ///   and may not exist. If it does not exist, bindings to this model will
+    ///   return <c>null</c> unless <paramref name="sticky" /> is <c>true</c>, in
+    ///   which case the last non-<c>null</c> model will be returned. You
+    ///   typically bind this to the <c>DataContext</c> of a <c>UserControl</c> or
+    ///   similar.
+    ///
+    ///   The 'sticky' part is useful if you want to e.g. animate away a
+    ///   <c>UserControl</c> when the model is missing, but don't want the data
+    ///   used by that control to be cleared once the animation starts. (The
+    ///   animation must be triggered using another binding since this will never
+    ///   return <c>null</c>.)
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="sticky">
+    ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
+    ///   model will be returned instead of <c>null</c>.
+    /// </param>
+    [<System.Obsolete("In version 5, the type of the argument \"bindings\" will be changed to \"unit -> Binding<'model, 'msg> list\".  To avoid a compile error when upgrading, replace this method call with (a specialization of) its implementation.")>]
+    static member subModelOpt
+        (
+            getSubModel: 'model -> 'subModel voption,
+            bindings: unit -> Binding<'model * 'subModel, 'msg> list,
+            ?sticky: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.vopt bindings
+        >> if (defaultArg sticky false) then
+               Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone)
+           else
+               id
+        >> Binding.mapModel (fun m -> getSubModel m |> ValueOption.map (fun sub -> (m, sub)))
+
+
+    /// <summary>
+    ///   Creates a binding to a sub-model/component that has its own bindings,
+    ///   and may not exist. If it does not exist, bindings to this model will
+    ///   return <c>null</c> unless <paramref name="sticky" /> is <c>true</c>, in
+    ///   which case the last non-<c>null</c> model will be returned. You
+    ///   typically bind this to the <c>DataContext</c> of a <c>UserControl</c> or
+    ///   similar.
+    ///
+    ///   The 'sticky' part is useful if you want to e.g. animate away a
+    ///   <c>UserControl</c> when the model is missing, but don't want the data
+    ///   used by that control to be cleared once the animation starts. (The
+    ///   animation must be triggered using another binding since this will never
+    ///   return <c>null</c>.)
+    /// </summary>
+    /// <param name="getSubModel">Gets the sub-model from the model.</param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="sticky">
+    ///   If <c>true</c>, when the model is missing, the last non-<c>null</c>
+    ///   model will be returned instead of <c>null</c>.
+    /// </param>
+    [<System.Obsolete("In version 5, the type of the argument \"bindings\" will be changed to \"unit -> Binding<'model, 'msg> list\".  To avoid a compile error when upgrading, replace this method call with (a specialization of) its implementation.")>]
+    static member subModelOpt
+        (
+            getSubModel: 'model -> 'subModel option,
+            bindings: unit -> Binding<'model * 'subModel, 'msg> list,
+            ?sticky: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModel.opt bindings
+        >> if (defaultArg sticky false) then
+               Binding.addLazy (fun previous next -> previous.IsSome && next.IsNone)
+           else
+               id
+        >> Binding.mapModel (fun m -> getSubModel m |> Option.map (fun sub -> (m, sub)))
+
+
+    /// <summary>
+    ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (neither in code
+    ///   nor XAML).
+    ///
+    ///   The window can only be closed/hidden by changing the return value of
+    ///   <paramref name="getState" />, and can not be directly closed by the
+    ///   user. External close attempts (the Close/X button, Alt+F4, or System
+    ///   Menu -> Close) will cause the message specified by
+    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+    ///   will not confuse a user trying to close the window (e.g. by closing it,
+    ///   or displaying relevant feedback to the user.)
+    ///
+    ///   If you don't need a sub-model, you can use
+    ///   <c>WindowState&lt;unit&gt;</c> to just control the Window visibility,
+    ///   and pass <c>fst</c> to <paramref name="toBindingModel" />.
+    /// </summary>
+    /// <param name="getState">Gets the window state and a sub-model.</param>
+    /// <param name="toBindingModel">
+    ///   Converts the models to the model used by the bindings.
+    /// </param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="getWindow">
+    ///   The function used to get and configure the window.
+    /// </param>
+    /// <param name="onCloseRequested">
+    ///   The message to be dispatched on external close attempts (the Close/X
+    ///   button, Alt+F4, or System Menu -> Close).
+    /// </param>
+    /// <param name="isModal">
+    ///   Specifies whether the window will be shown modally (using
+    ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
+    ///   window.Show).
+    /// </param>
+    static member subModelWin
+        (
+            getState: 'model -> WindowState<'subModel>,
+            toBindingModel: 'model * 'subModel -> 'bindingModel,
+            toMsg: 'bindingMsg -> 'msg,
+            bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
+            getWindow: 'model -> Dispatch<'msg> -> #Window,
+            ?onCloseRequested: 'msg,
+            ?isModal: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModelWin.create
+            (fun m -> getState m |> WindowState.map (fun sub -> toBindingModel (m, sub)))
+            (fun args -> DynamicViewModel<'bindingModel, 'bindingMsg>(args, bindings ()))
+            IViewModel.updateModel
+            (fun _ -> toMsg)
+            (fun m d -> upcast getWindow m d)
+            (defaultArg isModal false)
+            (fun _ -> defaultArg (onCloseRequested |> Option.map ValueSome) ValueNone)
+
+
+    /// <summary>
+    ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (neither in code
+    ///   nor XAML).
+    ///
+    ///   The window can only be closed/hidden by changing the return value of
+    ///   <paramref name="getState" />, and can not be directly closed by the
+    ///   user. External close attempts (the Close/X button, Alt+F4, or System
+    ///   Menu -> Close) will cause the message specified by
+    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+    ///   will not confuse a user trying to close the window (e.g. by closing it,
+    ///   or displaying relevant feedback to the user.)
+    ///
+    ///   If you don't need a sub-model, you can use
+    ///   <c>WindowState&lt;unit&gt;</c> to just control the Window visibility,
+    ///   and pass <c>fst</c> to <paramref name="toBindingModel" />.
+    /// </summary>
+    /// <param name="getState">Gets the window state and a sub-model.</param>
+    /// <param name="toBindingModel">
+    ///   Converts the models to the model used by the bindings.
+    /// </param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="getWindow">
+    ///   The function used to get and configure the window.
+    /// </param>
+    /// <param name="onCloseRequested">
+    ///   The message to be dispatched on external close attempts (the Close/X
+    ///   button, Alt+F4, or System Menu -> Close).
+    /// </param>
+    /// <param name="isModal">
+    ///   Specifies whether the window will be shown modally (using
+    ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
+    ///   window.Show).
+    /// </param>
+    static member subModelWin
+        (
+            getState: 'model -> WindowState<'subModel>,
+            toBindingModel: 'model * 'subModel -> 'bindingModel,
+            toMsg: 'bindingMsg -> 'msg,
+            bindings: unit -> Binding<'bindingModel, 'bindingMsg> list,
+            getWindow: unit -> #Window,
+            ?onCloseRequested: 'msg,
+            ?isModal: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.subModelWin (
+            getState,
+            toBindingModel,
+            toMsg,
+            bindings,
+            (fun _ _ -> getWindow ()),
+            ?onCloseRequested = onCloseRequested,
+            ?isModal = isModal
+        )
+
+
+    /// <summary>
+    ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (neither in code
+    ///   nor XAML).
+    ///
+    ///   The window can only be closed/hidden by changing the return value of
+    ///   <paramref name="getState" />, and can not be directly closed by the
+    ///   user. External close attempts (the Close/X button, Alt+F4, or System
+    ///   Menu -> Close) will cause the message specified by
+    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+    ///   will not confuse a user trying to close the window (e.g. by closing it,
+    ///   or displaying relevant feedback to the user.)
+    /// </summary>
+    /// <param name="getState">Gets the window state and a sub-model.</param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="getWindow">
+    ///   The function used to get and configure the window.
+    /// </param>
+    /// <param name="onCloseRequested">
+    ///   The message to be dispatched on external close attempts (the Close/X
+    ///   button, Alt+F4, or System Menu -> Close).
+    /// </param>
+    /// <param name="isModal">
+    ///   Specifies whether the window will be shown modally (using
+    ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
+    ///   window.Show).
+    /// </param>
+    static member subModelWin
+        (
+            getState: 'model -> WindowState<'subModel>,
+            toMsg: 'subMsg -> 'msg,
+            bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
+            getWindow: 'model -> Dispatch<'msg> -> #Window,
+            ?onCloseRequested: 'msg,
+            ?isModal: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModelWin.create
+            (fun m -> getState m |> WindowState.map (fun sub -> (m, sub)))
+            (fun args -> DynamicViewModel<'model * 'subModel, 'subMsg>(args, bindings ()))
+            IViewModel.updateModel
+            (fun _ -> toMsg)
+            (fun m d -> upcast getWindow m d)
+            (defaultArg isModal false)
+            (fun _ -> defaultArg (onCloseRequested |> Option.map ValueSome) ValueNone)
+
+
+    /// <summary>
+    ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (neither in code
+    ///   nor XAML).
+    ///
+    ///   The window can only be closed/hidden by changing the return value of
+    ///   <paramref name="getState" />, and can not be directly closed by the
+    ///   user. External close attempts (the Close/X button, Alt+F4, or System
+    ///   Menu -> Close) will cause the message specified by
+    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+    ///   will not confuse a user trying to close the window (e.g. by closing it,
+    ///   or displaying relevant feedback to the user.)
+    /// </summary>
+    /// <param name="getState">Gets the window state and a sub-model.</param>
+    /// <param name="toMsg">
+    ///   Converts the messages used in the bindings to parent model messages
+    ///   (e.g. a parent message union case that wraps the child message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="getWindow">
+    ///   The function used to get and configure the window.
+    /// </param>
+    /// <param name="onCloseRequested">
+    ///   The message to be dispatched on external close attempts (the Close/X
+    ///   button, Alt+F4, or System Menu -> Close).
+    /// </param>
+    /// <param name="isModal">
+    ///   Specifies whether the window will be shown modally (using
+    ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
+    ///   window.Show).
+    /// </param>
+    static member subModelWin
+        (
+            getState: 'model -> WindowState<'subModel>,
+            toMsg: 'subMsg -> 'msg,
+            bindings: unit -> Binding<'model * 'subModel, 'subMsg> list,
+            getWindow: unit -> #Window,
+            ?onCloseRequested: 'msg,
+            ?isModal: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.subModelWin (
+            getState,
+            toMsg,
+            bindings,
+            (fun _ _ -> getWindow ()),
+            ?onCloseRequested = onCloseRequested,
+            ?isModal = isModal
+        )
+
+
+    /// <summary>
+    ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (neither in code
+    ///   nor XAML).
+    ///
+    ///   The window can only be closed/hidden by changing the return value of
+    ///   <paramref name="getState" />, and can not be directly closed by the
+    ///   user. External close attempts (the Close/X button, Alt+F4, or System
+    ///   Menu -> Close) will cause the message specified by
+    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+    ///   will not confuse a user trying to close the window (e.g. by closing it,
+    ///   or displaying relevant feedback to the user.)
+    /// </summary>
+    /// <param name="getState">Gets the window state and a sub-model.</param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="getWindow">
+    ///   The function used to get and configure the window.
+    /// </param>
+    /// <param name="onCloseRequested">
+    ///   The message to be dispatched on external close attempts (the Close/X
+    ///   button, Alt+F4, or System Menu -> Close).
+    /// </param>
+    /// <param name="isModal">
+    ///   Specifies whether the window will be shown modally (using
+    ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
+    ///   window.Show).
+    /// </param>
+    static member subModelWin
+        (
+            getState: 'model -> WindowState<'subModel>,
+            bindings: unit -> Binding<'model * 'subModel, 'msg> list,
+            getWindow: 'model -> Dispatch<'msg> -> #Window,
+            ?onCloseRequested: 'msg,
+            ?isModal: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModelWin.create
+            (fun m -> getState m |> WindowState.map (fun sub -> (m, sub)))
+            (fun args -> DynamicViewModel<'model * 'subModel, 'msg>(args, bindings ()))
+            IViewModel.updateModel
+            (fun _ -> id)
+            (fun m d -> upcast getWindow m d)
+            (defaultArg isModal false)
+            (fun _ -> defaultArg (onCloseRequested |> Option.map ValueSome) ValueNone)
+
+
+    /// <summary>
+    ///   Like <see cref="subModelOpt" />, but uses the <c>WindowState</c> wrapper
+    ///   to show/hide/close a new window that will have the specified bindings as
+    ///   its <c>DataContext</c>.
+    ///
+    ///   You do not need to set the <c>DataContext</c> yourself (neither in code
+    ///   nor XAML).
+    ///
+    ///   The window can only be closed/hidden by changing the return value of
+    ///   <paramref name="getState" />, and can not be directly closed by the
+    ///   user. External close attempts (the Close/X button, Alt+F4, or System
+    ///   Menu -> Close) will cause the message specified by
+    ///   <paramref name="onCloseRequested" /> to be dispatched. You should supply
+    ///   <paramref name="onCloseRequested" /> and react to this in a manner that
+    ///   will not confuse a user trying to close the window (e.g. by closing it,
+    ///   or displaying relevant feedback to the user.)
+    /// </summary>
+    /// <param name="getState">Gets the window state and a sub-model.</param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    /// <param name="getWindow">
+    ///   The function used to get and configure the window.
+    /// </param>
+    /// <param name="onCloseRequested">
+    ///   The message to be dispatched on external close attempts (the Close/X
+    ///   button, Alt+F4, or System Menu -> Close).
+    /// </param>
+    /// <param name="isModal">
+    ///   Specifies whether the window will be shown modally (using
+    ///   window.ShowDialog, blocking the rest of the app) or non-modally (using
+    ///   window.Show).
+    /// </param>
+    static member subModelWin
+        (
+            getState: 'model -> WindowState<'subModel>,
+            bindings: unit -> Binding<'model * 'subModel, 'msg> list,
+            getWindow: unit -> #Window,
+            ?onCloseRequested: 'msg,
+            ?isModal: bool
+        ) : string -> Binding<'model, 'msg> =
+        Binding.subModelWin (
+            getState,
+            bindings,
+            (fun _ _ -> getWindow ()),
+            ?onCloseRequested = onCloseRequested,
+            ?isModal = isModal
+        )
+
+    static member subModelSeq // TODO: make into function
+        (getBindings: unit -> Binding<'model, 'msg> list)
+        : string -> Binding<'model seq, int * 'msg> =
+        Binding.SubModelSeqUnkeyed.create
+            (fun args -> DynamicViewModel<'model, 'msg>(args, getBindings ()))
+            IViewModel.updateModel
+
+    static member subModelSeq // TODO: make into function
+        (getBindings: unit -> Binding<'model, 'msg> list, getId: 'model -> 'id)
+        : string -> Binding<'model seq, 'id * 'msg> =
+        Binding.SubModelSeqKeyed.create
+            (fun args -> DynamicViewModel<'model, 'msg>(args, getBindings ()))
+            IViewModel.updateModel
+            getId
+            (IViewModel.currentModel >> getId)
+
+
+    /// <summary>
+    ///   Creates a binding to a sequence of sub-models, each uniquely identified
+    ///   by the value returned by <paramref name="getId" />. The sub-models have
+    ///   their own bindings and message type. You typically bind this to the
+    ///   <c>ItemsSource</c> of an <c>ItemsControl</c>, <c>ListView</c>,
+    ///   <c>TreeView</c>, etc.
+    /// </summary>
+    /// <param name="getSubModels">Gets the sub-models from the model.</param>
+    /// <param name="toBindingModel">
+    ///   Converts the models to the model used by the bindings.
+    /// </param>
+    /// <param name="getId">Gets a unique identifier for a sub-model.</param>
+    /// <param name="toMsg">
+    ///   Converts the sub-model ID and messages used in the bindings to parent
+    ///   model messages (e.g. a parent message union case that wraps the
+    ///   sub-model ID and message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    static member subModelSeq
+        (
+            getSubModels: 'model -> #seq<'subModel>,
+            toBindingModel: 'model * 'subModel -> 'bindingModel,
+            getId: 'bindingModel -> 'id,
+            toMsg: 'id * 'bindingMsg -> 'msg,
+            bindings: unit -> Binding<'bindingModel, 'bindingMsg> list
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModelSeqKeyed.create
+            (fun args -> DynamicViewModel<'bindingModel, 'bindingMsg>(args, bindings ()))
+            IViewModel.updateModel
+            getId
+            (IViewModel.currentModel >> getId)
+        >> Binding.mapModel (fun m -> getSubModels m |> Seq.map (fun sub -> toBindingModel (m, sub)))
+        >> Binding.mapMsg toMsg
+
+
+    /// <summary>
+    ///   Creates a binding to a sequence of sub-models, each uniquely identified
+    ///   by the value returned by <paramref name="getId" />. The sub-models have
+    ///   their own bindings and message type. You typically bind this to the
+    ///   <c>ItemsSource</c> of an <c>ItemsControl</c>, <c>ListView</c>,
+    ///   <c>TreeView</c>, etc.
+    /// </summary>
+    /// <param name="getSubModels">Gets the sub-models from the model.</param>
+    /// <param name="getId">Gets a unique identifier for a sub-model.</param>
+    /// <param name="toMsg">
+    ///   Converts the sub-model ID and messages used in the bindings to parent
+    ///   model messages (e.g. a parent message union case that wraps the
+    ///   sub-model ID and message type).
+    /// </param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    static member subModelSeq
+        (
+            getSubModels: 'model -> #seq<'subModel>,
+            getId: 'subModel -> 'id,
+            toMsg: 'id * 'subMsg -> 'msg,
+            bindings: unit -> Binding<'model * 'subModel, 'subMsg> list
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModelSeqKeyed.create
+            (fun args -> DynamicViewModel<'model * 'subModel, 'subMsg>(args, bindings ()))
+            IViewModel.updateModel
+            (snd >> getId)
+            (IViewModel.currentModel >> snd >> getId)
+        >> Binding.mapModel (fun m -> getSubModels m |> Seq.map (fun sub -> (m, sub)))
+        >> Binding.mapMsg toMsg
+
+
+    /// <summary>
+    ///   Creates a binding to a sequence of sub-models, each uniquely identified
+    ///   by the value returned by <paramref name="getId" />. The sub-models have
+    ///   their own bindings. You typically bind this to the <c>ItemsSource</c> of
+    ///   an
+    ///   <c>ItemsControl</c>, <c>ListView</c>, <c>TreeView</c>, etc.
+    /// </summary>
+    /// <param name="getSubModels">Gets the sub-models from the model.</param>
+    /// <param name="getId">Gets a unique identifier for a sub-model.</param>
+    /// <param name="bindings">Returns the bindings for the sub-model.</param>
+    static member subModelSeq
+        (
+            getSubModels: 'model -> #seq<'subModel>,
+            getId: 'subModel -> 'id,
+            bindings: unit -> Binding<'model * 'subModel, 'msg> list
+        ) : string -> Binding<'model, 'msg> =
+        Binding.SubModelSeqKeyed.create
+            (fun args -> DynamicViewModel<'model * 'subModel, 'msg>(args, bindings ()))
+            IViewModel.updateModel
+            (snd >> getId)
+            (IViewModel.currentModel >> snd >> getId)
+        >> Binding.mapModel (fun m -> getSubModels m |> Seq.map (fun sub -> (m, sub)))
+        >> Binding.mapMsg snd
+
+
+    /// <summary>
+    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+    ///   the
+    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+    ///   binding. Automatically converts the dynamically created Elmish.WPF view
+    ///   models to/from their corresponding IDs, so the Elmish user code only has
+    ///   to work with the IDs.
+    ///
+    ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
+    ///   or
+    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+    ///   binding. This binding is less type-safe. It will throw when initializing
+    ///   the bindings if <paramref name="subModelSeqBindingName" />
+    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
+    ///   throw at runtime if the inferred <c>'id</c> type does not match the
+    ///   actual ID type used in that binding.
+    /// </summary>
+    /// <param name="subModelSeqBindingName">
+    ///   The name of the <see cref="subModelSeq" /> binding used as the items
+    ///   source.
+    /// </param>
+    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+    /// model.</param>
+    /// <param name="set">
+    ///   Returns the message to dispatch on selections/de-selections.
+    /// </param>
+    static member subModelSelectedItem
+        (subModelSeqBindingName: string, get: 'model -> 'id voption, set: 'id voption -> 'model -> 'msg)
+        : string -> Binding<'model, 'msg> =
+        Binding.SubModelSelectedItem.vopt subModelSeqBindingName
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addCaching
+
+    /// <summary>
+    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+    ///   the
+    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+    ///   binding. Automatically converts the dynamically created Elmish.WPF view
+    ///   models to/from their corresponding IDs, so the Elmish user code only has
+    ///   to work with the IDs.
+    ///
+    ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
+    ///   or
+    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+    ///   binding. This binding is less type-safe. It will throw when initializing
+    ///   the bindings if <paramref name="subModelSeqBindingName" />
+    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
+    ///   throw at runtime if the inferred <c>'id</c> type does not match the
+    ///   actual ID type used in that binding.
+    /// </summary>
+    /// <param name="subModelSeqBindingName">
+    ///   The name of the <see cref="subModelSeq" /> binding used as the items
+    ///   source.
+    /// </param>
+    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+    /// model.</param>
+    /// <param name="set">
+    ///   Returns the message to dispatch on selections/de-selections.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member subModelSelectedItem
+        (
+            subModelSeqBindingName: string,
+            get: 'model -> 'id voption,
+            set: 'id voption -> 'model -> 'msg,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+    /// <summary>
+    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+    ///   the
+    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+    ///   binding. Automatically converts the dynamically created Elmish.WPF view
+    ///   models to/from their corresponding IDs, so the Elmish user code only has
+    ///   to work with the IDs.
+    ///
+    ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
+    ///   or
+    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+    ///   binding. This binding is less type-safe. It will throw when initializing
+    ///   the bindings if <paramref name="subModelSeqBindingName" />
+    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
+    ///   throw at runtime if the inferred <c>'id</c> type does not match the
+    ///   actual ID type used in that binding.
+    /// </summary>
+    /// <param name="subModelSeqBindingName">
+    ///   The name of the <see cref="subModelSeq" /> binding used as the items
+    ///   source.
+    /// </param>
+    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+    /// model.</param>
+    /// <param name="set">
+    ///   Returns the message to dispatch on selections/de-selections.
+    /// </param>
+    static member subModelSelectedItem
+        (subModelSeqBindingName: string, get: 'model -> 'id option, set: 'id option -> 'model -> 'msg)
+        : string -> Binding<'model, 'msg> =
+        Binding.SubModelSelectedItem.opt subModelSeqBindingName
+        >> Binding.addLazy (=)
+        >> Binding.mapModel get
+        >> Binding.mapMsgWithModel set
+        >> Binding.addCaching
+
+    /// <summary>
+    ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+    ///   the
+    ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+    ///   binding. Automatically converts the dynamically created Elmish.WPF view
+    ///   models to/from their corresponding IDs, so the Elmish user code only has
+    ///   to work with the IDs.
+    ///
+    ///   Only use this if you are unable to use some kind of <c>SelectedValue</c>
+    ///   or
+    ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+    ///   binding. This binding is less type-safe. It will throw when initializing
+    ///   the bindings if <paramref name="subModelSeqBindingName" />
+    ///   does not correspond to a <see cref="subModelSeq" /> binding, and it will
+    ///   throw at runtime if the inferred <c>'id</c> type does not match the
+    ///   actual ID type used in that binding.
+    /// </summary>
+    /// <param name="subModelSeqBindingName">
+    ///   The name of the <see cref="subModelSeq" /> binding used as the items
+    ///   source.
+    /// </param>
+    /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+    /// model.</param>
+    /// <param name="set">
+    ///   Returns the message to dispatch on selections/de-selections.
+    /// </param>
+    /// <param name="wrapDispatch">
+    ///   Wraps the dispatch function with additional behavior, such as
+    ///   throttling, debouncing, or limiting.
+    /// </param>
+    [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+    static member subModelSelectedItem
+        (
+            subModelSeqBindingName: string,
+            get: 'model -> 'id option,
+            set: 'id option -> 'model -> 'msg,
+            wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+        ) : string -> Binding<'model, 'msg> =
+        Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
+        >> Binding.alterMsgStream wrapDispatch
+
+
+
+// Some members are implemented as extensions to help overload resolution
+[<AutoOpen>]
+module Extensions =
+
+    type Binding with
+
+        /// <summary>Creates a one-way-to-source binding.</summary>
+        /// <param name="set">Returns the message to dispatch.</param>
+        static member oneWayToSource(set: 'a -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.OneWayToSource.id<'model, 'a> >> Binding.mapMsg set
+
+        /// <summary>
+        ///   Creates a one-way-to-source binding to an optional value. The binding
+        ///   automatically converts between a missing value in the model and
+        ///   a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="set">Returns the message to dispatch.</param>
+        static member oneWayToSourceOpt(set: 'a option -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.OneWayToSource.opt >> Binding.mapMsg set
+
+        /// <summary>
+        ///   Creates a one-way-to-source binding to an optional value. The binding
+        ///   automatically converts between a missing value in the model and
+        ///   a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="set">Returns the message to dispatch.</param>
+        static member oneWayToSourceOpt(set: 'a voption -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.OneWayToSource.vopt >> Binding.mapMsg set
+
+
+        /// <summary>Creates a two-way binding.</summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        static member twoWay(get: 'model -> 'a, set: 'a -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.id<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+
+        /// <summary>Creates a two-way binding.</summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWay
+            (get: 'model -> 'a, set: 'a -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.twoWay (get, set) >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value. The binding
+        ///   automatically converts between the optional source value and an
+        ///   unwrapped (possibly <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        static member twoWayOpt(get: 'model -> 'a option, set: 'a option -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.opt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value. The binding
+        ///   automatically converts between the optional source value and an
+        ///   unwrapped (possibly <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOpt
+            (get: 'model -> 'a option, set: 'a option -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.twoWayOpt (get, set) >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value. The binding
+        ///   automatically converts between the optional source value and an
+        ///   unwrapped (possibly <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        static member twoWayOpt(get: 'model -> 'a voption, set: 'a voption -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.vopt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value. The binding
+        ///   automatically converts between the optional source value and an
+        ///   unwrapped (possibly <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOpt
+            (get: 'model -> 'a voption, set: 'a voption -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.twoWayOpt (get, set) >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation messages from the updated model.
+        /// </param>
+        static member twoWayValidate
+            (get: 'model -> 'a, set: 'a -> 'msg, validate: 'model -> string list)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.id<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation validate
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation messages from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayValidate
+            (
+                get: 'model -> 'a,
+                set: 'a -> 'msg,
+                validate: 'model -> string list,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayValidate
+            (get: 'model -> 'a, set: 'a -> 'msg, validate: 'model -> string voption)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.id<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> ValueOption.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayValidate
+            (
+                get: 'model -> 'a,
+                set: 'a -> 'msg,
+                validate: 'model -> string voption,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayValidate
+            (get: 'model -> 'a, set: 'a -> 'msg, validate: 'model -> string option)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.id<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> Option.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayValidate
+            (
+                get: 'model -> 'a,
+                set: 'a -> 'msg,
+                validate: 'model -> string option,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayValidate
+            (get: 'model -> 'a, set: 'a -> 'msg, validate: 'model -> Result<'ignored, string>)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.id<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding with validation using
+        ///   <c>INotifyDataErrorInfo</c>.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayValidate
+            (
+                get: 'model -> 'a,
+                set: 'a -> 'msg,
+                validate: 'model -> Result<'ignored, string>,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation messages from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a voption, set: 'a voption -> 'msg, validate: 'model -> string list)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.vopt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation validate
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation messages from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a voption,
+                set: 'a voption -> 'msg,
+                validate: 'model -> string list,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a voption, set: 'a voption -> 'msg, validate: 'model -> string voption)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.vopt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> ValueOption.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a voption,
+                set: 'a voption -> 'msg,
+                validate: 'model -> string voption,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a voption, set: 'a voption -> 'msg, validate: 'model -> string option)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.vopt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> Option.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a voption,
+                set: 'a voption -> 'msg,
+                validate: 'model -> string option,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a voption, set: 'a voption -> 'msg, validate: 'model -> Result<'ignored, string>)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.vopt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a voption,
+                set: 'a voption -> 'msg,
+                validate: 'model -> Result<'ignored, string>,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation messages from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a option, set: 'a option -> 'msg, validate: 'model -> string list)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.opt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation validate
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation messages from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a option,
+                set: 'a option -> 'msg,
+                validate: 'model -> string list,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a option, set: 'a option -> 'msg, validate: 'model -> string voption)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.opt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> ValueOption.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a option,
+                set: 'a option -> 'msg,
+                validate: 'model -> string voption,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a option, set: 'a option -> 'msg, validate: 'model -> string option)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.opt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> Option.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a option,
+                set: 'a option -> 'msg,
+                validate: 'model -> string option,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        static member twoWayOptValidate
+            (get: 'model -> 'a option, set: 'a option -> 'msg, validate: 'model -> Result<'ignored, string>)
+            : string -> Binding<'model, 'msg> =
+            Binding.TwoWay.opt<'a>
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addValidation (validate >> ValueOption.ofError >> ValueOption.toList)
+
+        /// <summary>
+        ///   Creates a two-way binding to an optional value with validation using
+        ///   <c>INotifyDataErrorInfo</c>. The binding automatically converts
+        ///   between the optional source value and an unwrapped (possibly
+        ///   <c>null</c>) value on the view side.
+        /// </summary>
+        /// <param name="get">Gets the value from the model.</param>
+        /// <param name="set">Returns the message to dispatch.</param>
+        /// <param name="validate">
+        ///   Returns the validation message from the updated model.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member twoWayOptValidate
+            (
+                get: 'model -> 'a option,
+                set: 'a option -> 'msg,
+                validate: 'model -> Result<'ignored, string>,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.twoWayOptValidate (get, set, validate)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that dispatches the specified message
+        ///   and can always execute.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        static member cmd(exec: 'msg) : string -> Binding<'model, 'msg> =
+            Binding.Cmd.create (fun _ -> exec |> ValueSome) (fun _ -> true)
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that dispatches the specified message
+        ///   and can always execute.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmd
+            (exec: 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmd exec >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that dispatches the specified message
+        ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        static member cmdIf(exec: 'msg, canExec: 'model -> bool) : string -> Binding<'model, 'msg> =
+            Binding.Cmd.create (fun _ -> exec |> ValueSome) canExec
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that dispatches the specified message
+        ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdIf
+            (exec: 'msg, canExec: 'model -> bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdIf (exec, canExec) >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can always execute.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        static member cmdParam(exec: obj -> 'msg) : string -> Binding<'model, 'msg> =
+            Binding.Cmd.createWithParam (fun p _ -> exec p |> ValueSome) (fun _ _ -> true) false
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can always execute.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParam
+            (exec: obj -> 'msg, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParam exec >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        static member cmdParamIf(exec: obj -> 'msg voption, ?uiBoundCmdParam: bool) : string -> Binding<'model, 'msg> =
+            Binding.Cmd.createWithParam
+                (fun p _ -> exec p)
+                (fun p _ -> exec p |> ValueOption.isSome)
+                (defaultArg uiBoundCmdParam false)
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> 'msg voption, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf exec >> Binding.alterMsgStream wrapDispatch
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>ValueSome</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> 'msg voption, uiBoundCmdParam: bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf (exec, uiBoundCmdParam)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        static member cmdParamIf(exec: obj -> 'msg option, ?uiBoundCmdParam: bool) : string -> Binding<'model, 'msg> =
+            Binding.Cmd.createWithParam
+                (fun p _ -> exec p |> ValueOption.ofOption)
+                (fun p _ -> exec p |> Option.isSome)
+                (defaultArg uiBoundCmdParam false)
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> 'msg option, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf exec >> Binding.alterMsgStream wrapDispatch
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>Some</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> 'msg option, uiBoundCmdParam: bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf (exec, uiBoundCmdParam)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
+        ///
+        ///   This overload allows more easily re-using the same validation
+        ///   functions for inputs and commands.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        static member cmdParamIf
+            (exec: obj -> Result<'msg, 'ignored>, ?uiBoundCmdParam: bool)
+            : string -> Binding<'model, 'msg> =
+            Binding.Cmd.createWithParam
+                (fun p _ -> exec p |> ValueOption.ofOk)
+                (fun p _ -> exec p |> Result.isOk)
+                (defaultArg uiBoundCmdParam false)
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
+        ///
+        ///   This overload allows more easily re-using the same validation
+        ///   functions for inputs and commands.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> Result<'msg, 'ignored>, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf exec >> Binding.alterMsgStream wrapDispatch
+
+        /// <summary>
+        ///   Creates a conditional <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="exec" /> returns <c>Ok</c>.
+        ///
+        ///   This overload allows more easily re-using the same validation
+        ///   functions for inputs and commands.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> Result<'msg, 'ignored>, uiBoundCmdParam: bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf (exec, uiBoundCmdParam)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        static member cmdParamIf
+            (exec: obj -> 'msg, canExec: obj -> bool, ?uiBoundCmdParam: bool)
+            : string -> Binding<'model, 'msg> =
+            Binding.Cmd.createWithParam
+                (fun p _ -> exec p |> ValueSome)
+                (fun p _ -> canExec p)
+                (defaultArg uiBoundCmdParam false)
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (exec: obj -> 'msg, canExec: obj -> bool, wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>)
+            : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf (exec, canExec) >> Binding.alterMsgStream wrapDispatch
+
+        /// <summary>
+        ///   Creates a <c>Command</c> binding that depends on the
+        ///   <c>CommandParameter</c>
+        ///   and can execute if <paramref name="canExec" /> returns <c>true</c>.
+        /// </summary>
+        /// <param name="exec">Returns the message to dispatch.</param>
+        /// <param name="canExec">Indicates whether the command can execute.</param>
+        /// <param name="uiBoundCmdParam">
+        ///   If <c>true</c>, <c>CanExecuteChanged</c> will trigger every time WPF's
+        ///   <c>CommandManager</c>
+        ///   detects UI changes that could potentially influence the command's
+        ///   ability to execute. This will likely lead to many more triggers than
+        ///   necessary, but is needed if you have bound the <c>CommandParameter</c>
+        ///   to another UI property.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member cmdParamIf
+            (
+                exec: obj -> 'msg,
+                canExec: obj -> bool,
+                uiBoundCmdParam: bool,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.cmdParamIf (exec, canExec, uiBoundCmdParam)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+        ///   the
+        ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+        ///   binding. Automatically converts the dynamically created Elmish.WPF
+        ///   view models to/from their corresponding IDs, so the Elmish user code
+        ///   only has to work with the IDs.
+        ///
+        ///   Only use this if you are unable to use some kind of
+        ///   <c>SelectedValue</c> or
+        ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+        ///   binding. This binding is less type-safe. It will throw when
+        ///   initializing the bindings if <paramref name="subModelSeqBindingName"
+        ///   />
+        ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
+        ///   will throw at runtime if the inferred <c>'id</c> type does not
+        ///   match the actual ID type used in that binding.
+        /// </summary>
+        /// <param name="subModelSeqBindingName">
+        ///   The name of the <see cref="subModelSeq" /> binding used as the items
+        ///   source.
+        /// </param>
+        /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+        /// model.</param>
+        /// <param name="set">
+        ///   Returns the message to dispatch on selections/de-selections.
+        /// </param>
+        static member subModelSelectedItem
+            (subModelSeqBindingName: string, get: 'model -> 'id voption, set: 'id voption -> 'msg)
+            : string -> Binding<'model, 'msg> =
+            Binding.SubModelSelectedItem.vopt subModelSeqBindingName
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addCaching
+
+        /// <summary>
+        ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+        ///   the
+        ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+        ///   binding. Automatically converts the dynamically created Elmish.WPF
+        ///   view models to/from their corresponding IDs, so the Elmish user code
+        ///   only has to work with the IDs.
+        ///
+        ///   Only use this if you are unable to use some kind of
+        ///   <c>SelectedValue</c> or
+        ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+        ///   binding. This binding is less type-safe. It will throw when
+        ///   initializing the bindings if <paramref name="subModelSeqBindingName"
+        ///   />
+        ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
+        ///   will throw at runtime if the inferred <c>'id</c> type does not
+        ///   match the actual ID type used in that binding.
+        /// </summary>
+        /// <param name="subModelSeqBindingName">
+        ///   The name of the <see cref="subModelSeq" /> binding used as the items
+        ///   source.
+        /// </param>
+        /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+        /// model.</param>
+        /// <param name="set">
+        ///   Returns the message to dispatch on selections/de-selections.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member subModelSelectedItem
+            (
+                subModelSeqBindingName: string,
+                get: 'model -> 'id voption,
+                set: 'id voption -> 'msg,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
+            >> Binding.alterMsgStream wrapDispatch
+
+
+        /// <summary>
+        ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+        ///   the
+        ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+        ///   binding. Automatically converts the dynamically created Elmish.WPF
+        ///   view models to/from their corresponding IDs, so the Elmish user code
+        ///   only has to work with the IDs.
+        ///
+        ///   Only use this if you are unable to use some kind of
+        ///   <c>SelectedValue</c> or
+        ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+        ///   binding. This binding is less type-safe. It will throw when
+        ///   initializing the bindings if <paramref name="subModelSeqBindingName"
+        ///   />
+        ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
+        ///   will throw at runtime if the inferred <c>'id</c> type does not
+        ///   match the actual ID type used in that binding.
+        /// </summary>
+        /// <param name="subModelSeqBindingName">
+        ///   The name of the <see cref="subModelSeq" /> binding used as the items
+        ///   source.
+        /// </param>
+        /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+        /// model.</param>
+        /// <param name="set">
+        ///   Returns the message to dispatch on selections/de-selections.
+        /// </param>
+        static member subModelSelectedItem
+            (subModelSeqBindingName: string, get: 'model -> 'id option, set: 'id option -> 'msg)
+            : string -> Binding<'model, 'msg> =
+            Binding.SubModelSelectedItem.opt subModelSeqBindingName
+            >> Binding.addLazy (=)
+            >> Binding.mapModel get
+            >> Binding.mapMsg set
+            >> Binding.addCaching
+
+        /// <summary>
+        ///   Creates a two-way binding to a <c>SelectedItem</c>-like property where
+        ///   the
+        ///   <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
+        ///   binding. Automatically converts the dynamically created Elmish.WPF
+        ///   view models to/from their corresponding IDs, so the Elmish user code
+        ///   only has to work with the IDs.
+        ///
+        ///   Only use this if you are unable to use some kind of
+        ///   <c>SelectedValue</c> or
+        ///   <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
+        ///   binding. This binding is less type-safe. It will throw when
+        ///   initializing the bindings if <paramref name="subModelSeqBindingName"
+        ///   />
+        ///   does not correspond to a <see cref="subModelSeq" /> binding, and it
+        ///   will throw at runtime if the inferred <c>'id</c> type does not
+        ///   match the actual ID type used in that binding.
+        /// </summary>
+        /// <param name="subModelSeqBindingName">
+        ///   The name of the <see cref="subModelSeq" /> binding used as the items
+        ///   source.
+        /// </param>
+        /// <param name="get">Gets the selected sub-model/sub-binding ID from the
+        /// model.</param>
+        /// <param name="set">
+        ///   Returns the message to dispatch on selections/de-selections.
+        /// </param>
+        /// <param name="wrapDispatch">
+        ///   Wraps the dispatch function with additional behavior, such as
+        ///   throttling, debouncing, or limiting.
+        /// </param>
+        [<System.Obsolete("In version 5, this method will be removed.  Use the overload without the \"wrapDispatch\" parameter followed by a call to \"Binding.alterMsgStream\".  For an example, see how this method is implemented.")>]
+        static member subModelSelectedItem
+            (
+                subModelSeqBindingName: string,
+                get: 'model -> 'id option,
+                set: 'id option -> 'msg,
+                wrapDispatch: Dispatch<'msg> -> Dispatch<'msg>
+            ) : string -> Binding<'model, 'msg> =
+            Binding.subModelSelectedItem (subModelSeqBindingName, get, set)
+            >> Binding.alterMsgStream wrapDispatch
\ No newline at end of file
diff --git a/src/Elmish.WPF/BindingData.fs b/src/Elmish.WPF/BindingData.fs
index 0b19d65e..d06e2245 100644
--- a/src/Elmish.WPF/BindingData.fs
+++ b/src/Elmish.WPF/BindingData.fs
@@ -10,871 +10,815 @@ open Elmish
 
 module Helper =
 
-  let mapDispatch
-      (getCurrentModel: unit -> 'model)
-      (set: 'bindingMsg -> 'model -> 'msg)
-      (dispatch: 'msg -> unit)
-      : 'bindingMsg -> unit =
-    fun bMsg -> getCurrentModel () |> set bMsg |> dispatch
+    let mapDispatch
+        (getCurrentModel: unit -> 'model)
+        (set: 'bindingMsg -> 'model -> 'msg)
+        (dispatch: 'msg -> unit)
+        : 'bindingMsg -> unit =
+        fun bMsg -> getCurrentModel () |> set bMsg |> dispatch
 
 
-type OneWayData<'model, 'a> =
-  { Get: 'model -> 'a }
+type OneWayData<'model, 'a> = { Get: 'model -> 'a }
 
 
-type OneWayToSourceData<'model, 'msg, 'a> =
-  { Set: 'a -> 'model -> 'msg }
+type OneWayToSourceData<'model, 'msg, 'a> = { Set: 'a -> 'model -> 'msg }
 
 
-type OneWaySeqData<'model, 'a, 'aCollection, 'id when 'id : equality> =
-  { Get: 'model -> 'a seq
-    CreateCollection: 'a seq -> CollectionTarget<'a, 'aCollection>
-    GetId: 'a -> 'id
-    ItemEquals: 'a -> 'a -> bool }
+type OneWaySeqData<'model, 'a, 'aCollection, 'id when 'id: equality> =
+    { Get: 'model -> 'a seq
+      CreateCollection: 'a seq -> CollectionTarget<'a, 'aCollection>
+      GetId: 'a -> 'id
+      ItemEquals: 'a -> 'a -> bool }
 
-  member d.Merge(values: CollectionTarget<'a, 'aCollection>, newModel: 'model) =
-    let create v _ = v
-    let update oldVal newVal oldIdx =
-      if not (d.ItemEquals newVal oldVal) then
-        values.SetAt (oldIdx, newVal)
-    let newVals = newModel |> d.Get |> Seq.toArray
-    Merge.keyed d.GetId d.GetId create update values newVals
+    member d.Merge(values: CollectionTarget<'a, 'aCollection>, newModel: 'model) =
+        let create v _ = v
+
+        let update oldVal newVal oldIdx =
+            if not (d.ItemEquals newVal oldVal) then
+                values.SetAt(oldIdx, newVal)
+
+        let newVals = newModel |> d.Get |> Seq.toArray
+        Merge.keyed d.GetId d.GetId create update values newVals
 
 
 type TwoWayData<'model, 'msg, 'a> =
-  { Get: 'model -> 'a
-    Set: 'a -> 'model -> 'msg }
+    { Get: 'model -> 'a
+      Set: 'a -> 'model -> 'msg }
 
 
-type CmdData<'model, 'msg> = {
-  Exec: obj -> 'model -> 'msg voption
-  CanExec: obj -> 'model -> bool
-  AutoRequery: bool
-}
+type CmdData<'model, 'msg> =
+    { Exec: obj -> 'model -> 'msg voption
+      CanExec: obj -> 'model -> bool
+      AutoRequery: bool }
 
 
 type SubModelSelectedItemData<'model, 'msg, 'id> =
-  { Get: 'model -> 'id voption
-    Set: 'id voption -> 'model -> 'msg
-    SubModelSeqBindingName: string }
+    { Get: 'model -> 'id voption
+      Set: 'id voption -> 'model -> 'msg
+      SubModelSeqBindingName: string }
 
 
-type SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> = {
-  GetModel: 'model -> 'bindingModel voption
-  CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
-  UpdateViewModel: 'vm * 'bindingModel -> unit
-  ToMsg: 'model -> 'bindingMsg -> 'msg
-}
+type SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
+    { GetModel: 'model -> 'bindingModel voption
+      CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
+      UpdateViewModel: 'vm * 'bindingModel -> unit
+      ToMsg: 'model -> 'bindingMsg -> 'msg }
 
 
-and SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> = {
-  GetState: 'model -> WindowState<'bindingModel>
-  CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
-  UpdateViewModel: 'vm * 'bindingModel -> unit
-  ToMsg: 'model -> 'bindingMsg -> 'msg
-  GetWindow: 'model -> Dispatch<'msg> -> Window
-  IsModal: bool
-  OnCloseRequested: 'model -> 'msg voption
-}
+and SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
+    { GetState: 'model -> WindowState<'bindingModel>
+      CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
+      UpdateViewModel: 'vm * 'bindingModel -> unit
+      ToMsg: 'model -> 'bindingMsg -> 'msg
+      GetWindow: 'model -> Dispatch<'msg> -> Window
+      IsModal: bool
+      OnCloseRequested: 'model -> 'msg voption }
 
 
 and SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection> =
-  { GetModels: 'model -> 'bindingModel seq
-    CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
-    CreateCollection: 'vm seq -> CollectionTarget<'vm, 'vmCollection>
-    UpdateViewModel: 'vm * 'bindingModel -> unit
-    ToMsg: 'model -> int * 'bindingMsg -> 'msg }
-
-
-and SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id when 'id : equality> =
-  { GetSubModels: 'model -> 'bindingModel seq
-    CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
-    CreateCollection: 'vm seq -> CollectionTarget<'vm, 'vmCollection>
-    UpdateViewModel: 'vm * 'bindingModel -> unit
-    ToMsg: 'model -> 'id * 'bindingMsg -> 'msg
-    BmToId: 'bindingModel -> 'id
-    VmToId: 'vm -> 'id }
-
-  member d.MergeKeyed
-      (create: 'bindingModel -> 'id -> 'vm,
-       update: 'vm -> 'bindingModel -> unit,
-       values: CollectionTarget<'vm, 'vmCollection>,
-       newSubModels: 'bindingModel []) =
-    let update vm bm _ = update vm bm
-    Merge.keyed d.BmToId d.VmToId create update values newSubModels
+    { GetModels: 'model -> 'bindingModel seq
+      CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
+      CreateCollection: 'vm seq -> CollectionTarget<'vm, 'vmCollection>
+      UpdateViewModel: 'vm * 'bindingModel -> unit
+      ToMsg: 'model -> int * 'bindingMsg -> 'msg }
+
+
+and SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id when 'id: equality> =
+    { GetSubModels: 'model -> 'bindingModel seq
+      CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
+      CreateCollection: 'vm seq -> CollectionTarget<'vm, 'vmCollection>
+      UpdateViewModel: 'vm * 'bindingModel -> unit
+      ToMsg: 'model -> 'id * 'bindingMsg -> 'msg
+      BmToId: 'bindingModel -> 'id
+      VmToId: 'vm -> 'id }
+
+    member d.MergeKeyed
+        (
+            create: 'bindingModel -> 'id -> 'vm,
+            update: 'vm -> 'bindingModel -> unit,
+            values: CollectionTarget<'vm, 'vmCollection>,
+            newSubModels: 'bindingModel[]
+        ) =
+        let update vm bm _ = update vm bm
+        Merge.keyed d.BmToId d.VmToId create update values newSubModels
 
 
 and ValidationData<'model, 'msg, 't> =
-  { BindingData: BindingData<'model, 'msg, 't>
-    Validate: 'model -> string list }
+    { BindingData: BindingData<'model, 'msg, 't>
+      Validate: 'model -> string list }
 
 
 and LazyData<'model, 'msg, 'bindingModel, 'bindingMsg, 't> =
-  { BindingData: BindingData<'bindingModel, 'bindingMsg, 't>
-    Get: 'model -> 'bindingModel
-    Set: 'bindingMsg -> 'model -> 'msg
-    Equals: 'bindingModel -> 'bindingModel -> bool }
+    { BindingData: BindingData<'bindingModel, 'bindingMsg, 't>
+      Get: 'model -> 'bindingModel
+      Set: 'bindingMsg -> 'model -> 'msg
+      Equals: 'bindingModel -> 'bindingModel -> bool }
 
-  member this.MapDispatch
-      (getCurrentModel: unit -> 'model,
-       dispatch: 'msg -> unit)
-       : 'bindingMsg -> unit =
-    Helper.mapDispatch getCurrentModel this.Set dispatch
+    member this.MapDispatch(getCurrentModel: unit -> 'model, dispatch: 'msg -> unit) : 'bindingMsg -> unit =
+        Helper.mapDispatch getCurrentModel this.Set dispatch
 
 
 and AlterMsgStreamData<'model, 'msg, 'bindingModel, 'bindingMsg, 'dispatchMsg, 't> =
- { BindingData: BindingData<'bindingModel, 'bindingMsg, 't>
-   Get: 'model -> 'bindingModel
-   Set: 'dispatchMsg -> 'model -> 'msg
-   AlterMsgStream: ('dispatchMsg -> unit) -> 'bindingMsg -> unit }
+    { BindingData: BindingData<'bindingModel, 'bindingMsg, 't>
+      Get: 'model -> 'bindingModel
+      Set: 'dispatchMsg -> 'model -> 'msg
+      AlterMsgStream: ('dispatchMsg -> unit) -> 'bindingMsg -> unit }
 
-  member this.MapDispatch
-      (getCurrentModel: unit -> 'model,
-       dispatch: 'msg -> unit)
-       : 'bindingMsg -> unit =
-    Helper.mapDispatch getCurrentModel this.Set dispatch
-    |> this.AlterMsgStream
+    member this.MapDispatch(getCurrentModel: unit -> 'model, dispatch: 'msg -> unit) : 'bindingMsg -> unit =
+        Helper.mapDispatch getCurrentModel this.Set dispatch |> this.AlterMsgStream
 
 
 and BaseBindingData<'model, 'msg, 't> =
-  | OneWayData of OneWayData<'model, 't>
-  | OneWayToSourceData of OneWayToSourceData<'model, 'msg, 't>
-  | OneWaySeqData of OneWaySeqData<'model, obj, 't, obj>
-  | TwoWayData of TwoWayData<'model, 'msg, 't>
-  | CmdData of CmdData<'model, 'msg>
-  | SubModelData of SubModelData<'model, 'msg, obj, obj, 't>
-  | SubModelWinData of SubModelWinData<'model, 'msg, obj, obj, 't>
-  | SubModelSeqUnkeyedData of SubModelSeqUnkeyedData<'model, 'msg, obj, obj, obj, 't>
-  | SubModelSeqKeyedData of SubModelSeqKeyedData<'model, 'msg, obj, obj, obj, 't, obj>
-  | SubModelSelectedItemData of SubModelSelectedItemData<'model, 'msg, obj>
+    | OneWayData of OneWayData<'model, 't>
+    | OneWayToSourceData of OneWayToSourceData<'model, 'msg, 't>
+    | OneWaySeqData of OneWaySeqData<'model, obj, 't, obj>
+    | TwoWayData of TwoWayData<'model, 'msg, 't>
+    | CmdData of CmdData<'model, 'msg>
+    | SubModelData of SubModelData<'model, 'msg, obj, obj, 't>
+    | SubModelWinData of SubModelWinData<'model, 'msg, obj, obj, 't>
+    | SubModelSeqUnkeyedData of SubModelSeqUnkeyedData<'model, 'msg, obj, obj, obj, 't>
+    | SubModelSeqKeyedData of SubModelSeqKeyedData<'model, 'msg, obj, obj, obj, 't, obj>
+    | SubModelSelectedItemData of SubModelSelectedItemData<'model, 'msg, obj>
 
 
 and BindingData<'model, 'msg, 't> =
-  | BaseBindingData of BaseBindingData<'model, 'msg, 't>
-  | CachingData of BindingData<'model, 'msg, 't>
-  | ValidationData of ValidationData<'model, 'msg, 't>
-  | LazyData of LazyData<'model, 'msg, obj, obj, 't>
-  | AlterMsgStreamData of AlterMsgStreamData<'model, 'msg, obj, obj, obj, 't>
+    | BaseBindingData of BaseBindingData<'model, 'msg, 't>
+    | CachingData of BindingData<'model, 'msg, 't>
+    | ValidationData of ValidationData<'model, 'msg, 't>
+    | LazyData of LazyData<'model, 'msg, obj, obj, 't>
+    | AlterMsgStreamData of AlterMsgStreamData<'model, 'msg, obj, obj, obj, 't>
 
 
 
 module BindingData =
 
-  module private MapT =
-
-    let baseCase (fOut: 't0 -> 't1) (fIn: 't1 -> 't0) =
-      function
-      | OneWayData d -> OneWayData {
-          Get = d.Get >> fOut
-        }
-      | OneWayToSourceData d -> OneWayToSourceData {
-          Set = fIn >> d.Set
-        }
-      | OneWaySeqData d -> OneWaySeqData {
-          Get = d.Get
-          CreateCollection = d.CreateCollection >> CollectionTarget.mapCollection fOut
-          GetId = d.GetId
-          ItemEquals = d.ItemEquals
-        }
-      | TwoWayData d -> TwoWayData {
-          Get = d.Get >> fOut
-          Set = fIn >> d.Set
-        }
-      | CmdData d -> CmdData {
-          Exec = d.Exec
-          CanExec = d.CanExec
-          AutoRequery = d.AutoRequery
-        }
-      | SubModelData d -> SubModelData {
-          GetModel = d.GetModel
-          CreateViewModel = d.CreateViewModel >> fOut
-          UpdateViewModel = (fun (vm,m) -> d.UpdateViewModel (fIn vm, m))
-          ToMsg = d.ToMsg
-        }
-      | SubModelWinData d -> SubModelWinData {
-          GetState = d.GetState
-          CreateViewModel = d.CreateViewModel >> fOut
-          UpdateViewModel = (fun (vm,m) -> d.UpdateViewModel (fIn vm, m))
-          ToMsg = d.ToMsg
-          GetWindow = d.GetWindow
-          IsModal = d.IsModal
-          OnCloseRequested = d.OnCloseRequested
-        }
-      | SubModelSeqUnkeyedData d -> SubModelSeqUnkeyedData {
-          GetModels = d.GetModels
-          CreateViewModel = d.CreateViewModel
-          CreateCollection = d.CreateCollection >> CollectionTarget.mapCollection fOut
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = d.ToMsg
-        }
-      | SubModelSeqKeyedData d -> SubModelSeqKeyedData {
-          GetSubModels = d.GetSubModels
-          CreateViewModel = d.CreateViewModel
-          CreateCollection = d.CreateCollection >> CollectionTarget.mapCollection fOut
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = d.ToMsg
-          VmToId = d.VmToId
-          BmToId = d.BmToId
-        }
-      | SubModelSelectedItemData d -> SubModelSelectedItemData {
-          Get = d.Get
-          Set = d.Set
-          SubModelSeqBindingName = d.SubModelSeqBindingName
-        }
-
-    let rec recursiveCase<'model, 'msg, 't0, 't1> (fOut: 't0 -> 't1) (fIn: 't1 -> 't0)
-      : BindingData<'model, 'msg, 't0> -> BindingData<'model, 'msg, 't1> =
-      function
-      | BaseBindingData d -> d |> baseCase fOut fIn |> BaseBindingData
-      | CachingData d -> d |> recursiveCase<'model, 'msg, 't0, 't1> fOut fIn |> CachingData
-      | ValidationData d -> ValidationData {
-          BindingData = recursiveCase<'model, 'msg, 't0, 't1> fOut fIn d.BindingData
-          Validate = d.Validate
-        }
-      | LazyData d -> LazyData {
-          Get = d.Get
-          Set = d.Set
-          BindingData = recursiveCase<obj, obj, 't0, 't1> fOut fIn d.BindingData
-          Equals = d.Equals
-        }
-      | AlterMsgStreamData d -> AlterMsgStreamData {
-          BindingData = recursiveCase<obj, obj, 't0, 't1> fOut fIn d.BindingData
-          AlterMsgStream = d.AlterMsgStream
-          Get = d.Get
-          Set = d.Set
-        }
-
-  let boxT b = MapT.recursiveCase box unbox b
-  let unboxT b = MapT.recursiveCase unbox box b
-
-  let mapModel f =
-    let binaryHelper binary x m = binary x (f m)
-    let baseCase = function
-      | OneWayData d -> OneWayData {
-          Get = f >> d.Get
-        }
-      | OneWayToSourceData d -> OneWayToSourceData {
-          Set = binaryHelper d.Set
-        }
-      | OneWaySeqData d -> OneWaySeqData {
-          Get = f >> d.Get
-          CreateCollection = d.CreateCollection
-          GetId = d.GetId
-          ItemEquals = d.ItemEquals
-        }
-      | TwoWayData d -> TwoWayData {
-          Get = f >> d.Get
-          Set = binaryHelper d.Set
-        }
-      | CmdData d -> CmdData {
-          Exec = binaryHelper d.Exec
-          CanExec = binaryHelper d.CanExec
-          AutoRequery = d.AutoRequery
-        }
-      | SubModelData d -> SubModelData {
-          GetModel = f >> d.GetModel
-          CreateViewModel = d.CreateViewModel
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = f >> d.ToMsg
-        }
-      | SubModelWinData d -> SubModelWinData {
-          GetState = f >> d.GetState
-          CreateViewModel = d.CreateViewModel
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = f >> d.ToMsg
-          GetWindow = f >> d.GetWindow
-          IsModal = d.IsModal
-          OnCloseRequested = f >> d.OnCloseRequested
-        }
-      | SubModelSeqUnkeyedData d -> SubModelSeqUnkeyedData {
-          GetModels = f >> d.GetModels
-          CreateViewModel = d.CreateViewModel
-          CreateCollection = d.CreateCollection
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = f >> d.ToMsg
-        }
-      | SubModelSeqKeyedData d -> SubModelSeqKeyedData {
-          GetSubModels = f >> d.GetSubModels
-          CreateViewModel = d.CreateViewModel
-          CreateCollection = d.CreateCollection
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = f >> d.ToMsg
-          BmToId = d.BmToId
-          VmToId = d.VmToId
-        }
-      | SubModelSelectedItemData d -> SubModelSelectedItemData {
-          Get = f >> d.Get
-          Set = binaryHelper d.Set
-          SubModelSeqBindingName = d.SubModelSeqBindingName
-        }
-    let rec recursiveCase = function
-      | BaseBindingData d -> d |> baseCase |> BaseBindingData
-      | CachingData d -> d |> recursiveCase |> CachingData
-      | ValidationData d -> ValidationData {
-          BindingData = recursiveCase d.BindingData
-          Validate = f >> d.Validate
-        }
-      | LazyData d -> LazyData {
-          BindingData = d.BindingData
-          Get = f >> d.Get
-          Set = binaryHelper d.Set
-          Equals = d.Equals
-        }
-      | AlterMsgStreamData d -> AlterMsgStreamData {
-          BindingData = d.BindingData
-          AlterMsgStream = d.AlterMsgStream
-          Get = f >> d.Get
-          Set = binaryHelper d.Set
-        }
-    recursiveCase
-
-  let mapMsgWithModel (f: 'a -> 'model -> 'b) =
-    let baseCase = function
-      | OneWayData d -> d |> OneWayData
-      | OneWayToSourceData d -> OneWayToSourceData {
-          Set = fun v m -> f (d.Set v m) m
-        }
-      | OneWaySeqData d -> d |> OneWaySeqData
-      | TwoWayData d -> TwoWayData {
-          Get = d.Get
-          Set = fun v m -> f (d.Set v m) m
-        }
-      | CmdData d -> CmdData {
-          Exec = fun p m -> d.Exec p m |> ValueOption.map (fun msg -> f msg m)
-          CanExec = fun p m -> d.CanExec p m
-          AutoRequery = d.AutoRequery
-        }
-      | SubModelData d -> SubModelData {
-          GetModel = d.GetModel
-          CreateViewModel = d.CreateViewModel
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m
-        }
-      | SubModelWinData d -> SubModelWinData {
-          GetState = d.GetState
-          CreateViewModel = d.CreateViewModel
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m
-          GetWindow = fun m dispatch -> d.GetWindow m (fun msg -> f msg m |> dispatch)
-          IsModal = d.IsModal
-          OnCloseRequested = fun m -> m |> d.OnCloseRequested |> ValueOption.map (fun msg -> f msg m)
-        }
-      | SubModelSeqUnkeyedData d -> SubModelSeqUnkeyedData {
-          GetModels = d.GetModels
-          CreateViewModel = d.CreateViewModel
-          CreateCollection = d.CreateCollection
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m
-        }
-      | SubModelSeqKeyedData d -> SubModelSeqKeyedData {
-          GetSubModels = d.GetSubModels
-          CreateViewModel = d.CreateViewModel
-          CreateCollection = d.CreateCollection
-          UpdateViewModel = d.UpdateViewModel
-          ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m
-          BmToId = d.BmToId
-          VmToId = d.VmToId
-        }
-      | SubModelSelectedItemData d -> SubModelSelectedItemData {
-          Get = d.Get
-          Set = fun v m -> f (d.Set v m) m
-          SubModelSeqBindingName = d.SubModelSeqBindingName
-        }
-    let rec recursiveCase = function
-      | BaseBindingData d -> d |> baseCase |> BaseBindingData
-      | CachingData d -> d |> recursiveCase |> CachingData
-      | ValidationData d -> ValidationData {
-          BindingData = recursiveCase d.BindingData
-          Validate = d.Validate
-        }
-      | LazyData d ->
-      LazyData {
-          BindingData = d.BindingData
-          Get = d.Get
-          Set = fun a m -> f (d.Set a m) m
-          Equals = d.Equals
-        }
-      | AlterMsgStreamData d -> AlterMsgStreamData {
-          BindingData = d.BindingData
-          Get = d.Get
-          Set = fun a m -> f (d.Set a m) m
-          AlterMsgStream = d.AlterMsgStream
-        }
-    recursiveCase
-
-  let mapMsg f = mapMsgWithModel (fun a _ -> f a)
-
-  let setMsgWithModel f = mapMsgWithModel (fun _ m -> f m)
-  let setMsg msg = mapMsg (fun _ -> msg)
-
-  let addCaching b = b |> CachingData
-  let addValidation validate b = { BindingData = b; Validate = validate } |> ValidationData
-  let addLazy (equals: 'model -> 'model -> bool) b =
-      { BindingData = b |> mapModel unbox |> mapMsg box
-        Get = box
-        Set = fun (dMsg: obj) _ -> unbox dMsg
-        Equals = fun m1 m2 -> equals (unbox m1) (unbox m2)
-      } |> LazyData
-  let alterMsgStream
-      (alteration: ('dispatchMsg -> unit) -> 'bindingMsg -> unit)
-      (b: BindingData<'bindingModel, 'bindingMsg, 't>)
-      : BindingData<'model, 'msg, 't> =
-    { BindingData = b |> mapModel unbox |> mapMsg box
-      Get = box
-      Set = fun (dMsg: obj) _ -> unbox dMsg
-      AlterMsgStream =
-        fun (f: obj -> unit) ->
-          let f' = box >> f
-          let g = alteration f'
-          unbox >> g
-    } |> AlterMsgStreamData
-  let addSticky (predicate: 'model -> bool) (binding: BindingData<'model, 'msg, 't>) =
-    let mutable stickyModel = None
-    let f newModel =
-      if predicate newModel then
-        stickyModel <- Some newModel
-        newModel
-      else
-        stickyModel |> Option.defaultValue newModel
-    binding |> mapModel f
-
-
-  module Option =
-
-    let box ma = ma |> Option.map box |> Option.toObj
-    let unbox obj = obj |> Option.ofObj |> Option.map unbox
-
-  module ValueOption =
-
-    let box ma = ma |> ValueOption.map box |> ValueOption.toObj
-    let unbox obj = obj |> ValueOption.ofObj |> ValueOption.map unbox
-
-
-  module OneWay =
-
-    let id<'a, 'msg> : BindingData<'a, 'msg, 'a> =
-      { Get = id }
-      |> OneWayData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGet
-        (d: OneWayData<'model, 'a>) =
-      { d with Get = mGet d.Get }
-
-    let measureFunctions
-        mGet =
-      mapFunctions
-        (mGet "get")
-
-
-  module OneWayToSource =
-
-    let id<'model, 'a> : BindingData<'model, 'a, 'a> =
-      { OneWayToSourceData.Set = Func2.id1 }
-      |> OneWayToSourceData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mSet
-        (d: OneWayToSourceData<'model, 'msg, 'a>) =
-      { d with Set = mSet d.Set }
-
-    let measureFunctions
-        mSet =
-      mapFunctions
-        (mSet "set")
-
-
-  module OneWaySeq =
-
-    let mapMinorTypes
-        (outMapA: 'a -> 'a0)
-        (outMapId: 'id -> 'id0)
-        (inMapA: 'a0 -> 'a)
-        (d: OneWaySeqData<'model, 'a, 'aCollection, 'id>) = {
-      Get = d.Get >> Seq.map outMapA
-      CreateCollection = Seq.map inMapA >> d.CreateCollection >> CollectionTarget.mapA outMapA inMapA
-      GetId = inMapA >> d.GetId >> outMapId
-      ItemEquals = fun a1 a2 -> d.ItemEquals (inMapA a1) (inMapA a2)
-    }
-
-    let boxMinorTypes d = d |> mapMinorTypes box box unbox
-
-    let create itemEquals getId =
-      { Get = (fun x -> upcast x)
-        CreateCollection = ObservableCollection >> CollectionTarget.create
-        ItemEquals = itemEquals
-        GetId = getId }
-      |> boxMinorTypes
-      |> OneWaySeqData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGet
-        mGetId
-        mItemEquals
-        (d: OneWaySeqData<'model, 'a, 'aCollection, 'id>) =
-      { d with Get = mGet d.Get
-               GetId = mGetId d.GetId
-               ItemEquals = mItemEquals d.ItemEquals }
-
-    let measureFunctions
-        mGet
-        mGetId
-        mItemEquals =
-      mapFunctions
-        (mGet "get")
-        (mGetId "getId")
-        (mItemEquals "itemEquals")
-
-
-  module TwoWay =
-
-    let id<'a> : BindingData<'a, 'a, 'a> =
-      { TwoWayData.Get = id
-        Set = Func2.id1 }
-      |> TwoWayData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGet
-        mSet
-        (d: TwoWayData<'model, 'msg, 'a>) =
-      { d with Get = mGet d.Get
-               Set = mSet d.Set }
-
-    let measureFunctions
-        mGet
-        mSet =
-      mapFunctions
-        (mGet "get")
-        (mSet "set")
-
-
-  module Cmd =
-
-    let createWithParam exec canExec autoRequery : BindingData<'model, 'msg, ICommand> =
-      { Exec = exec
-        CanExec = canExec
-        AutoRequery = autoRequery }
-      |> CmdData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mExec
-        mCanExec
-        (d: CmdData<'model, 'msg>) =
-      { d with Exec = mExec d.Exec
-               CanExec = mCanExec d.CanExec }
-
-    let measureFunctions
-        mExec
-        mCanExec =
-      mapFunctions
-        (mExec "exec")
-        (mCanExec "canExec")
-
-
-  module SubModelSelectedItem =
-
-    let mapMinorTypes
-        (outMapId: 'id -> 'id0)
-        (inMapId: 'id0 -> 'id)
-        (d: SubModelSelectedItemData<'model, 'msg, 'id>) = {
-      Get = d.Get >> ValueOption.map outMapId
-      Set = ValueOption.map inMapId >> d.Set
-      SubModelSeqBindingName = d.SubModelSeqBindingName
-    }
-
-    let boxMinorTypes d = d |> mapMinorTypes box unbox
-
-    let create subModelSeqBindingName =
-      { Get = id
-        Set = Func2.id1
-        SubModelSeqBindingName = subModelSeqBindingName }
-      |> boxMinorTypes
-      |> SubModelSelectedItemData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGet
-        mSet
-        (d: SubModelSelectedItemData<'model, 'msg, 'id>) =
-      { d with Get = mGet d.Get
-               Set = mSet d.Set }
-
-    let measureFunctions
-        mGet
-        mSet =
-      mapFunctions
-        (mGet "get")
-        (mSet "set")
-
-
-  module SubModel =
-
-    let mapMinorTypes
-        (outMapBindingModel: 'bindingModel -> 'bindingModel0)
-        (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
-        (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
-        (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
-        (d: SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>) = {
-      GetModel = d.GetModel >> ValueOption.map outMapBindingModel
-      CreateViewModel = fun args -> d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg)
-      UpdateViewModel = fun (vm, m) -> (vm, inMapBindingModel m) |> d.UpdateViewModel
-      ToMsg = fun m bMsg -> d.ToMsg m (inMapBindingMsg bMsg)
-    }
-
-    let boxMinorTypes d = d |> mapMinorTypes box box unbox unbox
-
-    let create createViewModel updateViewModel =
-      { GetModel = id
-        CreateViewModel = createViewModel
-        UpdateViewModel = updateViewModel
-        ToMsg = Func2.id2 }
-      |> boxMinorTypes
-      |> SubModelData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGetModel
-        mGetBindings
-        mUpdateViewModel
-        mToMsg
-        (d: SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>)
-        : SubModelData<'model,'msg,'bindingModel,'bindingMsg,'vm> =
-      { d with GetModel = mGetModel d.GetModel
-               CreateViewModel = mGetBindings d.CreateViewModel
-               UpdateViewModel = mUpdateViewModel d.UpdateViewModel
-               ToMsg = mToMsg d.ToMsg }
-
-    let measureFunctions
-        mGetModel
-        mGetBindings
-        mUpdateViewModel
-        mToMsg =
-      mapFunctions
-        (mGetModel "getSubModel") // sic: "getModel" would be following the pattern
-        (mGetBindings "bindings") // sic: "getBindings" would be following the pattern
-        (mUpdateViewModel "updateViewModel")
-        (mToMsg "toMsg")
-
-
-  module SubModelWin =
-
-    let mapMinorTypes
-        (outMapBindingModel: 'bindingModel -> 'bindingModel0)
-        (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
-        (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
-        (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
-        (d: SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>) = {
-      GetState = d.GetState >> WindowState.map outMapBindingModel
-      CreateViewModel = fun args -> d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg)
-      UpdateViewModel = fun (vm, m) -> d.UpdateViewModel (vm, inMapBindingModel m)
-      ToMsg = fun m bMsg -> d.ToMsg m (inMapBindingMsg bMsg)
-      GetWindow = d.GetWindow
-      IsModal = d.IsModal
-      OnCloseRequested = d.OnCloseRequested
-    }
-
-    let boxMinorTypes d = d |> mapMinorTypes box box unbox unbox
-
-    let create getState createViewModel updateViewModel toMsg getWindow isModal onCloseRequested =
-      { GetState = getState
-        CreateViewModel = createViewModel
-        UpdateViewModel = updateViewModel
-        ToMsg = toMsg
-        GetWindow = getWindow
-        IsModal = isModal
-        OnCloseRequested = onCloseRequested }
-      |> boxMinorTypes
-      |> SubModelWinData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGetState
-        mGetBindings
-        mUpdateViewModel
-        mToMsg
-        mGetWindow
-        mOnCloseRequested
-        (d: SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>) =
-      { d with GetState = mGetState d.GetState
-               CreateViewModel = mGetBindings d.CreateViewModel
-               UpdateViewModel = mUpdateViewModel d.UpdateViewModel
-               ToMsg = mToMsg d.ToMsg
-               GetWindow = mGetWindow d.GetWindow
-               OnCloseRequested = mOnCloseRequested d.OnCloseRequested }
-
-    let measureFunctions
-        mGetState
-        mGetBindings
-        mUpdateViewModel
-        mToMsg =
-      mapFunctions
-        (mGetState "getState")
-        (mGetBindings "bindings") // sic: "getBindings" would be following the pattern
-        (mUpdateViewModel "updateViewModel")
-        (mToMsg "toMsg")
-        id // sic: could measure GetWindow
-        id // sic: could measure OnCloseRequested
-
-
-  module SubModelSeqUnkeyed =
-
-    let mapMinorTypes
-        (outMapBindingModel: 'bindingModel -> 'bindingModel0)
-        (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
-        (outMapBindingViewModel: 'vm -> 'vm0)
-        (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
-        (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
-        (inMapBindingViewModel: 'vm0 -> 'vm)
-        (d: SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection>) = {
-      GetModels = d.GetModels >> Seq.map outMapBindingModel
-      CreateViewModel = fun args -> d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg) |> outMapBindingViewModel
-      CreateCollection = Seq.map inMapBindingViewModel >> d.CreateCollection >> CollectionTarget.mapA outMapBindingViewModel inMapBindingViewModel
-      UpdateViewModel = fun (vm, m) -> d.UpdateViewModel (inMapBindingViewModel vm, inMapBindingModel m)
-      ToMsg = fun m (idx, bMsg) -> d.ToMsg m (idx, (inMapBindingMsg bMsg))
-    }
-
-    let boxMinorTypes d = d |> mapMinorTypes box box box unbox unbox unbox
-
-    let create createViewModel updateViewModel =
-      { GetModels = (fun x -> upcast x)
-        CreateViewModel = createViewModel
-        CreateCollection = ObservableCollection >> CollectionTarget.create
-        UpdateViewModel = updateViewModel
-        ToMsg = Func2.id2 }
-      |> boxMinorTypes
-      |> SubModelSeqUnkeyedData
-      |> BaseBindingData
-
-    let private mapFunctions
-        mGetModels
-        mGetBindings
-        mCreateCollection
-        mUpdateViewModel
-        mToMsg
-        (d: SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection>) =
-      { d with GetModels = mGetModels d.GetModels
-               CreateViewModel = mGetBindings d.CreateViewModel
-               CreateCollection = mCreateCollection d.CreateCollection
-               UpdateViewModel = mUpdateViewModel d.UpdateViewModel
-               ToMsg = mToMsg d.ToMsg }
-
-    let measureFunctions
-        mGetModels
-        mGetBindings
-        mCreateCollection
-        mUpdateViewModel
-        mToMsg =
-      mapFunctions
-        (mGetModels "getSubModels") // sic: "getModels" would follow the pattern
-        (mGetBindings "bindings") // sic: "getBindings" would follow the pattern
-        (mCreateCollection "createCollection")
-        (mUpdateViewModel "updateViewModel")
-        (mToMsg "toMsg")
-
-
-  module SubModelSeqKeyed =
-
-      let mapMinorTypes
-          (outMapBindingModel: 'bindingModel -> 'bindingModel0)
-          (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
-          (outMapBindingViewModel: 'vm -> 'vm0)
-          (outMapId: 'id -> 'id0)
-          (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
-          (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
-          (inMapBindingViewModel: 'vm0 -> 'vm)
-          (inMapId: 'id0 -> 'id)
-          (d: SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id>) = {
-        GetSubModels = d.GetSubModels >> Seq.map outMapBindingModel
-        CreateViewModel = fun args -> d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg) |> outMapBindingViewModel
-        CreateCollection = Seq.map inMapBindingViewModel >> d.CreateCollection >> CollectionTarget.mapA outMapBindingViewModel inMapBindingViewModel
-        UpdateViewModel = fun (vm, m) -> (inMapBindingViewModel vm, inMapBindingModel m) |> d.UpdateViewModel
-        ToMsg = fun m (id, bMsg) -> d.ToMsg m ((inMapId id), (inMapBindingMsg bMsg))
-        BmToId = inMapBindingModel >> d.BmToId >> outMapId
-        VmToId = fun vm -> vm |> inMapBindingViewModel |> d.VmToId |> outMapId
-      }
-
-      let boxMinorTypes d = d |> mapMinorTypes box box box box unbox unbox unbox unbox
-
-      let create createViewModel updateViewModel bmToId vmToId =
-        { GetSubModels = (fun x -> upcast x)
-          CreateViewModel = createViewModel
-          CreateCollection = ObservableCollection >> CollectionTarget.create
-          UpdateViewModel = updateViewModel
-          ToMsg = Func2.id2
-          BmToId = bmToId
-          VmToId = vmToId }
-        |> boxMinorTypes
-        |> SubModelSeqKeyedData
-        |> BaseBindingData
-
-      let private mapFunctions
-          mGetSubModels
-          mGetBindings
-          mCreateCollection
-          mUpdateViewModel
-          mToMsg
-          mGetId
-          mGetVmId
-          (d: SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id>) =
-        { d with GetSubModels = mGetSubModels d.GetSubModels
-                 CreateViewModel = mGetBindings d.CreateViewModel
-                 CreateCollection = mCreateCollection d.CreateCollection
-                 UpdateViewModel = mUpdateViewModel d.UpdateViewModel
-                 ToMsg = mToMsg d.ToMsg
-                 BmToId = mGetId d.BmToId
-                 VmToId = mGetVmId d.VmToId }
-
-      let measureFunctions
-          mGetSubModels
-          mGetBindings
-          mCreateCollection
-          mUpdateViewModel
-          mToMsg
-          mGetId
-          mGetVmId =
-        mapFunctions
-          (mGetSubModels "getSubModels")
-          (mGetBindings "getBindings")
-          (mCreateCollection "createCollection")
-          (mUpdateViewModel "updateViewModel")
-          (mToMsg "toMsg")
-          (mGetId "getId")
-          (mGetVmId "getVmId")
-
-
-  module Validation =
-
-    let private mapFunctions
-        mValidate
-        (d: ValidationData<'model, 'msg, 't>) =
-      { d with Validate = mValidate d.Validate }
-
-    let measureFunctions
-        mValidate =
-      mapFunctions
-        (mValidate "validate")
-
-  module Lazy =
-
-    let private mapFunctions
-        mGet
-        mSet
-        mEquals
-        (d: LazyData<'model, 'msg, 'bindingModel, 'bindingMsg, 't>) =
-      { d with Get = mGet d.Get
-               Set = mSet d.Set
-               Equals = mEquals d.Equals }
-
-    let measureFunctions
-        mGet
-        mSet
-        mEquals =
-      mapFunctions
-        (mGet "get")
-        (mSet "set")
-        (mEquals "equals")
+    module private MapT =
+
+        let baseCase (fOut: 't0 -> 't1) (fIn: 't1 -> 't0) =
+            function
+            | OneWayData d -> OneWayData { Get = d.Get >> fOut }
+            | OneWayToSourceData d -> OneWayToSourceData { Set = fIn >> d.Set }
+            | OneWaySeqData d ->
+                OneWaySeqData
+                    { Get = d.Get
+                      CreateCollection = d.CreateCollection >> CollectionTarget.mapCollection fOut
+                      GetId = d.GetId
+                      ItemEquals = d.ItemEquals }
+            | TwoWayData d ->
+                TwoWayData
+                    { Get = d.Get >> fOut
+                      Set = fIn >> d.Set }
+            | CmdData d ->
+                CmdData
+                    { Exec = d.Exec
+                      CanExec = d.CanExec
+                      AutoRequery = d.AutoRequery }
+            | SubModelData d ->
+                SubModelData
+                    { GetModel = d.GetModel
+                      CreateViewModel = d.CreateViewModel >> fOut
+                      UpdateViewModel = (fun (vm, m) -> d.UpdateViewModel(fIn vm, m))
+                      ToMsg = d.ToMsg }
+            | SubModelWinData d ->
+                SubModelWinData
+                    { GetState = d.GetState
+                      CreateViewModel = d.CreateViewModel >> fOut
+                      UpdateViewModel = (fun (vm, m) -> d.UpdateViewModel(fIn vm, m))
+                      ToMsg = d.ToMsg
+                      GetWindow = d.GetWindow
+                      IsModal = d.IsModal
+                      OnCloseRequested = d.OnCloseRequested }
+            | SubModelSeqUnkeyedData d ->
+                SubModelSeqUnkeyedData
+                    { GetModels = d.GetModels
+                      CreateViewModel = d.CreateViewModel
+                      CreateCollection = d.CreateCollection >> CollectionTarget.mapCollection fOut
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = d.ToMsg }
+            | SubModelSeqKeyedData d ->
+                SubModelSeqKeyedData
+                    { GetSubModels = d.GetSubModels
+                      CreateViewModel = d.CreateViewModel
+                      CreateCollection = d.CreateCollection >> CollectionTarget.mapCollection fOut
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = d.ToMsg
+                      VmToId = d.VmToId
+                      BmToId = d.BmToId }
+            | SubModelSelectedItemData d ->
+                SubModelSelectedItemData
+                    { Get = d.Get
+                      Set = d.Set
+                      SubModelSeqBindingName = d.SubModelSeqBindingName }
+
+        let rec recursiveCase<'model, 'msg, 't0, 't1>
+            (fOut: 't0 -> 't1)
+            (fIn: 't1 -> 't0)
+            : BindingData<'model, 'msg, 't0> -> BindingData<'model, 'msg, 't1> =
+            function
+            | BaseBindingData d -> d |> baseCase fOut fIn |> BaseBindingData
+            | CachingData d -> d |> recursiveCase<'model, 'msg, 't0, 't1> fOut fIn |> CachingData
+            | ValidationData d ->
+                ValidationData
+                    { BindingData = recursiveCase<'model, 'msg, 't0, 't1> fOut fIn d.BindingData
+                      Validate = d.Validate }
+            | LazyData d ->
+                LazyData
+                    { Get = d.Get
+                      Set = d.Set
+                      BindingData = recursiveCase<obj, obj, 't0, 't1> fOut fIn d.BindingData
+                      Equals = d.Equals }
+            | AlterMsgStreamData d ->
+                AlterMsgStreamData
+                    { BindingData = recursiveCase<obj, obj, 't0, 't1> fOut fIn d.BindingData
+                      AlterMsgStream = d.AlterMsgStream
+                      Get = d.Get
+                      Set = d.Set }
+
+    let boxT b = MapT.recursiveCase box unbox b
+    let unboxT b = MapT.recursiveCase unbox box b
+
+    let mapModel f =
+        let binaryHelper binary x m = binary x (f m)
+
+        let baseCase =
+            function
+            | OneWayData d -> OneWayData { Get = f >> d.Get }
+            | OneWayToSourceData d -> OneWayToSourceData { Set = binaryHelper d.Set }
+            | OneWaySeqData d ->
+                OneWaySeqData
+                    { Get = f >> d.Get
+                      CreateCollection = d.CreateCollection
+                      GetId = d.GetId
+                      ItemEquals = d.ItemEquals }
+            | TwoWayData d ->
+                TwoWayData
+                    { Get = f >> d.Get
+                      Set = binaryHelper d.Set }
+            | CmdData d ->
+                CmdData
+                    { Exec = binaryHelper d.Exec
+                      CanExec = binaryHelper d.CanExec
+                      AutoRequery = d.AutoRequery }
+            | SubModelData d ->
+                SubModelData
+                    { GetModel = f >> d.GetModel
+                      CreateViewModel = d.CreateViewModel
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = f >> d.ToMsg }
+            | SubModelWinData d ->
+                SubModelWinData
+                    { GetState = f >> d.GetState
+                      CreateViewModel = d.CreateViewModel
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = f >> d.ToMsg
+                      GetWindow = f >> d.GetWindow
+                      IsModal = d.IsModal
+                      OnCloseRequested = f >> d.OnCloseRequested }
+            | SubModelSeqUnkeyedData d ->
+                SubModelSeqUnkeyedData
+                    { GetModels = f >> d.GetModels
+                      CreateViewModel = d.CreateViewModel
+                      CreateCollection = d.CreateCollection
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = f >> d.ToMsg }
+            | SubModelSeqKeyedData d ->
+                SubModelSeqKeyedData
+                    { GetSubModels = f >> d.GetSubModels
+                      CreateViewModel = d.CreateViewModel
+                      CreateCollection = d.CreateCollection
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = f >> d.ToMsg
+                      BmToId = d.BmToId
+                      VmToId = d.VmToId }
+            | SubModelSelectedItemData d ->
+                SubModelSelectedItemData
+                    { Get = f >> d.Get
+                      Set = binaryHelper d.Set
+                      SubModelSeqBindingName = d.SubModelSeqBindingName }
+
+        let rec recursiveCase =
+            function
+            | BaseBindingData d -> d |> baseCase |> BaseBindingData
+            | CachingData d -> d |> recursiveCase |> CachingData
+            | ValidationData d ->
+                ValidationData
+                    { BindingData = recursiveCase d.BindingData
+                      Validate = f >> d.Validate }
+            | LazyData d ->
+                LazyData
+                    { BindingData = d.BindingData
+                      Get = f >> d.Get
+                      Set = binaryHelper d.Set
+                      Equals = d.Equals }
+            | AlterMsgStreamData d ->
+                AlterMsgStreamData
+                    { BindingData = d.BindingData
+                      AlterMsgStream = d.AlterMsgStream
+                      Get = f >> d.Get
+                      Set = binaryHelper d.Set }
+
+        recursiveCase
+
+    let mapMsgWithModel (f: 'a -> 'model -> 'b) =
+        let baseCase =
+            function
+            | OneWayData d -> d |> OneWayData
+            | OneWayToSourceData d -> OneWayToSourceData { Set = fun v m -> f (d.Set v m) m }
+            | OneWaySeqData d -> d |> OneWaySeqData
+            | TwoWayData d ->
+                TwoWayData
+                    { Get = d.Get
+                      Set = fun v m -> f (d.Set v m) m }
+            | CmdData d ->
+                CmdData
+                    { Exec = fun p m -> d.Exec p m |> ValueOption.map (fun msg -> f msg m)
+                      CanExec = fun p m -> d.CanExec p m
+                      AutoRequery = d.AutoRequery }
+            | SubModelData d ->
+                SubModelData
+                    { GetModel = d.GetModel
+                      CreateViewModel = d.CreateViewModel
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m }
+            | SubModelWinData d ->
+                SubModelWinData
+                    { GetState = d.GetState
+                      CreateViewModel = d.CreateViewModel
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m
+                      GetWindow = fun m dispatch -> d.GetWindow m (fun msg -> f msg m |> dispatch)
+                      IsModal = d.IsModal
+                      OnCloseRequested = fun m -> m |> d.OnCloseRequested |> ValueOption.map (fun msg -> f msg m) }
+            | SubModelSeqUnkeyedData d ->
+                SubModelSeqUnkeyedData
+                    { GetModels = d.GetModels
+                      CreateViewModel = d.CreateViewModel
+                      CreateCollection = d.CreateCollection
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m }
+            | SubModelSeqKeyedData d ->
+                SubModelSeqKeyedData
+                    { GetSubModels = d.GetSubModels
+                      CreateViewModel = d.CreateViewModel
+                      CreateCollection = d.CreateCollection
+                      UpdateViewModel = d.UpdateViewModel
+                      ToMsg = fun m bMsg -> f (d.ToMsg m bMsg) m
+                      BmToId = d.BmToId
+                      VmToId = d.VmToId }
+            | SubModelSelectedItemData d ->
+                SubModelSelectedItemData
+                    { Get = d.Get
+                      Set = fun v m -> f (d.Set v m) m
+                      SubModelSeqBindingName = d.SubModelSeqBindingName }
+
+        let rec recursiveCase =
+            function
+            | BaseBindingData d -> d |> baseCase |> BaseBindingData
+            | CachingData d -> d |> recursiveCase |> CachingData
+            | ValidationData d ->
+                ValidationData
+                    { BindingData = recursiveCase d.BindingData
+                      Validate = d.Validate }
+            | LazyData d ->
+                LazyData
+                    { BindingData = d.BindingData
+                      Get = d.Get
+                      Set = fun a m -> f (d.Set a m) m
+                      Equals = d.Equals }
+            | AlterMsgStreamData d ->
+                AlterMsgStreamData
+                    { BindingData = d.BindingData
+                      Get = d.Get
+                      Set = fun a m -> f (d.Set a m) m
+                      AlterMsgStream = d.AlterMsgStream }
+
+        recursiveCase
+
+    let mapMsg f = mapMsgWithModel (fun a _ -> f a)
+
+    let setMsgWithModel f = mapMsgWithModel (fun _ m -> f m)
+    let setMsg msg = mapMsg (fun _ -> msg)
+
+    let addCaching b = b |> CachingData
+
+    let addValidation validate b =
+        { BindingData = b; Validate = validate } |> ValidationData
+
+    let addLazy (equals: 'model -> 'model -> bool) b =
+        { BindingData = b |> mapModel unbox |> mapMsg box
+          Get = box
+          Set = fun (dMsg: obj) _ -> unbox dMsg
+          Equals = fun m1 m2 -> equals (unbox m1) (unbox m2) }
+        |> LazyData
+
+    let alterMsgStream
+        (alteration: ('dispatchMsg -> unit) -> 'bindingMsg -> unit)
+        (b: BindingData<'bindingModel, 'bindingMsg, 't>)
+        : BindingData<'model, 'msg, 't> =
+        { BindingData = b |> mapModel unbox |> mapMsg box
+          Get = box
+          Set = fun (dMsg: obj) _ -> unbox dMsg
+          AlterMsgStream =
+            fun (f: obj -> unit) ->
+                let f' = box >> f
+                let g = alteration f'
+                unbox >> g }
+        |> AlterMsgStreamData
+
+    let addSticky (predicate: 'model -> bool) (binding: BindingData<'model, 'msg, 't>) =
+        let mutable stickyModel = None
+
+        let f newModel =
+            if predicate newModel then
+                stickyModel <- Some newModel
+                newModel
+            else
+                stickyModel |> Option.defaultValue newModel
+
+        binding |> mapModel f
+
+
+    module Option =
+
+        let box ma = ma |> Option.map box |> Option.toObj
+        let unbox obj = obj |> Option.ofObj |> Option.map unbox
+
+    module ValueOption =
+
+        let box ma =
+            ma |> ValueOption.map box |> ValueOption.toObj
+
+        let unbox obj =
+            obj |> ValueOption.ofObj |> ValueOption.map unbox
+
+
+    module OneWay =
+
+        let id<'a, 'msg> : BindingData<'a, 'msg, 'a> =
+            { Get = id } |> OneWayData |> BaseBindingData
+
+        let private mapFunctions mGet (d: OneWayData<'model, 'a>) = { d with Get = mGet d.Get }
+
+        let measureFunctions mGet = mapFunctions (mGet "get")
+
+
+    module OneWayToSource =
+
+        let id<'model, 'a> : BindingData<'model, 'a, 'a> =
+            { OneWayToSourceData.Set = Func2.id1 } |> OneWayToSourceData |> BaseBindingData
+
+        let private mapFunctions mSet (d: OneWayToSourceData<'model, 'msg, 'a>) = { d with Set = mSet d.Set }
+
+        let measureFunctions mSet = mapFunctions (mSet "set")
+
+
+    module OneWaySeq =
+
+        let mapMinorTypes
+            (outMapA: 'a -> 'a0)
+            (outMapId: 'id -> 'id0)
+            (inMapA: 'a0 -> 'a)
+            (d: OneWaySeqData<'model, 'a, 'aCollection, 'id>)
+            =
+            { Get = d.Get >> Seq.map outMapA
+              CreateCollection = Seq.map inMapA >> d.CreateCollection >> CollectionTarget.mapA outMapA inMapA
+              GetId = inMapA >> d.GetId >> outMapId
+              ItemEquals = fun a1 a2 -> d.ItemEquals (inMapA a1) (inMapA a2) }
+
+        let boxMinorTypes d = d |> mapMinorTypes box box unbox
+
+        let create itemEquals getId =
+            { Get = (fun x -> upcast x)
+              CreateCollection = ObservableCollection >> CollectionTarget.create
+              ItemEquals = itemEquals
+              GetId = getId }
+            |> boxMinorTypes
+            |> OneWaySeqData
+            |> BaseBindingData
+
+        let private mapFunctions mGet mGetId mItemEquals (d: OneWaySeqData<'model, 'a, 'aCollection, 'id>) =
+            { d with
+                Get = mGet d.Get
+                GetId = mGetId d.GetId
+                ItemEquals = mItemEquals d.ItemEquals }
+
+        let measureFunctions mGet mGetId mItemEquals =
+            mapFunctions (mGet "get") (mGetId "getId") (mItemEquals "itemEquals")
+
+
+    module TwoWay =
+
+        let id<'a> : BindingData<'a, 'a, 'a> =
+            { TwoWayData.Get = id; Set = Func2.id1 } |> TwoWayData |> BaseBindingData
+
+        let private mapFunctions mGet mSet (d: TwoWayData<'model, 'msg, 'a>) =
+            { d with
+                Get = mGet d.Get
+                Set = mSet d.Set }
+
+        let measureFunctions mGet mSet = mapFunctions (mGet "get") (mSet "set")
+
+
+    module Cmd =
+
+        let createWithParam exec canExec autoRequery : BindingData<'model, 'msg, ICommand> =
+            { Exec = exec
+              CanExec = canExec
+              AutoRequery = autoRequery }
+            |> CmdData
+            |> BaseBindingData
+
+        let private mapFunctions mExec mCanExec (d: CmdData<'model, 'msg>) =
+            { d with
+                Exec = mExec d.Exec
+                CanExec = mCanExec d.CanExec }
+
+        let measureFunctions mExec mCanExec =
+            mapFunctions (mExec "exec") (mCanExec "canExec")
+
+
+    module SubModelSelectedItem =
+
+        let mapMinorTypes
+            (outMapId: 'id -> 'id0)
+            (inMapId: 'id0 -> 'id)
+            (d: SubModelSelectedItemData<'model, 'msg, 'id>)
+            =
+            { Get = d.Get >> ValueOption.map outMapId
+              Set = ValueOption.map inMapId >> d.Set
+              SubModelSeqBindingName = d.SubModelSeqBindingName }
+
+        let boxMinorTypes d = d |> mapMinorTypes box unbox
+
+        let create subModelSeqBindingName =
+            { Get = id
+              Set = Func2.id1
+              SubModelSeqBindingName = subModelSeqBindingName }
+            |> boxMinorTypes
+            |> SubModelSelectedItemData
+            |> BaseBindingData
+
+        let private mapFunctions mGet mSet (d: SubModelSelectedItemData<'model, 'msg, 'id>) =
+            { d with
+                Get = mGet d.Get
+                Set = mSet d.Set }
+
+        let measureFunctions mGet mSet = mapFunctions (mGet "get") (mSet "set")
+
+
+    module SubModel =
+
+        let mapMinorTypes
+            (outMapBindingModel: 'bindingModel -> 'bindingModel0)
+            (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
+            (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
+            (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
+            (d: SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>)
+            =
+            { GetModel = d.GetModel >> ValueOption.map outMapBindingModel
+              CreateViewModel =
+                fun args -> d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg)
+              UpdateViewModel = fun (vm, m) -> (vm, inMapBindingModel m) |> d.UpdateViewModel
+              ToMsg = fun m bMsg -> d.ToMsg m (inMapBindingMsg bMsg) }
+
+        let boxMinorTypes d = d |> mapMinorTypes box box unbox unbox
+
+        let create createViewModel updateViewModel =
+            { GetModel = id
+              CreateViewModel = createViewModel
+              UpdateViewModel = updateViewModel
+              ToMsg = Func2.id2 }
+            |> boxMinorTypes
+            |> SubModelData
+            |> BaseBindingData
+
+        let private mapFunctions
+            mGetModel
+            mGetBindings
+            mUpdateViewModel
+            mToMsg
+            (d: SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>)
+            : SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
+            { d with
+                GetModel = mGetModel d.GetModel
+                CreateViewModel = mGetBindings d.CreateViewModel
+                UpdateViewModel = mUpdateViewModel d.UpdateViewModel
+                ToMsg = mToMsg d.ToMsg }
+
+        let measureFunctions mGetModel mGetBindings mUpdateViewModel mToMsg =
+            mapFunctions
+                (mGetModel "getSubModel") // sic: "getModel" would be following the pattern
+                (mGetBindings "bindings") // sic: "getBindings" would be following the pattern
+                (mUpdateViewModel "updateViewModel")
+                (mToMsg "toMsg")
+
+
+    module SubModelWin =
+
+        let mapMinorTypes
+            (outMapBindingModel: 'bindingModel -> 'bindingModel0)
+            (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
+            (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
+            (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
+            (d: SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>)
+            =
+            { GetState = d.GetState >> WindowState.map outMapBindingModel
+              CreateViewModel =
+                fun args -> d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg)
+              UpdateViewModel = fun (vm, m) -> d.UpdateViewModel(vm, inMapBindingModel m)
+              ToMsg = fun m bMsg -> d.ToMsg m (inMapBindingMsg bMsg)
+              GetWindow = d.GetWindow
+              IsModal = d.IsModal
+              OnCloseRequested = d.OnCloseRequested }
+
+        let boxMinorTypes d = d |> mapMinorTypes box box unbox unbox
+
+        let create getState createViewModel updateViewModel toMsg getWindow isModal onCloseRequested =
+            { GetState = getState
+              CreateViewModel = createViewModel
+              UpdateViewModel = updateViewModel
+              ToMsg = toMsg
+              GetWindow = getWindow
+              IsModal = isModal
+              OnCloseRequested = onCloseRequested }
+            |> boxMinorTypes
+            |> SubModelWinData
+            |> BaseBindingData
+
+        let private mapFunctions
+            mGetState
+            mGetBindings
+            mUpdateViewModel
+            mToMsg
+            mGetWindow
+            mOnCloseRequested
+            (d: SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>)
+            =
+            { d with
+                GetState = mGetState d.GetState
+                CreateViewModel = mGetBindings d.CreateViewModel
+                UpdateViewModel = mUpdateViewModel d.UpdateViewModel
+                ToMsg = mToMsg d.ToMsg
+                GetWindow = mGetWindow d.GetWindow
+                OnCloseRequested = mOnCloseRequested d.OnCloseRequested }
+
+        let measureFunctions mGetState mGetBindings mUpdateViewModel mToMsg =
+            mapFunctions
+                (mGetState "getState")
+                (mGetBindings "bindings") // sic: "getBindings" would be following the pattern
+                (mUpdateViewModel "updateViewModel")
+                (mToMsg "toMsg")
+                id // sic: could measure GetWindow
+                id // sic: could measure OnCloseRequested
+
+
+    module SubModelSeqUnkeyed =
+
+        let mapMinorTypes
+            (outMapBindingModel: 'bindingModel -> 'bindingModel0)
+            (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
+            (outMapBindingViewModel: 'vm -> 'vm0)
+            (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
+            (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
+            (inMapBindingViewModel: 'vm0 -> 'vm)
+            (d: SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection>)
+            =
+            { GetModels = d.GetModels >> Seq.map outMapBindingModel
+              CreateViewModel =
+                fun args ->
+                    d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg)
+                    |> outMapBindingViewModel
+              CreateCollection =
+                Seq.map inMapBindingViewModel
+                >> d.CreateCollection
+                >> CollectionTarget.mapA outMapBindingViewModel inMapBindingViewModel
+              UpdateViewModel = fun (vm, m) -> d.UpdateViewModel(inMapBindingViewModel vm, inMapBindingModel m)
+              ToMsg = fun m (idx, bMsg) -> d.ToMsg m (idx, (inMapBindingMsg bMsg)) }
+
+        let boxMinorTypes d =
+            d |> mapMinorTypes box box box unbox unbox unbox
+
+        let create createViewModel updateViewModel =
+            { GetModels = (fun x -> upcast x)
+              CreateViewModel = createViewModel
+              CreateCollection = ObservableCollection >> CollectionTarget.create
+              UpdateViewModel = updateViewModel
+              ToMsg = Func2.id2 }
+            |> boxMinorTypes
+            |> SubModelSeqUnkeyedData
+            |> BaseBindingData
+
+        let private mapFunctions
+            mGetModels
+            mGetBindings
+            mCreateCollection
+            mUpdateViewModel
+            mToMsg
+            (d: SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection>)
+            =
+            { d with
+                GetModels = mGetModels d.GetModels
+                CreateViewModel = mGetBindings d.CreateViewModel
+                CreateCollection = mCreateCollection d.CreateCollection
+                UpdateViewModel = mUpdateViewModel d.UpdateViewModel
+                ToMsg = mToMsg d.ToMsg }
+
+        let measureFunctions mGetModels mGetBindings mCreateCollection mUpdateViewModel mToMsg =
+            mapFunctions
+                (mGetModels "getSubModels") // sic: "getModels" would follow the pattern
+                (mGetBindings "bindings") // sic: "getBindings" would follow the pattern
+                (mCreateCollection "createCollection")
+                (mUpdateViewModel "updateViewModel")
+                (mToMsg "toMsg")
+
+
+    module SubModelSeqKeyed =
+
+        let mapMinorTypes
+            (outMapBindingModel: 'bindingModel -> 'bindingModel0)
+            (outMapBindingMsg: 'bindingMsg -> 'bindingMsg0)
+            (outMapBindingViewModel: 'vm -> 'vm0)
+            (outMapId: 'id -> 'id0)
+            (inMapBindingModel: 'bindingModel0 -> 'bindingModel)
+            (inMapBindingMsg: 'bindingMsg0 -> 'bindingMsg)
+            (inMapBindingViewModel: 'vm0 -> 'vm)
+            (inMapId: 'id0 -> 'id)
+            (d: SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id>)
+            =
+            { GetSubModels = d.GetSubModels >> Seq.map outMapBindingModel
+              CreateViewModel =
+                fun args ->
+                    d.CreateViewModel(args |> ViewModelArgs.map inMapBindingModel outMapBindingMsg)
+                    |> outMapBindingViewModel
+              CreateCollection =
+                Seq.map inMapBindingViewModel
+                >> d.CreateCollection
+                >> CollectionTarget.mapA outMapBindingViewModel inMapBindingViewModel
+              UpdateViewModel = fun (vm, m) -> (inMapBindingViewModel vm, inMapBindingModel m) |> d.UpdateViewModel
+              ToMsg = fun m (id, bMsg) -> d.ToMsg m ((inMapId id), (inMapBindingMsg bMsg))
+              BmToId = inMapBindingModel >> d.BmToId >> outMapId
+              VmToId = fun vm -> vm |> inMapBindingViewModel |> d.VmToId |> outMapId }
+
+        let boxMinorTypes d =
+            d |> mapMinorTypes box box box box unbox unbox unbox unbox
+
+        let create createViewModel updateViewModel bmToId vmToId =
+            { GetSubModels = (fun x -> upcast x)
+              CreateViewModel = createViewModel
+              CreateCollection = ObservableCollection >> CollectionTarget.create
+              UpdateViewModel = updateViewModel
+              ToMsg = Func2.id2
+              BmToId = bmToId
+              VmToId = vmToId }
+            |> boxMinorTypes
+            |> SubModelSeqKeyedData
+            |> BaseBindingData
+
+        let private mapFunctions
+            mGetSubModels
+            mGetBindings
+            mCreateCollection
+            mUpdateViewModel
+            mToMsg
+            mGetId
+            mGetVmId
+            (d: SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id>)
+            =
+            { d with
+                GetSubModels = mGetSubModels d.GetSubModels
+                CreateViewModel = mGetBindings d.CreateViewModel
+                CreateCollection = mCreateCollection d.CreateCollection
+                UpdateViewModel = mUpdateViewModel d.UpdateViewModel
+                ToMsg = mToMsg d.ToMsg
+                BmToId = mGetId d.BmToId
+                VmToId = mGetVmId d.VmToId }
+
+        let measureFunctions mGetSubModels mGetBindings mCreateCollection mUpdateViewModel mToMsg mGetId mGetVmId =
+            mapFunctions
+                (mGetSubModels "getSubModels")
+                (mGetBindings "getBindings")
+                (mCreateCollection "createCollection")
+                (mUpdateViewModel "updateViewModel")
+                (mToMsg "toMsg")
+                (mGetId "getId")
+                (mGetVmId "getVmId")
+
+
+    module Validation =
+
+        let private mapFunctions mValidate (d: ValidationData<'model, 'msg, 't>) =
+            { d with
+                Validate = mValidate d.Validate }
+
+        let measureFunctions mValidate = mapFunctions (mValidate "validate")
+
+    module Lazy =
+
+        let private mapFunctions mGet mSet mEquals (d: LazyData<'model, 'msg, 'bindingModel, 'bindingMsg, 't>) =
+            { d with
+                Get = mGet d.Get
+                Set = mSet d.Set
+                Equals = mEquals d.Equals }
+
+        let measureFunctions mGet mSet mEquals =
+            mapFunctions (mGet "get") (mSet "set") (mEquals "equals")
\ No newline at end of file
diff --git a/src/Elmish.WPF/BindingVmHelpers.fs b/src/Elmish.WPF/BindingVmHelpers.fs
index b05517c6..e9d46550 100644
--- a/src/Elmish.WPF/BindingVmHelpers.fs
+++ b/src/Elmish.WPF/BindingVmHelpers.fs
@@ -8,54 +8,59 @@ open Elmish
 
 
 type UpdateData =
-  | ErrorsChanged of string
-  | PropertyChanged of string
-  | CanExecuteChanged of Command
+    | ErrorsChanged of string
+    | PropertyChanged of string
+    | CanExecuteChanged of Command
 
 module UpdateData =
-  let isPropertyChanged = function PropertyChanged _ -> true | _ -> false
+    let isPropertyChanged =
+        function
+        | PropertyChanged _ -> true
+        | _ -> false
 
 
 type GetErrorSubModelSelectedItem =
-  { NameChain: string
-    SubModelSeqBindingName: string
-    Id: string }
+    { NameChain: string
+      SubModelSeqBindingName: string
+      Id: string }
 
 [<RequireQualifiedAccess>]
 type GetError =
-  | OneWayToSource
-  | SubModelSelectedItem of GetErrorSubModelSelectedItem
-  | ToNullError of ValueOption.ToNullError
+    | OneWayToSource
+    | SubModelSelectedItem of GetErrorSubModelSelectedItem
+    | ToNullError of ValueOption.ToNullError
 
 
 module Helpers2 =
-  let showNewWindow
-      (winRef: WeakReference<Window>)
-      (getWindow: 'model -> Dispatch<'msg> -> Window)
-      (isDialog: bool)
-      (onCloseRequested: 'model -> 'msg voption)
-      (preventClose: bool ref)
-      dataContext
-      (initialVisibility: Visibility)
-      (getCurrentModel: unit -> 'model)
-      (dispatch: 'msg -> unit) =
-    let win = getWindow (getCurrentModel ()) dispatch
-    winRef.SetTarget win
-    (*
+    let showNewWindow
+        (winRef: WeakReference<Window>)
+        (getWindow: 'model -> Dispatch<'msg> -> Window)
+        (isDialog: bool)
+        (onCloseRequested: 'model -> 'msg voption)
+        (preventClose: bool ref)
+        dataContext
+        (initialVisibility: Visibility)
+        (getCurrentModel: unit -> 'model)
+        (dispatch: 'msg -> unit)
+        =
+        let win = getWindow (getCurrentModel ()) dispatch
+        winRef.SetTarget win
+        (*
      * A different thread might own this Window, so must use its Dispatcher.
      * Invoking asynchronously since ShowDialog is a blocking call. Otherwise,
      * invoking ShowDialog synchronously blocks the Elmish dispatch loop.
      *)
-    win.Dispatcher.InvokeAsync(fun () ->
-      win.DataContext <- dataContext
-      win.Closing.Add(fun ev ->
-        ev.Cancel <- preventClose.Value
-        getCurrentModel () |> onCloseRequested |> ValueOption.iter dispatch
-      )
-      if isDialog then
-        win.ShowDialog () |> ignore
-      else
-        (*
+        win.Dispatcher.InvokeAsync(fun () ->
+            win.DataContext <- dataContext
+
+            win.Closing.Add(fun ev ->
+                ev.Cancel <- preventClose.Value
+                getCurrentModel () |> onCloseRequested |> ValueOption.iter dispatch)
+
+            if isDialog then
+                win.ShowDialog() |> ignore
+            else
+                (*
          * Calling Show achieves the same end result as setting Visibility
          * property of the Window object to Visible. However, there is a
          * difference between the two from a timing perspective.
@@ -67,759 +72,870 @@ module Helpers2 =
          * returns immediately
          * https://docs.microsoft.com/en-us/dotnet/api/system.windows.window.show
          *)
-        win.Visibility <- initialVisibility
-    ) |> ignore
-
-  let measure (logPerformance: ILogger) (logLevel: LogLevel) (performanceLogThresholdMs: int) (name: string) (nameChain: string) (callName: string) f =
-    if not <| logPerformance.IsEnabled(logLevel) then f
-    else
-      fun a ->
-        let sw = System.Diagnostics.Stopwatch.StartNew ()
-        let b = f a
-        sw.Stop ()
-        if sw.ElapsedMilliseconds >= int64 performanceLogThresholdMs then
-          logPerformance.Log(logLevel, "[{BindingNameChain}] {CallName} ({Elapsed}ms): {MeasureName}", nameChain, callName, sw.ElapsedMilliseconds, name)
-        b
-
-  let measure2 (logPerformance: ILogger) (logLevel: LogLevel) performanceLogThresholdMs name nameChain callName f =
-    if not <| logPerformance.IsEnabled(logLevel)
-    then f
-    else fun a -> measure logPerformance logLevel performanceLogThresholdMs name nameChain callName (f a)
-
-
-type OneWayBinding<'model, 'a> = {
-  OneWayData: OneWayData<'model, 'a>
-}
-
-type OneWayToSourceBinding<'model, 'a> = {
-  Set: 'a -> 'model -> unit
-}
-
-type OneWaySeqBinding<'model, 'a, 'aCollection, 'id when 'id : equality> = {
-  OneWaySeqData: OneWaySeqData<'model, 'a, 'aCollection, 'id>
-  Values: CollectionTarget<'a, 'aCollection>
-}
-
-type TwoWayBinding<'model, 'a> = {
-  Get: 'model -> 'a
-  Set: 'a -> 'model -> unit
-}
-
-type SubModelBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> = {
-  SubModelData: SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>
-  Dispatch: 'msg -> unit
-  GetVm: unit -> 'vm voption
-  SetVm: 'vm voption -> unit
-  GetCurrentModel: unit -> 'model
-}
-
-type SubModelWinBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> = {
-  SubModelWinData: SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>
-  Dispatch: 'msg -> unit
-  WinRef: WeakReference<Window>
-  PreventClose: bool ref
-  GetVmWinState: unit -> WindowState<'vm>
-  SetVmWinState: WindowState<'vm> -> unit
-  GetCurrentModel: unit -> 'model
-}
-
-type SubModelSeqUnkeyedBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection> = {
-  SubModelSeqUnkeyedData: SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection>
-  Dispatch: 'msg -> unit
-  Vms: CollectionTarget<'vm, 'vmCollection>
-  GetCurrentModel: unit -> 'model
-}
-
-type SubModelSeqKeyedBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id when 'id : equality> =
-  { SubModelSeqKeyedData: SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id>
-    Dispatch: 'msg -> unit
-    Vms: CollectionTarget<'vm, 'vmCollection>
-    GetCurrentModel: unit -> 'model
-  }
-
-  member b.FromId(id: 'id) =
-    b.Vms.Enumerate ()
-    |> Seq.tryFind (fun vm -> vm |> b.SubModelSeqKeyedData.VmToId |> (=) id)
-
-type SelectedItemBinding<'bindingModel, 'bindingMsg, 'vm, 'id> = {
-  FromId: 'id -> 'vm option
-  VmToId: 'vm -> 'id
-}
+                win.Visibility <- initialVisibility)
+        |> ignore
+
+    let measure
+        (logPerformance: ILogger)
+        (logLevel: LogLevel)
+        (performanceLogThresholdMs: int)
+        (name: string)
+        (nameChain: string)
+        (callName: string)
+        f
+        =
+        if not <| logPerformance.IsEnabled(logLevel) then
+            f
+        else
+            fun a ->
+                let sw = System.Diagnostics.Stopwatch.StartNew()
+                let b = f a
+                sw.Stop()
+
+                if sw.ElapsedMilliseconds >= int64 performanceLogThresholdMs then
+                    logPerformance.Log(
+                        logLevel,
+                        "[{BindingNameChain}] {CallName} ({Elapsed}ms): {MeasureName}",
+                        nameChain,
+                        callName,
+                        sw.ElapsedMilliseconds,
+                        name
+                    )
+
+                b
+
+    let measure2 (logPerformance: ILogger) (logLevel: LogLevel) performanceLogThresholdMs name nameChain callName f =
+        if not <| logPerformance.IsEnabled(logLevel) then
+            f
+        else
+            fun a -> measure logPerformance logLevel performanceLogThresholdMs name nameChain callName (f a)
+
+
+type OneWayBinding<'model, 'a> = { OneWayData: OneWayData<'model, 'a> }
+
+type OneWayToSourceBinding<'model, 'a> = { Set: 'a -> 'model -> unit }
+
+type OneWaySeqBinding<'model, 'a, 'aCollection, 'id when 'id: equality> =
+    { OneWaySeqData: OneWaySeqData<'model, 'a, 'aCollection, 'id>
+      Values: CollectionTarget<'a, 'aCollection> }
+
+type TwoWayBinding<'model, 'a> =
+    { Get: 'model -> 'a
+      Set: 'a -> 'model -> unit }
+
+type SubModelBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
+    { SubModelData: SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>
+      Dispatch: 'msg -> unit
+      GetVm: unit -> 'vm voption
+      SetVm: 'vm voption -> unit
+      GetCurrentModel: unit -> 'model }
+
+type SubModelWinBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
+    { SubModelWinData: SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm>
+      Dispatch: 'msg -> unit
+      WinRef: WeakReference<Window>
+      PreventClose: bool ref
+      GetVmWinState: unit -> WindowState<'vm>
+      SetVmWinState: WindowState<'vm> -> unit
+      GetCurrentModel: unit -> 'model }
+
+type SubModelSeqUnkeyedBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection> =
+    { SubModelSeqUnkeyedData: SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection>
+      Dispatch: 'msg -> unit
+      Vms: CollectionTarget<'vm, 'vmCollection>
+      GetCurrentModel: unit -> 'model }
+
+type SubModelSeqKeyedBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id when 'id: equality> =
+    { SubModelSeqKeyedData: SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id>
+      Dispatch: 'msg -> unit
+      Vms: CollectionTarget<'vm, 'vmCollection>
+      GetCurrentModel: unit -> 'model }
+
+    member b.FromId(id: 'id) =
+        b.Vms.Enumerate()
+        |> Seq.tryFind (fun vm -> vm |> b.SubModelSeqKeyedData.VmToId |> (=) id)
+
+type SelectedItemBinding<'bindingModel, 'bindingMsg, 'vm, 'id> =
+    { FromId: 'id -> 'vm option
+      VmToId: 'vm -> 'id }
 
 type SubModelSelectedItemBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'id> =
-  { Get: 'model -> 'id voption
-    Set: 'id voption -> 'model -> unit
-    SubModelSeqBindingName: string
-    SelectedItemBinding: SelectedItemBinding<'bindingModel, 'bindingMsg, 'vm, 'id>
-  }
+    { Get: 'model -> 'id voption
+      Set: 'id voption -> 'model -> unit
+      SubModelSeqBindingName: string
+      SelectedItemBinding: SelectedItemBinding<'bindingModel, 'bindingMsg, 'vm, 'id> }
 
-  member b.TypedGet(model: 'model) =
-    b.Get model |> ValueOption.map (fun selectedId -> selectedId, b.SelectedItemBinding.FromId selectedId)
+    member b.TypedGet(model: 'model) =
+        b.Get model
+        |> ValueOption.map (fun selectedId -> selectedId, b.SelectedItemBinding.FromId selectedId)
 
-  member b.TypedSet(model: 'model, vm: 'vm voption) =
-    let id = vm |> ValueOption.map b.SelectedItemBinding.VmToId
-    b.Set id model
+    member b.TypedSet(model: 'model, vm: 'vm voption) =
+        let id = vm |> ValueOption.map b.SelectedItemBinding.VmToId
+        b.Set id model
 
 
 type BaseVmBinding<'model, 'msg, 't> =
-  | OneWay of OneWayBinding<'model, 't>
-  | OneWayToSource of OneWayToSourceBinding<'model, 't>
-  | OneWaySeq of OneWaySeqBinding<'model, obj, 't, obj>
-  | TwoWay of TwoWayBinding<'model, 't>
-  | Cmd of cmd: Command
-  | SubModel of SubModelBinding<'model, 'msg, obj, obj, 't>
-  | SubModelWin of SubModelWinBinding<'model, 'msg, obj, obj, 't>
-  | SubModelSeqUnkeyed of SubModelSeqUnkeyedBinding<'model, 'msg, obj, obj, obj, 't>
-  | SubModelSeqKeyed of SubModelSeqKeyedBinding<'model, 'msg, obj, obj, obj, 't, obj>
-  | SubModelSelectedItem of SubModelSelectedItemBinding<'model, 'msg, obj, obj, 't, obj>
-
-
-type CachedBinding<'model, 'msg, 't> = {
-  Binding: VmBinding<'model, 'msg, 't>
-  GetCache: unit -> 't option
-  SetCache: 't option -> unit
-}
-
-and ValidationBinding<'model, 'msg, 't> = {
-  Binding: VmBinding<'model, 'msg, 't>
-  Validate: 'model -> string list
-  Errors: string list ref
-}
-
-and LazyBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 't> = {
-  Binding: VmBinding<'bindingModel, 'bindingMsg, 't>
-  Get: 'model -> 'bindingModel
-  Equals: 'bindingModel -> 'bindingModel -> bool
-}
-
-and AlterMsgStreamBinding<'model, 'bindingModel, 'bindingMsg, 't> = {
-  Binding: VmBinding<'bindingModel, 'bindingMsg, 't>
-  Get: 'model -> 'bindingModel
-}
+    | OneWay of OneWayBinding<'model, 't>
+    | OneWayToSource of OneWayToSourceBinding<'model, 't>
+    | OneWaySeq of OneWaySeqBinding<'model, obj, 't, obj>
+    | TwoWay of TwoWayBinding<'model, 't>
+    | Cmd of cmd: Command
+    | SubModel of SubModelBinding<'model, 'msg, obj, obj, 't>
+    | SubModelWin of SubModelWinBinding<'model, 'msg, obj, obj, 't>
+    | SubModelSeqUnkeyed of SubModelSeqUnkeyedBinding<'model, 'msg, obj, obj, obj, 't>
+    | SubModelSeqKeyed of SubModelSeqKeyedBinding<'model, 'msg, obj, obj, obj, 't, obj>
+    | SubModelSelectedItem of SubModelSelectedItemBinding<'model, 'msg, obj, obj, 't, obj>
+
+
+type CachedBinding<'model, 'msg, 't> =
+    { Binding: VmBinding<'model, 'msg, 't>
+      GetCache: unit -> 't option
+      SetCache: 't option -> unit }
+
+and ValidationBinding<'model, 'msg, 't> =
+    { Binding: VmBinding<'model, 'msg, 't>
+      Validate: 'model -> string list
+      Errors: string list ref }
+
+and LazyBinding<'model, 'msg, 'bindingModel, 'bindingMsg, 't> =
+    { Binding: VmBinding<'bindingModel, 'bindingMsg, 't>
+      Get: 'model -> 'bindingModel
+      Equals: 'bindingModel -> 'bindingModel -> bool }
+
+and AlterMsgStreamBinding<'model, 'bindingModel, 'bindingMsg, 't> =
+    { Binding: VmBinding<'bindingModel, 'bindingMsg, 't>
+      Get: 'model -> 'bindingModel }
 
 /// Represents all necessary data used in an active binding.
 and VmBinding<'model, 'msg, 't> =
-  | BaseVmBinding of BaseVmBinding<'model, 'msg, 't>
-  | Cached of CachedBinding<'model, 'msg, 't>
-  | Validatation of ValidationBinding<'model, 'msg, 't>
-  | Lazy of LazyBinding<'model, 'msg, obj, obj, 't>
-  | AlterMsgStream of AlterMsgStreamBinding<'model, obj, obj, 't>
+    | BaseVmBinding of BaseVmBinding<'model, 'msg, 't>
+    | Cached of CachedBinding<'model, 'msg, 't>
+    | Validatation of ValidationBinding<'model, 'msg, 't>
+    | Lazy of LazyBinding<'model, 'msg, obj, obj, 't>
+    | AlterMsgStream of AlterMsgStreamBinding<'model, obj, obj, 't>
+
 
-  with
+    member this.AddCaching =
+        let mutable cache = None in
+
+        Cached
+            { Binding = this
+              GetCache = (fun () -> cache)
+              SetCache = fun c -> cache <- c }
 
-    member this.AddCaching = let mutable cache = None in Cached { Binding = this; GetCache = (fun () -> cache); SetCache = fun c -> cache <- c }
     member this.AddValidation currentModel validate =
-      { Binding = this
-        Validate = validate
-        Errors = currentModel |> validate |> ref }
-      |> Validatation
+        { Binding = this
+          Validate = validate
+          Errors = currentModel |> validate |> ref }
+        |> Validatation
 
 module internal MapOutputType =
-  let private baseCase (fOut: 'a -> 'b) (fIn: 'b -> 'a) (data: BaseVmBinding<'model, 'msg, 'a>) : BaseVmBinding<'model, 'msg, 'b> =
-    match data with
-    | OneWay b -> OneWay { OneWayData = { Get = b.OneWayData.Get >> fOut } }
-    | OneWayToSource b -> OneWayToSource { Set = fIn >> b.Set }
-    | Cmd b -> Cmd b
-    | TwoWay b -> TwoWay { Get = b.Get >> fOut; Set = fIn >> b.Set }
-    | OneWaySeq b -> OneWaySeq {
-        OneWaySeqData = {
-          Get = b.OneWaySeqData.Get
-          CreateCollection = b.OneWaySeqData.CreateCollection >> CollectionTarget.mapCollection fOut
-          GetId = b.OneWaySeqData.GetId
-          ItemEquals = b.OneWaySeqData.ItemEquals }
-        Values = b.Values |> CollectionTarget.mapCollection fOut }
-    | SubModel b -> SubModel {
-        SubModelData = {
-          GetModel = b.SubModelData.GetModel
-          CreateViewModel = b.SubModelData.CreateViewModel >> fOut
-          UpdateViewModel = (fun (vm,m) -> b.SubModelData.UpdateViewModel (fIn vm, m))
-          ToMsg = b.SubModelData.ToMsg }
-        Dispatch = b.Dispatch
-        GetVm = b.GetVm >> ValueOption.map fOut
-        SetVm = ValueOption.map fIn >> b.SetVm
-        GetCurrentModel = b.GetCurrentModel }
-    | SubModelWin b -> SubModelWin {
-        SubModelWinData = {
-          GetState = b.SubModelWinData.GetState
-          CreateViewModel = b.SubModelWinData.CreateViewModel >> fOut
-          UpdateViewModel = (fun (vm,m) -> b.SubModelWinData.UpdateViewModel (fIn vm, m))
-          ToMsg = b.SubModelWinData.ToMsg
-          GetWindow = b.SubModelWinData.GetWindow
-          IsModal = b.SubModelWinData.IsModal
-          OnCloseRequested = b.SubModelWinData.OnCloseRequested }
-        Dispatch = b.Dispatch
-        WinRef = b.WinRef
-        PreventClose = b.PreventClose
-        GetVmWinState = b.GetVmWinState >> WindowState.map fOut
-        SetVmWinState = WindowState.map fIn >> b.SetVmWinState
-        GetCurrentModel = b.GetCurrentModel }
-    | SubModelSeqUnkeyed b -> SubModelSeqUnkeyed {
-        SubModelSeqUnkeyedData = {
-          GetModels = b.SubModelSeqUnkeyedData.GetModels
-          CreateViewModel = b.SubModelSeqUnkeyedData.CreateViewModel
-          CreateCollection = b.SubModelSeqUnkeyedData.CreateCollection >> CollectionTarget.mapCollection fOut
-          UpdateViewModel = b.SubModelSeqUnkeyedData.UpdateViewModel
-          ToMsg = b.SubModelSeqUnkeyedData.ToMsg }
-        Dispatch = b.Dispatch
-        Vms = b.Vms |> CollectionTarget.mapCollection fOut
-        GetCurrentModel = b.GetCurrentModel }
-    | SubModelSeqKeyed b -> SubModelSeqKeyed {
-        SubModelSeqKeyedData = {
-          GetSubModels = b.SubModelSeqKeyedData.GetSubModels
-          CreateViewModel = b.SubModelSeqKeyedData.CreateViewModel
-          CreateCollection = b.SubModelSeqKeyedData.CreateCollection >> CollectionTarget.mapCollection fOut
-          UpdateViewModel = b.SubModelSeqKeyedData.UpdateViewModel
-          ToMsg = b.SubModelSeqKeyedData.ToMsg
-          BmToId = b.SubModelSeqKeyedData.BmToId
-          VmToId = b.SubModelSeqKeyedData.VmToId }
-        Dispatch = b.Dispatch
-        Vms = b.Vms |> CollectionTarget.mapCollection fOut
-        GetCurrentModel = b.GetCurrentModel }
-    | SubModelSelectedItem b -> SubModelSelectedItem {
-        Get = b.Get
-        Set = b.Set
-        SubModelSeqBindingName = b.SubModelSeqBindingName
-        SelectedItemBinding = {
-          VmToId = fIn >> b.SelectedItemBinding.VmToId
-          FromId = b.SelectedItemBinding.FromId >> Option.map fOut } }
-
-  let rec private recursiveCase<'model, 'msg, 'a, 'b> (fOut: 'a -> 'b) (fIn: 'b -> 'a) (data: VmBinding<'model, 'msg, 'a>) : VmBinding<'model, 'msg, 'b> =
-    match data with
-    | BaseVmBinding b -> baseCase fOut fIn b |> BaseVmBinding
-    | Cached b -> Cached {
-        Binding = recursiveCase fOut fIn b.Binding
-        GetCache = b.GetCache >> Option.map fOut
-        SetCache = Option.map fIn >> b.SetCache
-      }
-    | AlterMsgStream b -> AlterMsgStream {
-        Binding = recursiveCase fOut fIn b.Binding
-        Get = b.Get
-      }
-    | Lazy b -> Lazy {
-        Get = b.Get
-        Binding = recursiveCase fOut fIn b.Binding
-        Equals = b.Equals
-      }
-    | Validatation b -> Validatation {
-        Binding = recursiveCase fOut fIn b.Binding
-        Errors = b.Errors
-        Validate = b.Validate
-      }
-
-  let boxVm b = recursiveCase box unbox b
-  let unboxVm b = recursiveCase unbox box b
+    let private baseCase
+        (fOut: 'a -> 'b)
+        (fIn: 'b -> 'a)
+        (data: BaseVmBinding<'model, 'msg, 'a>)
+        : BaseVmBinding<'model, 'msg, 'b> =
+        match data with
+        | OneWay b -> OneWay { OneWayData = { Get = b.OneWayData.Get >> fOut } }
+        | OneWayToSource b -> OneWayToSource { Set = fIn >> b.Set }
+        | Cmd b -> Cmd b
+        | TwoWay b ->
+            TwoWay
+                { Get = b.Get >> fOut
+                  Set = fIn >> b.Set }
+        | OneWaySeq b ->
+            OneWaySeq
+                { OneWaySeqData =
+                    { Get = b.OneWaySeqData.Get
+                      CreateCollection = b.OneWaySeqData.CreateCollection >> CollectionTarget.mapCollection fOut
+                      GetId = b.OneWaySeqData.GetId
+                      ItemEquals = b.OneWaySeqData.ItemEquals }
+                  Values = b.Values |> CollectionTarget.mapCollection fOut }
+        | SubModel b ->
+            SubModel
+                { SubModelData =
+                    { GetModel = b.SubModelData.GetModel
+                      CreateViewModel = b.SubModelData.CreateViewModel >> fOut
+                      UpdateViewModel = (fun (vm, m) -> b.SubModelData.UpdateViewModel(fIn vm, m))
+                      ToMsg = b.SubModelData.ToMsg }
+                  Dispatch = b.Dispatch
+                  GetVm = b.GetVm >> ValueOption.map fOut
+                  SetVm = ValueOption.map fIn >> b.SetVm
+                  GetCurrentModel = b.GetCurrentModel }
+        | SubModelWin b ->
+            SubModelWin
+                { SubModelWinData =
+                    { GetState = b.SubModelWinData.GetState
+                      CreateViewModel = b.SubModelWinData.CreateViewModel >> fOut
+                      UpdateViewModel = (fun (vm, m) -> b.SubModelWinData.UpdateViewModel(fIn vm, m))
+                      ToMsg = b.SubModelWinData.ToMsg
+                      GetWindow = b.SubModelWinData.GetWindow
+                      IsModal = b.SubModelWinData.IsModal
+                      OnCloseRequested = b.SubModelWinData.OnCloseRequested }
+                  Dispatch = b.Dispatch
+                  WinRef = b.WinRef
+                  PreventClose = b.PreventClose
+                  GetVmWinState = b.GetVmWinState >> WindowState.map fOut
+                  SetVmWinState = WindowState.map fIn >> b.SetVmWinState
+                  GetCurrentModel = b.GetCurrentModel }
+        | SubModelSeqUnkeyed b ->
+            SubModelSeqUnkeyed
+                { SubModelSeqUnkeyedData =
+                    { GetModels = b.SubModelSeqUnkeyedData.GetModels
+                      CreateViewModel = b.SubModelSeqUnkeyedData.CreateViewModel
+                      CreateCollection =
+                        b.SubModelSeqUnkeyedData.CreateCollection >> CollectionTarget.mapCollection fOut
+                      UpdateViewModel = b.SubModelSeqUnkeyedData.UpdateViewModel
+                      ToMsg = b.SubModelSeqUnkeyedData.ToMsg }
+                  Dispatch = b.Dispatch
+                  Vms = b.Vms |> CollectionTarget.mapCollection fOut
+                  GetCurrentModel = b.GetCurrentModel }
+        | SubModelSeqKeyed b ->
+            SubModelSeqKeyed
+                { SubModelSeqKeyedData =
+                    { GetSubModels = b.SubModelSeqKeyedData.GetSubModels
+                      CreateViewModel = b.SubModelSeqKeyedData.CreateViewModel
+                      CreateCollection = b.SubModelSeqKeyedData.CreateCollection >> CollectionTarget.mapCollection fOut
+                      UpdateViewModel = b.SubModelSeqKeyedData.UpdateViewModel
+                      ToMsg = b.SubModelSeqKeyedData.ToMsg
+                      BmToId = b.SubModelSeqKeyedData.BmToId
+                      VmToId = b.SubModelSeqKeyedData.VmToId }
+                  Dispatch = b.Dispatch
+                  Vms = b.Vms |> CollectionTarget.mapCollection fOut
+                  GetCurrentModel = b.GetCurrentModel }
+        | SubModelSelectedItem b ->
+            SubModelSelectedItem
+                { Get = b.Get
+                  Set = b.Set
+                  SubModelSeqBindingName = b.SubModelSeqBindingName
+                  SelectedItemBinding =
+                    { VmToId = fIn >> b.SelectedItemBinding.VmToId
+                      FromId = b.SelectedItemBinding.FromId >> Option.map fOut } }
+
+    let rec private recursiveCase<'model, 'msg, 'a, 'b>
+        (fOut: 'a -> 'b)
+        (fIn: 'b -> 'a)
+        (data: VmBinding<'model, 'msg, 'a>)
+        : VmBinding<'model, 'msg, 'b> =
+        match data with
+        | BaseVmBinding b -> baseCase fOut fIn b |> BaseVmBinding
+        | Cached b ->
+            Cached
+                { Binding = recursiveCase fOut fIn b.Binding
+                  GetCache = b.GetCache >> Option.map fOut
+                  SetCache = Option.map fIn >> b.SetCache }
+        | AlterMsgStream b ->
+            AlterMsgStream
+                { Binding = recursiveCase fOut fIn b.Binding
+                  Get = b.Get }
+        | Lazy b ->
+            Lazy
+                { Get = b.Get
+                  Binding = recursiveCase fOut fIn b.Binding
+                  Equals = b.Equals }
+        | Validatation b ->
+            Validatation
+                { Binding = recursiveCase fOut fIn b.Binding
+                  Errors = b.Errors
+                  Validate = b.Validate }
+
+    let boxVm b = recursiveCase box unbox b
+    let unboxVm b = recursiveCase unbox box b
 
 type SubModelSelectedItemLast() =
 
-  member _.Base(data: BaseBindingData<'model, 'msg, obj>) : int =
-    match data with
-    | SubModelSelectedItemData _ -> 1
-    | _ -> 0
+    member _.Base(data: BaseBindingData<'model, 'msg, obj>) : int =
+        match data with
+        | SubModelSelectedItemData _ -> 1
+        | _ -> 0
 
-  member this.Recursive<'model, 'msg>(data: BindingData<'model, 'msg, obj>) : int =
-    match data with
-    | BaseBindingData d -> this.Base d
-    | CachingData d -> this.Recursive d
-    | ValidationData d -> this.Recursive d.BindingData
-    | LazyData d -> this.Recursive d.BindingData
-    | AlterMsgStreamData d -> this.Recursive d.BindingData
+    member this.Recursive<'model, 'msg>(data: BindingData<'model, 'msg, obj>) : int =
+        match data with
+        | BaseBindingData d -> this.Base d
+        | CachingData d -> this.Recursive d
+        | ValidationData d -> this.Recursive d.BindingData
+        | LazyData d -> this.Recursive d.BindingData
+        | AlterMsgStreamData d -> this.Recursive d.BindingData
 
-  member this.CompareBindingDatas() : BindingData<'model, 'msg, obj> -> BindingData<'model, 'msg, obj> -> int =
-    fun a b -> this.Recursive(a) - this.Recursive(b)
+    member this.CompareBindingDatas() : BindingData<'model, 'msg, obj> -> BindingData<'model, 'msg, obj> -> int =
+        fun a b -> this.Recursive(a) - this.Recursive(b)
 
 
 type FirstValidationErrors() =
 
-  member this.Recursive<'model, 'msg, 't>
-      (binding: VmBinding<'model, 'msg, 't>)
-      : string list ref option =
-    match binding with
-    | BaseVmBinding _ -> None
-    | Cached b -> this.Recursive b.Binding
-    | Lazy b -> this.Recursive b.Binding
-    | AlterMsgStream b -> this.Recursive b.Binding
-    | Validatation b -> b.Errors |> Some // TODO: what if there is more than one validation effect?
+    member this.Recursive<'model, 'msg, 't>(binding: VmBinding<'model, 'msg, 't>) : string list ref option =
+        match binding with
+        | BaseVmBinding _ -> None
+        | Cached b -> this.Recursive b.Binding
+        | Lazy b -> this.Recursive b.Binding
+        | AlterMsgStream b -> this.Recursive b.Binding
+        | Validatation b -> b.Errors |> Some // TODO: what if there is more than one validation effect?
 
 
 type FuncsFromSubModelSeqKeyed() =
 
-  member _.Base(binding: BaseVmBinding<'model, 'msg, 't>) : SelectedItemBinding<'a, 'b, 'c, obj> option =
-    match binding with
-    | SubModelSeqKeyed b ->
-      { VmToId = box >> b.SubModelSeqKeyedData.VmToId
-        FromId = b.FromId >> Option.map unbox }
-      |> Some
-    | _ -> None
-
-  member this.Recursive<'model, 'msg, 't>
-      (binding: VmBinding<'model, 'msg, 't>)
-      : SelectedItemBinding<obj, obj, 't, obj> option =
-    match binding with
-    | BaseVmBinding b -> this.Base b
-    | Cached b -> this.Recursive b.Binding
-    | Validatation b -> this.Recursive b.Binding
-    | Lazy b -> this.Recursive b.Binding
-    | AlterMsgStream b -> this.Recursive b.Binding
+    member _.Base(binding: BaseVmBinding<'model, 'msg, 't>) : SelectedItemBinding<'a, 'b, 'c, obj> option =
+        match binding with
+        | SubModelSeqKeyed b ->
+            { VmToId = box >> b.SubModelSeqKeyedData.VmToId
+              FromId = b.FromId >> Option.map unbox }
+            |> Some
+        | _ -> None
+
+    member this.Recursive<'model, 'msg, 't>
+        (binding: VmBinding<'model, 'msg, 't>)
+        : SelectedItemBinding<obj, obj, 't, obj> option =
+        match binding with
+        | BaseVmBinding b -> this.Base b
+        | Cached b -> this.Recursive b.Binding
+        | Validatation b -> this.Recursive b.Binding
+        | Lazy b -> this.Recursive b.Binding
+        | AlterMsgStream b -> this.Recursive b.Binding
 
 
 type Initialize<'t>
-      (loggingArgs: LoggingViewModelArgs,
-       name: string,
-       getFunctionsForSubModelSelectedItem: string -> SelectedItemBinding<obj, obj, 't, obj> option) =
-
-  let { log = log
-        logPerformance = logPerformance
-        performanceLogThresholdMs = performanceLogThresholdMs
-        nameChain = nameChain } =
-    loggingArgs
-
-  let measure x = x |> Helpers2.measure logPerformance LogLevel.Trace performanceLogThresholdMs name nameChain
-  let measure2 x = x |> Helpers2.measure2 logPerformance LogLevel.Trace performanceLogThresholdMs name nameChain
-
-  member _.Base<'model, 'msg>
-      (initialModel: 'model,
-       dispatch: 'msg -> unit,
-       getCurrentModel: unit -> 'model,
-       binding: BaseBindingData<'model, 'msg, 't>)
-      : BaseVmBinding<'model, 'msg, 't> option =
-    match binding with
-      | OneWayData d ->
-          { OneWayData = d |> BindingData.OneWay.measureFunctions measure }
-          |> OneWay
-          |> Some
-      | OneWayToSourceData d ->
-          let d = d |> BindingData.OneWayToSource.measureFunctions measure
-          { Set = fun obj m -> d.Set obj m |> dispatch }
-          |> OneWayToSource
-          |> Some
-      | OneWaySeqData d ->
-          { OneWaySeqData = d |> BindingData.OneWaySeq.measureFunctions measure measure measure2
-            Values = d.CreateCollection (initialModel |> d.Get) }
-          |> OneWaySeq
-          |> Some
-      | TwoWayData d ->
-          let d = d |> BindingData.TwoWay.measureFunctions measure measure
-          { Get = d.Get
-            Set = fun obj m -> d.Set obj m |> dispatch }
-          |> TwoWay
-          |> Some
-      | CmdData d ->
-          let d = d |> BindingData.Cmd.measureFunctions measure2 measure2
-          let execute param = d.Exec param (getCurrentModel ()) |> ValueOption.iter dispatch
-          let canExecute param = d.CanExec param (getCurrentModel ())
-          let cmd = Command(execute, canExecute)
-          if d.AutoRequery then
-            cmd.AddRequeryHandler ()
-          cmd
-          |> Cmd
-          |> Some
-      | SubModelData d ->
-          let d = d |> BindingData.SubModel.measureFunctions measure measure measure measure2
-          let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
-          let chain = LoggingViewModelArgs.getNameChainFor nameChain name
-          d.GetModel initialModel
-          |> ValueOption.map (fun m -> ViewModelArgs.create m (toMsg >> dispatch) chain loggingArgs)
-          |> ValueOption.map d.CreateViewModel
-          |> (fun vm -> let mutable vm = vm in { SubModelData = d
-                                                 Dispatch = dispatch
-                                                 GetVm = (fun () -> vm)
-                                                 SetVm = fun nvm -> vm <- nvm
-                                                 GetCurrentModel = getCurrentModel
-                                               })
-          |> SubModel
-          |> Some
-      | SubModelWinData d ->
-          let d = d |> BindingData.SubModelWin.measureFunctions measure measure measure measure2
-          let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
-          match d.GetState initialModel with
-          | WindowState.Closed ->
-              let mutable vmWinState = WindowState.Closed
-              { SubModelWinData = d
-                Dispatch = dispatch
-                WinRef = WeakReference<_>(null)
-                PreventClose = ref true
-                GetVmWinState = fun () -> vmWinState
-                SetVmWinState = fun vmState -> vmWinState <- vmState
-                GetCurrentModel = getCurrentModel
-              }
-          | WindowState.Hidden m ->
-              let chain = LoggingViewModelArgs.getNameChainFor nameChain name
-              let args = ViewModelArgs.create m (toMsg >> dispatch) chain loggingArgs
-              let vm = d.CreateViewModel args
-              let winRef = WeakReference<_>(null)
-              let preventClose = ref true
-              log.LogTrace("[{BindingNameChain}] Creating hidden window", chain)
-              Helpers2.showNewWindow winRef d.GetWindow d.IsModal d.OnCloseRequested preventClose vm Visibility.Hidden getCurrentModel dispatch
-              let mutable vmWinState = WindowState.Hidden vm
-              { SubModelWinData = d
-                Dispatch = dispatch
-                WinRef = winRef
-                PreventClose = preventClose
-                GetVmWinState = fun () -> vmWinState
-                SetVmWinState = fun vm -> vmWinState <- vm
-                GetCurrentModel = getCurrentModel
-              }
-          | WindowState.Visible m ->
-              let chain = LoggingViewModelArgs.getNameChainFor nameChain name
-              let args = ViewModelArgs.create m (toMsg >> dispatch) chain loggingArgs
-              let vm = d.CreateViewModel args
-              let winRef = WeakReference<_>(null)
-              let preventClose = ref true
-              log.LogTrace("[{BindingNameChain}] Creating visible window", chain)
-              Helpers2.showNewWindow winRef d.GetWindow d.IsModal d.OnCloseRequested preventClose vm Visibility.Visible getCurrentModel dispatch
-              let mutable vmWinState = WindowState.Visible vm
-              { SubModelWinData = d
-                Dispatch = dispatch
-                WinRef = winRef
-                PreventClose = preventClose
-                GetVmWinState = fun () -> vmWinState
-                SetVmWinState = fun vm -> vmWinState <- vm
-                GetCurrentModel = getCurrentModel
-              }
-          |> SubModelWin
-          |> Some
-      | SubModelSeqUnkeyedData d ->
-          let d = d |> BindingData.SubModelSeqUnkeyed.measureFunctions measure measure measure measure measure2
-          let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
-          let vms =
-            d.GetModels initialModel
-            |> Seq.indexed
-            |> Seq.map (fun (idx, m) ->
-                 let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (idx |> string)
-                 let args = ViewModelArgs.create m (fun msg -> toMsg (idx, msg) |> dispatch) chain loggingArgs
-                 d.CreateViewModel args)
-            |> d.CreateCollection
-          { SubModelSeqUnkeyedData = d
-            Dispatch = dispatch
-            Vms = vms
-            GetCurrentModel = getCurrentModel
-          }
-          |> SubModelSeqUnkeyed
-          |> Some
-      | SubModelSeqKeyedData d ->
-          let d = d |> BindingData.SubModelSeqKeyed.measureFunctions measure measure measure measure measure2 measure measure
-          let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
-          let vms =
-            d.GetSubModels initialModel
-            |> Seq.map (fun m ->
-                 let mId = d.BmToId m
-                 let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (mId |> string)
-                 let args = ViewModelArgs.create m (fun msg -> toMsg (mId, msg) |> dispatch) chain loggingArgs
-                 d.CreateViewModel args)
-            |> d.CreateCollection
-          { SubModelSeqKeyedData = d
-            Dispatch = dispatch
-            Vms = vms
-            GetCurrentModel = getCurrentModel
-          }
-          |> SubModelSeqKeyed
-          |> Some
-      | SubModelSelectedItemData d ->
-          let d = d |> BindingData.SubModelSelectedItem.measureFunctions measure measure2
-          d.SubModelSeqBindingName
-          |> getFunctionsForSubModelSelectedItem
-          |> Option.map (fun selectedItemBinding ->
-              { Get = d.Get
-                Set = fun obj m -> d.Set obj m |> dispatch
-                SubModelSeqBindingName = d.SubModelSeqBindingName
-                SelectedItemBinding = selectedItemBinding }
-              |> SubModelSelectedItem)
-
-  member this.Recursive<'model, 'msg>
-      (initialModel: 'model,
-       dispatch: 'msg -> unit,
-       getCurrentModel: unit -> 'model,
-       binding: BindingData<'model, 'msg, 't>)
-      : VmBinding<'model, 'msg, 't> option =
-    option {
-      match binding with
-      | BaseBindingData d ->
-          let! b = this.Base(initialModel, dispatch, getCurrentModel, d)
-          return BaseVmBinding b
-      | CachingData d ->
-          let! b = this.Recursive(initialModel, dispatch, getCurrentModel, d)
-          return b.AddCaching
-      | ValidationData d ->
-          let d = d |> BindingData.Validation.measureFunctions measure
-          let! b = this.Recursive(initialModel, dispatch, getCurrentModel, d.BindingData)
-          return b.AddValidation initialModel d.Validate
-      | LazyData d ->
-          let initialModel' : obj = d.Get initialModel
-          let getCurrentModel' : unit -> obj = getCurrentModel >> d.Get
-          let dispatch' : obj -> unit = d.MapDispatch(getCurrentModel, dispatch)
-          let d = d |> BindingData.Lazy.measureFunctions measure measure2 measure2
-          let! b = this.Recursive(initialModel', dispatch', getCurrentModel', d.BindingData)
-          return { Binding = b
-                   Get = d.Get
-                   Equals = d.Equals
-                 } |> Lazy
-      | AlterMsgStreamData d ->
-          let initialModel' : obj = d.Get initialModel
-          let getCurrentModel' : unit -> obj = getCurrentModel >> d.Get
-          let dispatch' : obj -> unit = d.MapDispatch(getCurrentModel, dispatch)
-          let! b = this.Recursive(initialModel', dispatch', getCurrentModel', d.BindingData)
-          return { Binding = b
-                   Get = d.Get
-                 } |> AlterMsgStream
-    }
+    (
+        loggingArgs: LoggingViewModelArgs,
+        name: string,
+        getFunctionsForSubModelSelectedItem: string -> SelectedItemBinding<obj, obj, 't, obj> option
+    ) =
+
+    let { log = log
+          logPerformance = logPerformance
+          performanceLogThresholdMs = performanceLogThresholdMs
+          nameChain = nameChain } =
+        loggingArgs
+
+    let measure x =
+        x
+        |> Helpers2.measure logPerformance LogLevel.Trace performanceLogThresholdMs name nameChain
+
+    let measure2 x =
+        x
+        |> Helpers2.measure2 logPerformance LogLevel.Trace performanceLogThresholdMs name nameChain
+
+    member _.Base<'model, 'msg>
+        (
+            initialModel: 'model,
+            dispatch: 'msg -> unit,
+            getCurrentModel: unit -> 'model,
+            binding: BaseBindingData<'model, 'msg, 't>
+        ) : BaseVmBinding<'model, 'msg, 't> option =
+        match binding with
+        | OneWayData d ->
+            { OneWayData = d |> BindingData.OneWay.measureFunctions measure }
+            |> OneWay
+            |> Some
+        | OneWayToSourceData d ->
+            let d = d |> BindingData.OneWayToSource.measureFunctions measure
+            { Set = fun obj m -> d.Set obj m |> dispatch } |> OneWayToSource |> Some
+        | OneWaySeqData d ->
+            { OneWaySeqData = d |> BindingData.OneWaySeq.measureFunctions measure measure measure2
+              Values = d.CreateCollection(initialModel |> d.Get) }
+            |> OneWaySeq
+            |> Some
+        | TwoWayData d ->
+            let d = d |> BindingData.TwoWay.measureFunctions measure measure
+
+            { Get = d.Get
+              Set = fun obj m -> d.Set obj m |> dispatch }
+            |> TwoWay
+            |> Some
+        | CmdData d ->
+            let d = d |> BindingData.Cmd.measureFunctions measure2 measure2
+
+            let execute param =
+                d.Exec param (getCurrentModel ()) |> ValueOption.iter dispatch
+
+            let canExecute param = d.CanExec param (getCurrentModel ())
+            let cmd = Command(execute, canExecute)
+
+            if d.AutoRequery then
+                cmd.AddRequeryHandler()
+
+            cmd |> Cmd |> Some
+        | SubModelData d ->
+            let d = d |> BindingData.SubModel.measureFunctions measure measure measure measure2
+            let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
+            let chain = LoggingViewModelArgs.getNameChainFor nameChain name
+
+            d.GetModel initialModel
+            |> ValueOption.map (fun m -> ViewModelArgs.create m (toMsg >> dispatch) chain loggingArgs)
+            |> ValueOption.map d.CreateViewModel
+            |> (fun vm ->
+                let mutable vm = vm in
+
+                { SubModelData = d
+                  Dispatch = dispatch
+                  GetVm = (fun () -> vm)
+                  SetVm = fun nvm -> vm <- nvm
+                  GetCurrentModel = getCurrentModel })
+            |> SubModel
+            |> Some
+        | SubModelWinData d ->
+            let d =
+                d |> BindingData.SubModelWin.measureFunctions measure measure measure measure2
+
+            let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
+
+            match d.GetState initialModel with
+            | WindowState.Closed ->
+                let mutable vmWinState = WindowState.Closed
+
+                { SubModelWinData = d
+                  Dispatch = dispatch
+                  WinRef = WeakReference<_>(null)
+                  PreventClose = ref true
+                  GetVmWinState = fun () -> vmWinState
+                  SetVmWinState = fun vmState -> vmWinState <- vmState
+                  GetCurrentModel = getCurrentModel }
+            | WindowState.Hidden m ->
+                let chain = LoggingViewModelArgs.getNameChainFor nameChain name
+                let args = ViewModelArgs.create m (toMsg >> dispatch) chain loggingArgs
+                let vm = d.CreateViewModel args
+                let winRef = WeakReference<_>(null)
+                let preventClose = ref true
+                log.LogTrace("[{BindingNameChain}] Creating hidden window", chain)
+
+                Helpers2.showNewWindow
+                    winRef
+                    d.GetWindow
+                    d.IsModal
+                    d.OnCloseRequested
+                    preventClose
+                    vm
+                    Visibility.Hidden
+                    getCurrentModel
+                    dispatch
+
+                let mutable vmWinState = WindowState.Hidden vm
+
+                { SubModelWinData = d
+                  Dispatch = dispatch
+                  WinRef = winRef
+                  PreventClose = preventClose
+                  GetVmWinState = fun () -> vmWinState
+                  SetVmWinState = fun vm -> vmWinState <- vm
+                  GetCurrentModel = getCurrentModel }
+            | WindowState.Visible m ->
+                let chain = LoggingViewModelArgs.getNameChainFor nameChain name
+                let args = ViewModelArgs.create m (toMsg >> dispatch) chain loggingArgs
+                let vm = d.CreateViewModel args
+                let winRef = WeakReference<_>(null)
+                let preventClose = ref true
+                log.LogTrace("[{BindingNameChain}] Creating visible window", chain)
+
+                Helpers2.showNewWindow
+                    winRef
+                    d.GetWindow
+                    d.IsModal
+                    d.OnCloseRequested
+                    preventClose
+                    vm
+                    Visibility.Visible
+                    getCurrentModel
+                    dispatch
+
+                let mutable vmWinState = WindowState.Visible vm
+
+                { SubModelWinData = d
+                  Dispatch = dispatch
+                  WinRef = winRef
+                  PreventClose = preventClose
+                  GetVmWinState = fun () -> vmWinState
+                  SetVmWinState = fun vm -> vmWinState <- vm
+                  GetCurrentModel = getCurrentModel }
+            |> SubModelWin
+            |> Some
+        | SubModelSeqUnkeyedData d ->
+            let d =
+                d
+                |> BindingData.SubModelSeqUnkeyed.measureFunctions measure measure measure measure measure2
+
+            let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
+
+            let vms =
+                d.GetModels initialModel
+                |> Seq.indexed
+                |> Seq.map (fun (idx, m) ->
+                    let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (idx |> string)
+
+                    let args =
+                        ViewModelArgs.create m (fun msg -> toMsg (idx, msg) |> dispatch) chain loggingArgs
+
+                    d.CreateViewModel args)
+                |> d.CreateCollection
+
+            { SubModelSeqUnkeyedData = d
+              Dispatch = dispatch
+              Vms = vms
+              GetCurrentModel = getCurrentModel }
+            |> SubModelSeqUnkeyed
+            |> Some
+        | SubModelSeqKeyedData d ->
+            let d =
+                d
+                |> BindingData.SubModelSeqKeyed.measureFunctions
+                    measure
+                    measure
+                    measure
+                    measure
+                    measure2
+                    measure
+                    measure
+
+            let toMsg = fun msg -> d.ToMsg (getCurrentModel ()) msg
+
+            let vms =
+                d.GetSubModels initialModel
+                |> Seq.map (fun m ->
+                    let mId = d.BmToId m
+                    let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (mId |> string)
+
+                    let args =
+                        ViewModelArgs.create m (fun msg -> toMsg (mId, msg) |> dispatch) chain loggingArgs
+
+                    d.CreateViewModel args)
+                |> d.CreateCollection
+
+            { SubModelSeqKeyedData = d
+              Dispatch = dispatch
+              Vms = vms
+              GetCurrentModel = getCurrentModel }
+            |> SubModelSeqKeyed
+            |> Some
+        | SubModelSelectedItemData d ->
+            let d = d |> BindingData.SubModelSelectedItem.measureFunctions measure measure2
+
+            d.SubModelSeqBindingName
+            |> getFunctionsForSubModelSelectedItem
+            |> Option.map (fun selectedItemBinding ->
+                { Get = d.Get
+                  Set = fun obj m -> d.Set obj m |> dispatch
+                  SubModelSeqBindingName = d.SubModelSeqBindingName
+                  SelectedItemBinding = selectedItemBinding }
+                |> SubModelSelectedItem)
+
+    member this.Recursive<'model, 'msg>
+        (
+            initialModel: 'model,
+            dispatch: 'msg -> unit,
+            getCurrentModel: unit -> 'model,
+            binding: BindingData<'model, 'msg, 't>
+        ) : VmBinding<'model, 'msg, 't> option =
+        option {
+            match binding with
+            | BaseBindingData d ->
+                let! b = this.Base(initialModel, dispatch, getCurrentModel, d)
+                return BaseVmBinding b
+            | CachingData d ->
+                let! b = this.Recursive(initialModel, dispatch, getCurrentModel, d)
+                return b.AddCaching
+            | ValidationData d ->
+                let d = d |> BindingData.Validation.measureFunctions measure
+                let! b = this.Recursive(initialModel, dispatch, getCurrentModel, d.BindingData)
+                return b.AddValidation initialModel d.Validate
+            | LazyData d ->
+                let initialModel': obj = d.Get initialModel
+                let getCurrentModel': unit -> obj = getCurrentModel >> d.Get
+                let dispatch': obj -> unit = d.MapDispatch(getCurrentModel, dispatch)
+                let d = d |> BindingData.Lazy.measureFunctions measure measure2 measure2
+                let! b = this.Recursive(initialModel', dispatch', getCurrentModel', d.BindingData)
+
+                return
+                    { Binding = b
+                      Get = d.Get
+                      Equals = d.Equals }
+                    |> Lazy
+            | AlterMsgStreamData d ->
+                let initialModel': obj = d.Get initialModel
+                let getCurrentModel': unit -> obj = getCurrentModel >> d.Get
+                let dispatch': obj -> unit = d.MapDispatch(getCurrentModel, dispatch)
+                let! b = this.Recursive(initialModel', dispatch', getCurrentModel', d.BindingData)
+                return { Binding = b; Get = d.Get } |> AlterMsgStream
+        }
 
 
 /// Updates the binding and returns a list indicating what events to raise for this binding
-type Update<'t>
-    (loggingArgs: LoggingViewModelArgs,
-     name: string) =
-
-  let { log = log
-        nameChain = nameChain } =
-    loggingArgs
-
-  member _.Base<'model, 'msg>
-      (newModel: 'model,
-       binding: BaseVmBinding<'model, 'msg, 't>) =
-    match binding with
-      | OneWay _
-      | TwoWay _
-      | SubModelSelectedItem _ -> [ PropertyChanged name ]
-      | OneWayToSource _ -> []
-      | OneWaySeq b ->
-          b.OneWaySeqData.Merge(b.Values, newModel)
-          []
-      | Cmd cmd -> cmd |> CanExecuteChanged |> List.singleton
-      | SubModel b ->
-        let d = b.SubModelData
-        match b.GetVm (), d.GetModel newModel with
-        | ValueNone, ValueNone -> []
-        | ValueSome _, ValueNone ->
-            b.SetVm ValueNone
-            [ PropertyChanged name ]
-        | ValueNone, ValueSome m ->
-            let toMsg = fun msg -> d.ToMsg (b.GetCurrentModel ()) msg
-            let chain = LoggingViewModelArgs.getNameChainFor nameChain name
-            let args = ViewModelArgs.create m (toMsg >> b.Dispatch) chain loggingArgs
-            b.SetVm (ValueSome <| d.CreateViewModel(args))
-            [ PropertyChanged name ]
-        | ValueSome vm, ValueSome m ->
-            d.UpdateViewModel (vm, m)
+type Update<'t>(loggingArgs: LoggingViewModelArgs, name: string) =
+
+    let { log = log; nameChain = nameChain } = loggingArgs
+
+    member _.Base<'model, 'msg>(newModel: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
+        match binding with
+        | OneWay _
+        | TwoWay _
+        | SubModelSelectedItem _ -> [ PropertyChanged name ]
+        | OneWayToSource _ -> []
+        | OneWaySeq b ->
+            b.OneWaySeqData.Merge(b.Values, newModel)
             []
-      | SubModelWin b ->
-          let d = b.SubModelWinData
-          let winPropChain = LoggingViewModelArgs.getNameChainFor nameChain name
-          let close () =
-            b.PreventClose.Value <- false
-            match b.WinRef.TryGetTarget () with
-            | false, _ ->
-                log.LogError("[{BindingNameChain}] Attempted to close window, but did not find window reference", winPropChain)
-            | true, w ->
-                log.LogTrace("[{BindingNameChain}] Closing window", winPropChain)
-                b.WinRef.SetTarget null
-                (*
+        | Cmd cmd -> cmd |> CanExecuteChanged |> List.singleton
+        | SubModel b ->
+            let d = b.SubModelData
+
+            match b.GetVm(), d.GetModel newModel with
+            | ValueNone, ValueNone -> []
+            | ValueSome _, ValueNone ->
+                b.SetVm ValueNone
+                [ PropertyChanged name ]
+            | ValueNone, ValueSome m ->
+                let toMsg = fun msg -> d.ToMsg (b.GetCurrentModel()) msg
+                let chain = LoggingViewModelArgs.getNameChainFor nameChain name
+                let args = ViewModelArgs.create m (toMsg >> b.Dispatch) chain loggingArgs
+                b.SetVm(ValueSome <| d.CreateViewModel(args))
+                [ PropertyChanged name ]
+            | ValueSome vm, ValueSome m ->
+                d.UpdateViewModel(vm, m)
+                []
+        | SubModelWin b ->
+            let d = b.SubModelWinData
+            let winPropChain = LoggingViewModelArgs.getNameChainFor nameChain name
+
+            let close () =
+                b.PreventClose.Value <- false
+
+                match b.WinRef.TryGetTarget() with
+                | false, _ ->
+                    log.LogError(
+                        "[{BindingNameChain}] Attempted to close window, but did not find window reference",
+                        winPropChain
+                    )
+                | true, w ->
+                    log.LogTrace("[{BindingNameChain}] Closing window", winPropChain)
+                    b.WinRef.SetTarget null
+                    (*
                  * The Window might be in the process of closing,
                  * so instead of immediately executing Window.Close via Dispatcher.Invoke,
                  * queue a call to Window.Close via Dispatcher.InvokeAsync.
                  * https://github.com/elmish/Elmish.WPF/issues/330
                  *)
-                w.Dispatcher.InvokeAsync(w.Close) |> ignore
-            b.WinRef.SetTarget null
-
-          let hide () =
-            match b.WinRef.TryGetTarget () with
-            | false, _ ->
-                log.LogError("[{BindingNameChain}] Attempted to hide window, but did not find window reference", winPropChain)
-            | true, w ->
-                log.LogTrace("[{BindingNameChain}] Hiding window", winPropChain)
-                w.Dispatcher.Invoke(fun () -> w.Visibility <- Visibility.Hidden)
-
-          let showHidden () =
-            match b.WinRef.TryGetTarget () with
-            | false, _ ->
-                log.LogError("[{BindingNameChain}] Attempted to show existing hidden window, but did not find window reference", winPropChain)
-            | true, w ->
-                log.LogTrace("[{BindingNameChain}] Showing existing hidden window", winPropChain)
-                w.Dispatcher.Invoke(fun () -> w.Visibility <- Visibility.Visible)
-
-          let showNew vm =
-            b.PreventClose.Value <- true
-            Helpers2.showNewWindow b.WinRef d.GetWindow d.IsModal d.OnCloseRequested b.PreventClose vm
-
-          let newVm model =
-            let toMsg = fun msg -> d.ToMsg (b.GetCurrentModel ()) msg
-            let chain = LoggingViewModelArgs.getNameChainFor nameChain name
-            let args = ViewModelArgs.create model (toMsg >> b.Dispatch) chain loggingArgs
-            d.CreateViewModel args
-
-          match b.GetVmWinState(), d.GetState newModel with
-          | WindowState.Closed, WindowState.Closed ->
-              []
-          | WindowState.Hidden vm, WindowState.Hidden m
-          | WindowState.Visible vm, WindowState.Visible m ->
-              d.UpdateViewModel (vm, m)
-              []
-          | WindowState.Hidden _, WindowState.Closed
-          | WindowState.Visible _, WindowState.Closed ->
-              close ()
-              b.SetVmWinState WindowState.Closed
-              [ PropertyChanged name ]
-          | WindowState.Visible vm, WindowState.Hidden m ->
-              hide ()
-              d.UpdateViewModel (vm, m)
-              b.SetVmWinState (WindowState.Hidden vm)
-              []
-          | WindowState.Hidden vm, WindowState.Visible m ->
-              d.UpdateViewModel (vm, m)
-              showHidden ()
-              b.SetVmWinState (WindowState.Visible vm)
-              []
-          | WindowState.Closed, WindowState.Hidden m ->
-              let vm = newVm m
-              log.LogTrace("[{BindingNameChain}] Creating hidden window", winPropChain)
-              showNew vm Visibility.Hidden b.GetCurrentModel b.Dispatch
-              b.SetVmWinState (WindowState.Hidden vm)
-              [ PropertyChanged name ]
-          | WindowState.Closed, WindowState.Visible m ->
-              let vm = newVm m
-              log.LogTrace("[{BindingNameChain}] Creating visible window", winPropChain)
-              showNew vm Visibility.Visible b.GetCurrentModel b.Dispatch
-              b.SetVmWinState (WindowState.Visible vm)
-              [ PropertyChanged name ]
-      | SubModelSeqUnkeyed b ->
-          let d = b.SubModelSeqUnkeyedData
-          let create m idx =
-            let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (idx |> string)
-            let args = ViewModelArgs.create m (fun msg -> d.ToMsg (b.GetCurrentModel ()) (idx, msg) |> b.Dispatch) chain loggingArgs
-            d.CreateViewModel args
-          let update vm m = d.UpdateViewModel (vm, m)
-          Merge.unkeyed create update b.Vms (d.GetModels newModel)
-          []
-      | SubModelSeqKeyed b ->
-          let d = b.SubModelSeqKeyedData
-          let create m id =
-            let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (id |> string)
-            let args = ViewModelArgs.create m (fun msg -> d.ToMsg (b.GetCurrentModel ()) (id, msg) |> b.Dispatch) chain loggingArgs
-            d.CreateViewModel args
-          let update vm m = d.UpdateViewModel (vm, m)
-          let newSubModels = newModel |> d.GetSubModels |> Seq.toArray
-          try
-            d.MergeKeyed(create, update, b.Vms, newSubModels)
-          with
-            | :? DuplicateIdException as e ->
-              let messageTemplate = "[{BindingNameChain}] In the {SourceOrTarget} sequence of the binding {BindingName}, the elements at indices {Index1} and {Index2} have the same ID {ID}. To avoid this problem, the elements will be merged without using IDs."
-              log.LogError(messageTemplate, nameChain, e.SourceOrTarget, name, e.Index1, e.Index2, e.Id)
-              let create m _ = create m (d.BmToId m)
-              Merge.unkeyed create update b.Vms newSubModels
-          []
-
-  member this.Recursive<'model, 'msg>
-      (currentModel: 'model,
-       newModel: 'model,
-       binding: VmBinding<'model, 'msg, 't>)
-      : UpdateData list =
-    match binding with
-      | BaseVmBinding b -> this.Base(newModel, b)
-      | Cached b ->
-          let updates = this.Recursive(currentModel, newModel, b.Binding)
-          updates
-          |> List.filter UpdateData.isPropertyChanged
-          |> List.iter (fun _ -> b.SetCache None)
-          updates
-      | Validatation b ->
-          let updates = this.Recursive(currentModel, newModel, b.Binding)
-          let newErrors = b.Validate newModel
-          if b.Errors.Value <> newErrors then
-            b.Errors.Value <- newErrors
-            ErrorsChanged name :: updates
-          else
-            updates
-      | Lazy b ->
-          let currentModel' = currentModel |> b.Get
-          let newModel' = newModel |> b.Get
-          if b.Equals currentModel' newModel' then
+                    w.Dispatcher.InvokeAsync(w.Close) |> ignore
+
+                b.WinRef.SetTarget null
+
+            let hide () =
+                match b.WinRef.TryGetTarget() with
+                | false, _ ->
+                    log.LogError(
+                        "[{BindingNameChain}] Attempted to hide window, but did not find window reference",
+                        winPropChain
+                    )
+                | true, w ->
+                    log.LogTrace("[{BindingNameChain}] Hiding window", winPropChain)
+                    w.Dispatcher.Invoke(fun () -> w.Visibility <- Visibility.Hidden)
+
+            let showHidden () =
+                match b.WinRef.TryGetTarget() with
+                | false, _ ->
+                    log.LogError(
+                        "[{BindingNameChain}] Attempted to show existing hidden window, but did not find window reference",
+                        winPropChain
+                    )
+                | true, w ->
+                    log.LogTrace("[{BindingNameChain}] Showing existing hidden window", winPropChain)
+                    w.Dispatcher.Invoke(fun () -> w.Visibility <- Visibility.Visible)
+
+            let showNew vm =
+                b.PreventClose.Value <- true
+                Helpers2.showNewWindow b.WinRef d.GetWindow d.IsModal d.OnCloseRequested b.PreventClose vm
+
+            let newVm model =
+                let toMsg = fun msg -> d.ToMsg (b.GetCurrentModel()) msg
+                let chain = LoggingViewModelArgs.getNameChainFor nameChain name
+                let args = ViewModelArgs.create model (toMsg >> b.Dispatch) chain loggingArgs
+                d.CreateViewModel args
+
+            match b.GetVmWinState(), d.GetState newModel with
+            | WindowState.Closed, WindowState.Closed -> []
+            | WindowState.Hidden vm, WindowState.Hidden m
+            | WindowState.Visible vm, WindowState.Visible m ->
+                d.UpdateViewModel(vm, m)
+                []
+            | WindowState.Hidden _, WindowState.Closed
+            | WindowState.Visible _, WindowState.Closed ->
+                close ()
+                b.SetVmWinState WindowState.Closed
+                [ PropertyChanged name ]
+            | WindowState.Visible vm, WindowState.Hidden m ->
+                hide ()
+                d.UpdateViewModel(vm, m)
+                b.SetVmWinState(WindowState.Hidden vm)
+                []
+            | WindowState.Hidden vm, WindowState.Visible m ->
+                d.UpdateViewModel(vm, m)
+                showHidden ()
+                b.SetVmWinState(WindowState.Visible vm)
+                []
+            | WindowState.Closed, WindowState.Hidden m ->
+                let vm = newVm m
+                log.LogTrace("[{BindingNameChain}] Creating hidden window", winPropChain)
+                showNew vm Visibility.Hidden b.GetCurrentModel b.Dispatch
+                b.SetVmWinState(WindowState.Hidden vm)
+                [ PropertyChanged name ]
+            | WindowState.Closed, WindowState.Visible m ->
+                let vm = newVm m
+                log.LogTrace("[{BindingNameChain}] Creating visible window", winPropChain)
+                showNew vm Visibility.Visible b.GetCurrentModel b.Dispatch
+                b.SetVmWinState(WindowState.Visible vm)
+                [ PropertyChanged name ]
+        | SubModelSeqUnkeyed b ->
+            let d = b.SubModelSeqUnkeyedData
+
+            let create m idx =
+                let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (idx |> string)
+
+                let args =
+                    ViewModelArgs.create
+                        m
+                        (fun msg -> d.ToMsg (b.GetCurrentModel()) (idx, msg) |> b.Dispatch)
+                        chain
+                        loggingArgs
+
+                d.CreateViewModel args
+
+            let update vm m = d.UpdateViewModel(vm, m)
+            Merge.unkeyed create update b.Vms (d.GetModels newModel)
             []
-          else
-            this.Recursive(currentModel', newModel', b.Binding)
-      | AlterMsgStream b ->
-          this.Recursive(currentModel |> b.Get, b.Get newModel, b.Binding)
+        | SubModelSeqKeyed b ->
+            let d = b.SubModelSeqKeyedData
+
+            let create m id =
+                let chain = LoggingViewModelArgs.getNameChainForItem nameChain name (id |> string)
+
+                let args =
+                    ViewModelArgs.create
+                        m
+                        (fun msg -> d.ToMsg (b.GetCurrentModel()) (id, msg) |> b.Dispatch)
+                        chain
+                        loggingArgs
+
+                d.CreateViewModel args
+
+            let update vm m = d.UpdateViewModel(vm, m)
+            let newSubModels = newModel |> d.GetSubModels |> Seq.toArray
+
+            try
+                d.MergeKeyed(create, update, b.Vms, newSubModels)
+            with :? DuplicateIdException as e ->
+                let messageTemplate =
+                    "[{BindingNameChain}] In the {SourceOrTarget} sequence of the binding {BindingName}, the elements at indices {Index1} and {Index2} have the same ID {ID}. To avoid this problem, the elements will be merged without using IDs."
+
+                log.LogError(messageTemplate, nameChain, e.SourceOrTarget, name, e.Index1, e.Index2, e.Id)
+                let create m _ = create m (d.BmToId m)
+                Merge.unkeyed create update b.Vms newSubModels
+
+            []
+
+    member this.Recursive<'model, 'msg>
+        (currentModel: 'model, newModel: 'model, binding: VmBinding<'model, 'msg, 't>)
+        : UpdateData list =
+        match binding with
+        | BaseVmBinding b -> this.Base(newModel, b)
+        | Cached b ->
+            let updates = this.Recursive(currentModel, newModel, b.Binding)
+
+            updates
+            |> List.filter UpdateData.isPropertyChanged
+            |> List.iter (fun _ -> b.SetCache None)
+
+            updates
+        | Validatation b ->
+            let updates = this.Recursive(currentModel, newModel, b.Binding)
+            let newErrors = b.Validate newModel
+
+            if b.Errors.Value <> newErrors then
+                b.Errors.Value <- newErrors
+                ErrorsChanged name :: updates
+            else
+                updates
+        | Lazy b ->
+            let currentModel' = currentModel |> b.Get
+            let newModel' = newModel |> b.Get
+
+            if b.Equals currentModel' newModel' then
+                []
+            else
+                this.Recursive(currentModel', newModel', b.Binding)
+        | AlterMsgStream b -> this.Recursive(currentModel |> b.Get, b.Get newModel, b.Binding)
 
 
 type Get<'t>(nameChain: string) =
 
-  member _.Base (model: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
-    match binding with
-    | OneWay { OneWayData = d } -> d.Get model |> Ok
-    | TwoWay b -> b.Get model |> Ok
-    | OneWayToSource _ -> GetError.OneWayToSource |> Error
-    | OneWaySeq { Values = vals } -> vals.GetCollection () |> Ok
-    | Cmd cmd -> cmd |> unbox |> Ok
-    | SubModel { GetVm = getvm } -> getvm() |> ValueOption.toNull |> Result.mapError GetError.ToNullError
-    | SubModelWin { GetVmWinState = getvm } ->
-        getvm()
-        |> WindowState.toVOption
-        |> ValueOption.toNull
-        |> Result.mapError GetError.ToNullError
-    | SubModelSeqUnkeyed { Vms = vms }
-    | SubModelSeqKeyed { Vms = vms } -> vms.GetCollection () |> Ok
-    | SubModelSelectedItem b ->
-        b.TypedGet model
-        |> function
-          | ValueNone -> ValueNone |> Ok // deselecting successful
-          | ValueSome (id, mVm) ->
-              match mVm with
-              | Some vm -> vm |> ValueSome |> Ok // selecting successful
-              | None -> // selecting failed
-                  { NameChain = nameChain
-                    SubModelSeqBindingName = b.SubModelSeqBindingName
-                    Id = id.ToString() }
-                  |> GetError.SubModelSelectedItem
-                  |> Error
-        |> Result.bind (ValueOption.toNull >> Result.mapError GetError.ToNullError)
-
-  member this.Recursive<'model, 'msg>
-      (model: 'model,
-       binding: VmBinding<'model, 'msg, 't>)
-      : Result<'t, GetError> =
-    match binding with
-    | BaseVmBinding b -> this.Base(model, b)
-    | Cached b ->
-        match b.GetCache() with
-        | Some v -> v |> Ok
-        | None ->
-            let x = this.Recursive(model, b.Binding)
-            x |> Result.iter (fun v -> b.SetCache (Some v))
-            x
-    | Validatation b -> this.Recursive(model, b.Binding)
-    | Lazy b -> this.Recursive(b.Get model, b.Binding)
-    | AlterMsgStream b -> this.Recursive(b.Get model, b.Binding)
+    member _.Base(model: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
+        match binding with
+        | OneWay { OneWayData = d } -> d.Get model |> Ok
+        | TwoWay b -> b.Get model |> Ok
+        | OneWayToSource _ -> GetError.OneWayToSource |> Error
+        | OneWaySeq { Values = vals } -> vals.GetCollection() |> Ok
+        | Cmd cmd -> cmd |> unbox |> Ok
+        | SubModel { GetVm = getvm } -> getvm () |> ValueOption.toNull |> Result.mapError GetError.ToNullError
+        | SubModelWin { GetVmWinState = getvm } ->
+            getvm ()
+            |> WindowState.toVOption
+            |> ValueOption.toNull
+            |> Result.mapError GetError.ToNullError
+        | SubModelSeqUnkeyed { Vms = vms }
+        | SubModelSeqKeyed { Vms = vms } -> vms.GetCollection() |> Ok
+        | SubModelSelectedItem b ->
+            b.TypedGet model
+            |> function
+                | ValueNone -> ValueNone |> Ok // deselecting successful
+                | ValueSome(id, mVm) ->
+                    match mVm with
+                    | Some vm -> vm |> ValueSome |> Ok // selecting successful
+                    | None -> // selecting failed
+                        { NameChain = nameChain
+                          SubModelSeqBindingName = b.SubModelSeqBindingName
+                          Id = id.ToString() }
+                        |> GetError.SubModelSelectedItem
+                        |> Error
+            |> Result.bind (ValueOption.toNull >> Result.mapError GetError.ToNullError)
+
+    member this.Recursive<'model, 'msg>(model: 'model, binding: VmBinding<'model, 'msg, 't>) : Result<'t, GetError> =
+        match binding with
+        | BaseVmBinding b -> this.Base(model, b)
+        | Cached b ->
+            match b.GetCache() with
+            | Some v -> v |> Ok
+            | None ->
+                let x = this.Recursive(model, b.Binding)
+                x |> Result.iter (fun v -> b.SetCache(Some v))
+                x
+        | Validatation b -> this.Recursive(model, b.Binding)
+        | Lazy b -> this.Recursive(b.Get model, b.Binding)
+        | AlterMsgStream b -> this.Recursive(b.Get model, b.Binding)
 
 
 type Set<'t>(value: 't) =
 
-  member _.Base(model: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
-    match binding with
-    | TwoWay b ->
-        b.Set value model
-        true
-    | OneWayToSource b ->
-        b.Set value model
-        true
-    | SubModelSelectedItem b ->
-        b.TypedSet(model, ValueOption.ofNull value)
-        true
-    | OneWay _
-    | OneWaySeq _
-    | Cmd _
-    | SubModel _
-    | SubModelWin _
-    | SubModelSeqUnkeyed _
-    | SubModelSeqKeyed _ ->
-        false
-
-  member this.Recursive<'model, 'msg>(model: 'model, binding: VmBinding<'model, 'msg, 't>) : bool =
-    match binding with
-    | BaseVmBinding b -> this.Base(model, b)
-    | Cached b ->
-        // UpdateModel changes the model,
-        // but Set only dispatches a message,
-        // so don't clear the cache here
-        this.Recursive<'model, 'msg>(model, b.Binding)
-    | Validatation b -> this.Recursive<'model, 'msg>(model, b.Binding)
-    | Lazy b -> this.Recursive<obj, obj>(b.Get model, b.Binding)
-    | AlterMsgStream b -> this.Recursive<obj, obj>(b.Get model, b.Binding)
+    member _.Base(model: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
+        match binding with
+        | TwoWay b ->
+            b.Set value model
+            true
+        | OneWayToSource b ->
+            b.Set value model
+            true
+        | SubModelSelectedItem b ->
+            b.TypedSet(model, ValueOption.ofNull value)
+            true
+        | OneWay _
+        | OneWaySeq _
+        | Cmd _
+        | SubModel _
+        | SubModelWin _
+        | SubModelSeqUnkeyed _
+        | SubModelSeqKeyed _ -> false
+
+    member this.Recursive<'model, 'msg>(model: 'model, binding: VmBinding<'model, 'msg, 't>) : bool =
+        match binding with
+        | BaseVmBinding b -> this.Base(model, b)
+        | Cached b ->
+            // UpdateModel changes the model,
+            // but Set only dispatches a message,
+            // so don't clear the cache here
+            this.Recursive<'model, 'msg>(model, b.Binding)
+        | Validatation b -> this.Recursive<'model, 'msg>(model, b.Binding)
+        | Lazy b -> this.Recursive<obj, obj>(b.Get model, b.Binding)
+        | AlterMsgStream b -> this.Recursive<obj, obj>(b.Get model, b.Binding)
\ No newline at end of file
diff --git a/src/Elmish.WPF/Command.fs b/src/Elmish.WPF/Command.fs
index c4fe663a..301d9b7f 100644
--- a/src/Elmish.WPF/Command.fs
+++ b/src/Elmish.WPF/Command.fs
@@ -10,22 +10,25 @@ open System.Windows.Input
 /// another UI control (e.g. a ListView.SelectedItem).
 type internal Command(execute, canExecute) =
 
-  let canExecuteChanged = Event<EventHandler, EventArgs>()
-
-  // CommandManager only keeps a weak reference to the event handler,
-  // so a strong reference must be maintained,
-  // which is achieved by this mutable let-binding.
-  // Can test this via the UiBoundCmdParam sample.
-  let mutable _handler = Unchecked.defaultof<EventHandler>
-  member this.AddRequeryHandler () =
-    let handler = EventHandler(fun _ _ -> this.RaiseCanExecuteChanged())
-    CommandManager.RequerySuggested.AddHandler handler
-    _handler <- handler
-
-  member this.RaiseCanExecuteChanged () = canExecuteChanged.Trigger(this, EventArgs.Empty)
-
-  interface ICommand with
-    [<CLIEvent>]
-    member _.CanExecuteChanged = canExecuteChanged.Publish
-    member _.CanExecute p = canExecute p
-    member _.Execute p = execute p
\ No newline at end of file
+    let canExecuteChanged = Event<EventHandler, EventArgs>()
+
+    // CommandManager only keeps a weak reference to the event handler,
+    // so a strong reference must be maintained,
+    // which is achieved by this mutable let-binding.
+    // Can test this via the UiBoundCmdParam sample.
+    let mutable _handler = Unchecked.defaultof<EventHandler>
+
+    member this.AddRequeryHandler() =
+        let handler = EventHandler(fun _ _ -> this.RaiseCanExecuteChanged())
+        CommandManager.RequerySuggested.AddHandler handler
+        _handler <- handler
+
+    member this.RaiseCanExecuteChanged() =
+        canExecuteChanged.Trigger(this, EventArgs.Empty)
+
+    interface ICommand with
+        [<CLIEvent>]
+        member _.CanExecuteChanged = canExecuteChanged.Publish
+
+        member _.CanExecute p = canExecute p
+        member _.Execute p = execute p
\ No newline at end of file
diff --git a/src/Elmish.WPF/InternalUtils.fs b/src/Elmish.WPF/InternalUtils.fs
index 959b6d02..ebc4c5dd 100644
--- a/src/Elmish.WPF/InternalUtils.fs
+++ b/src/Elmish.WPF/InternalUtils.fs
@@ -11,18 +11,14 @@ let ignore2 _ _ = ()
 
 /// Deconstructs a KeyValuePair into a tuple.
 [<DebuggerStepThrough>]
-let (|Kvp|) (kvp: KeyValuePair<_,_>) =
-  Kvp (kvp.Key, kvp.Value)
+let (|Kvp|) (kvp: KeyValuePair<_, _>) = Kvp(kvp.Key, kvp.Value)
 
 
 [<Struct>]
 type OptionalBuilder =
-  member _.Bind(ma, f) =
-    ma |> Option.bind f
-  member _.Return(a) =
-    Some a
-  member _.ReturnFrom(ma) =
-    ma
+    member _.Bind(ma, f) = ma |> Option.bind f
+    member _.Return(a) = Some a
+    member _.ReturnFrom(ma) = ma
 
 let option = OptionalBuilder()
 
@@ -30,128 +26,132 @@ let option = OptionalBuilder()
 [<RequireQualifiedAccess>]
 module Kvp =
 
-  let key (kvp: KeyValuePair<_,_>) =
-    kvp.Key
+    let key (kvp: KeyValuePair<_, _>) = kvp.Key
 
-  let value (kvp: KeyValuePair<_,_>) =
-    kvp.Value
+    let value (kvp: KeyValuePair<_, _>) = kvp.Value
 
 
 [<RequireQualifiedAccess>]
 module Result =
 
-  let isOk = function
-    | Ok _ -> true
-    | Error _ -> false
+    let isOk =
+        function
+        | Ok _ -> true
+        | Error _ -> false
 
-  let iter f = function
-    | Ok x -> f x
-    | Error _ -> ()
+    let iter f =
+        function
+        | Ok x -> f x
+        | Error _ -> ()
 
 
 [<RequireQualifiedAccess>]
 module ValueOption =
 
-  let ofOption = function
-    | Some x -> ValueSome x
-    | None -> ValueNone
+    let ofOption =
+        function
+        | Some x -> ValueSome x
+        | None -> ValueNone
 
-  let toOption = function
-    | ValueSome x -> Some x
-    | ValueNone -> None
+    let toOption =
+        function
+        | ValueSome x -> Some x
+        | ValueNone -> None
 
-  let ofError = function
-    | Ok _ -> ValueNone
-    | Error x -> ValueSome x
+    let ofError =
+        function
+        | Ok _ -> ValueNone
+        | Error x -> ValueSome x
 
-  let ofOk = function
-    | Ok x -> ValueSome x
-    | Error _ -> ValueNone
+    let ofOk =
+        function
+        | Ok x -> ValueSome x
+        | Error _ -> ValueNone
 
-  [<RequireQualifiedAccess>]
-  type ToNullError =
-    | ValueCannotBeNull of string
+    [<RequireQualifiedAccess>]
+    type ToNullError = ValueCannotBeNull of string
 
-  let ofNull<'a> (x: 'a) =
-    match box x with
-    | null -> ValueNone
-    | _ -> ValueSome x
+    let ofNull<'a> (x: 'a) =
+        match box x with
+        | null -> ValueNone
+        | _ -> ValueSome x
 
-  let toNull<'a> = function
-    | ValueSome x -> Ok x
-    | ValueNone ->
-      let default' = Unchecked.defaultof<'a>
-      if box default' = null then
-        default' |> Ok
-      else
-        typeof<'a>.Name |> ToNullError.ValueCannotBeNull |> Error
+    let toNull<'a> =
+        function
+        | ValueSome x -> Ok x
+        | ValueNone ->
+            let default' = Unchecked.defaultof<'a>
+
+            if box default' = null then
+                default' |> Ok
+            else
+                typeof<'a>.Name |> ToNullError.ValueCannotBeNull |> Error
 
 
 [<RequireQualifiedAccess>]
 module ByRefPair =
 
-  let toOption (b, a) =
-    if b then Some a else None
+    let toOption (b, a) = if b then Some a else None
 
 
 [<RequireQualifiedAccess>]
 module Dictionary =
 
-  let tryFind key (d: Dictionary<_, _>) =
-    key |> d.TryGetValue |> ByRefPair.toOption
+    let tryFind key (d: Dictionary<_, _>) =
+        key |> d.TryGetValue |> ByRefPair.toOption
 
 
 [<RequireQualifiedAccess>]
 module IReadOnlyDictionary =
 
-  let tryFind key (d: IReadOnlyDictionary<_, _>) =
-    key |> d.TryGetValue |> ByRefPair.toOption
+    let tryFind key (d: IReadOnlyDictionary<_, _>) =
+        key |> d.TryGetValue |> ByRefPair.toOption
 
 
 [<RequireQualifiedAccess>]
 module Option =
 
-  let fromBool a b =
-    if b then Some a else None
+    let fromBool a b = if b then Some a else None
 
 
 [<RequireQualifiedAccess>]
 module SeqOption =
 
-  let somes mma = mma |> Seq.choose id
+    let somes mma = mma |> Seq.choose id
 
 
 [<RequireQualifiedAccess>]
 module Pair =
 
-  let ofKvp (kvp: KeyValuePair<_,_>) = (kvp.Key, kvp.Value)
+    let ofKvp (kvp: KeyValuePair<_, _>) = (kvp.Key, kvp.Value)
 
-  let mapAll f g (a, c) = (f a, g c)
+    let mapAll f g (a, c) = (f a, g c)
 
-  let map2 f (a, c) = (a, f c)
+    let map2 f (a, c) = (a, f c)
 
 
 [<RequireQualifiedAccess>]
 module PairOption =
 
-  let sequence = function
-    | Some a, Some b -> Some (a, b)
-    | _ -> None
+    let sequence =
+        function
+        | Some a, Some b -> Some(a, b)
+        | _ -> None
 
 
 [<RequireQualifiedAccess>]
 module Func2 =
 
-  let id1<'a, 'b> (a: 'a) (_: 'b) = a
-  let id2<'a, 'b> (_: 'a) (b: 'b) = b
-  let curry f a b = f (a, b)
+    let id1<'a, 'b> (a: 'a) (_: 'b) = a
+    let id2<'a, 'b> (_: 'a) (b: 'b) = b
+    let curry f a b = f (a, b)
 
 
 [<RequireQualifiedAccess>]
 module Func3 =
-  let curry f a b c = f (a, b, c)
+    let curry f a b c = f (a, b, c)
 
 
 [<RequireQualifiedAccess>]
 module Func5 =
-  let curry f a b c d e = f (a, b, c, d, e)
+    let curry f a b c d e = f (a, b, c, d, e)
\ No newline at end of file
diff --git a/src/Elmish.WPF/Merge.fs b/src/Elmish.WPF/Merge.fs
index 264a810c..64321877 100644
--- a/src/Elmish.WPF/Merge.fs
+++ b/src/Elmish.WPF/Merge.fs
@@ -6,257 +6,283 @@ open System.Collections.ObjectModel
 
 
 type SourceOrTarget =
-  | Source
-  | Target
-
-type DuplicateIdException (sourceOrTarget: SourceOrTarget, index1: int, index2: int, id: string) =
-  inherit System.Exception(sprintf "In the %A sequence, the elements at indices %d and %d have the same ID %s" sourceOrTarget index1 index2 id)
-  member this.SourceOrTarget = sourceOrTarget
-  member this.Index1 = index1
-  member this.Index2 = index2
-  member this.Id = id
+    | Source
+    | Target
+
+type DuplicateIdException(sourceOrTarget: SourceOrTarget, index1: int, index2: int, id: string) =
+    inherit
+        System.Exception(
+            sprintf
+                "In the %A sequence, the elements at indices %d and %d have the same ID %s"
+                sourceOrTarget
+                index1
+                index2
+                id
+        )
+
+    member this.SourceOrTarget = sourceOrTarget
+    member this.Index1 = index1
+    member this.Index2 = index2
+    member this.Id = id
 
 type CollectionTarget<'a, 'aCollection> =
-  { GetLength: unit -> int
-    GetAt: int -> 'a
-    Append: 'a -> unit
-    InsertAt: int * 'a -> unit
-    SetAt: int * 'a -> unit
-    RemoveAt: int -> unit
-    Move: int * int -> unit
-    Clear: unit -> unit
-    Enumerate: unit -> 'a seq
-    GetCollection: unit -> 'aCollection }
+    { GetLength: unit -> int
+      GetAt: int -> 'a
+      Append: 'a -> unit
+      InsertAt: int * 'a -> unit
+      SetAt: int * 'a -> unit
+      RemoveAt: int -> unit
+      Move: int * int -> unit
+      Clear: unit -> unit
+      Enumerate: unit -> 'a seq
+      GetCollection: unit -> 'aCollection }
 
 module CollectionTarget =
 
-  let create (oc: ObservableCollection<'a>) =
-    { GetLength = fun () -> oc.Count
-      GetAt = fun i -> oc.[i]
-      Append = oc.Add
-      InsertAt = oc.Insert
-      SetAt = fun (i, a) -> oc.[i] <- a
-      RemoveAt = oc.RemoveAt
-      Move = oc.Move
-      Clear = oc.Clear
-      Enumerate = fun () -> upcast oc
-      GetCollection = fun () -> oc }
-
-  let mapA (fOut: 'a0 -> 'a1) (fIn: 'a1 -> 'a0) (ct: CollectionTarget<'a0, 'aCollection>) : CollectionTarget<'a1, 'aCollection> =
-    { GetLength = ct.GetLength
-      GetAt = ct.GetAt >> fOut
-      Append = fIn >> ct.Append
-      InsertAt = Pair.map2 fIn >> ct.InsertAt
-      SetAt = Pair.map2 fIn >> ct.SetAt
-      RemoveAt = ct.RemoveAt
-      Move = ct.Move
-      Clear = ct.Clear
-      Enumerate = ct.Enumerate >> Seq.map fOut
-      GetCollection = ct.GetCollection }
-
-  let mapCollection (fOut: 'aCollection0 -> 'aCollection1) (ct: CollectionTarget<'a, 'aCollection0>) : CollectionTarget<'a, 'aCollection1> =
-    { GetLength = ct.GetLength
-      GetAt = ct.GetAt
-      Append = ct.Append
-      InsertAt = ct.InsertAt
-      SetAt = ct.SetAt
-      RemoveAt = ct.RemoveAt
-      Move = ct.Move
-      Clear = ct.Clear
-      Enumerate = ct.Enumerate
-      GetCollection = ct.GetCollection >> fOut }
+    let create (oc: ObservableCollection<'a>) =
+        { GetLength = fun () -> oc.Count
+          GetAt = fun i -> oc.[i]
+          Append = oc.Add
+          InsertAt = oc.Insert
+          SetAt = fun (i, a) -> oc.[i] <- a
+          RemoveAt = oc.RemoveAt
+          Move = oc.Move
+          Clear = oc.Clear
+          Enumerate = fun () -> upcast oc
+          GetCollection = fun () -> oc }
+
+    let mapA
+        (fOut: 'a0 -> 'a1)
+        (fIn: 'a1 -> 'a0)
+        (ct: CollectionTarget<'a0, 'aCollection>)
+        : CollectionTarget<'a1, 'aCollection> =
+        { GetLength = ct.GetLength
+          GetAt = ct.GetAt >> fOut
+          Append = fIn >> ct.Append
+          InsertAt = Pair.map2 fIn >> ct.InsertAt
+          SetAt = Pair.map2 fIn >> ct.SetAt
+          RemoveAt = ct.RemoveAt
+          Move = ct.Move
+          Clear = ct.Clear
+          Enumerate = ct.Enumerate >> Seq.map fOut
+          GetCollection = ct.GetCollection }
+
+    let mapCollection
+        (fOut: 'aCollection0 -> 'aCollection1)
+        (ct: CollectionTarget<'a, 'aCollection0>)
+        : CollectionTarget<'a, 'aCollection1> =
+        { GetLength = ct.GetLength
+          GetAt = ct.GetAt
+          Append = ct.Append
+          InsertAt = ct.InsertAt
+          SetAt = ct.SetAt
+          RemoveAt = ct.RemoveAt
+          Move = ct.Move
+          Clear = ct.Clear
+          Enumerate = ct.Enumerate
+          GetCollection = ct.GetCollection >> fOut }
 
 
 
 module Merge =
 
-  let unkeyed
-      (create: 's -> int -> 't)
-      (update: 't -> 's -> unit)
-      (target: CollectionTarget<'t, 'tCollection>)
-      (source: 's seq) =
-    let mutable lastIdx = -1
-    for (idx, s) in source |> Seq.indexed do
-      lastIdx <- idx
-      if idx < target.GetLength() then
-        update (target.GetAt idx) s
-      else // source is longer than target
-        create s idx |> target.Append
-    let mutable idx = target.GetLength() - 1
-    while idx > lastIdx do // target is longer than source
-      target.RemoveAt idx
-      idx <- idx - 1
-
-
-  let keyed
-      (getSourceId: 's -> 'id)
-      (getTargetId: 't -> 'id)
-      (create: 's -> 'id -> 't)
-      (update: 't -> 's -> int -> unit)
-      (target: CollectionTarget<'t, 'tCollection>)
-      (source: 's array) =
-    (*
+    let unkeyed
+        (create: 's -> int -> 't)
+        (update: 't -> 's -> unit)
+        (target: CollectionTarget<'t, 'tCollection>)
+        (source: 's seq)
+        =
+        let mutable lastIdx = -1
+
+        for (idx, s) in source |> Seq.indexed do
+            lastIdx <- idx
+
+            if idx < target.GetLength() then
+                update (target.GetAt idx) s
+            else // source is longer than target
+                create s idx |> target.Append
+
+        let mutable idx = target.GetLength() - 1
+
+        while idx > lastIdx do // target is longer than source
+            target.RemoveAt idx
+            idx <- idx - 1
+
+
+    let keyed
+        (getSourceId: 's -> 'id)
+        (getTargetId: 't -> 'id)
+        (create: 's -> 'id -> 't)
+        (update: 't -> 's -> int -> unit)
+        (target: CollectionTarget<'t, 'tCollection>)
+        (source: 's array)
+        =
+        (*
      * Based on Elm's HTML.keyed
      * https://guide.elm-lang.org/optimization/keyed.html
      * https://github.com/elm/virtual-dom/blob/5a5bcf48720bc7d53461b3cd42a9f19f119c5503/src/Elm/Kernel/VirtualDom.js#L980-L1226
      *)
-    let removals = Dictionary<_, _> ()
-    let additions = Dictionary<_, _> ()
-
-    let recordRemoval curTargetIdx curTarget curTargetId =
-      if removals.ContainsKey curTargetId then
-        let (firstIdx, _) = removals.[curTargetId]
-        raise (DuplicateIdException (Target, firstIdx, curTargetIdx, curTargetId.ToString()))
-      else
-        removals.Add(curTargetId, (curTargetIdx, curTarget))
-    let recordAddition curSourceIdx curSource curSourceId =
-      if additions.ContainsKey curSourceId then
-        let (firstIdx, _) = additions.[curSourceId]
-        raise (DuplicateIdException (Source, firstIdx, curSourceIdx, curSourceId.ToString()))
-      else
-        additions.Add(curSourceId, (curSourceIdx, curSource))
-
-    let mutable curSourceIdx = 0
-    let mutable curTargetIdx = 0
-
-    let mutable shouldContinue = true
-
-    let sourceCount = source.Length
-    let targetCount = target.GetLength()
-
-    while (shouldContinue && curSourceIdx < sourceCount && curTargetIdx < targetCount) do
-      let curSource = source.[curSourceIdx]
-      let curTarget = target.GetAt curTargetIdx
-
-      let curSourceId = getSourceId curSource
-      let curTargetId = getTargetId curTarget
-
-      if curSourceId = curTargetId then
-        update curTarget curSource curTargetIdx
-
-        curSourceIdx <- curSourceIdx + 1
-        curTargetIdx <- curTargetIdx + 1
-      else
-        let mNextSource =
-          source
-          |> Array.tryItem (curSourceIdx + 1)
-          |> Option.map (fun s ->
-            let id = getSourceId s
-            s, id, id = curTargetId) // true => need to add
-
-        let mNextTarget =
-          if curTargetIdx + 1 < targetCount then target.GetAt (curTargetIdx + 1) |> Some else None
-          |> Option.map (fun t ->
-            let id = getTargetId t
-            t, id, id = curSourceId) // true => need to remove
+        let removals = Dictionary<_, _>()
+        let additions = Dictionary<_, _>()
+
+        let recordRemoval curTargetIdx curTarget curTargetId =
+            if removals.ContainsKey curTargetId then
+                let (firstIdx, _) = removals.[curTargetId]
+                raise (DuplicateIdException(Target, firstIdx, curTargetIdx, curTargetId.ToString()))
+            else
+                removals.Add(curTargetId, (curTargetIdx, curTarget))
+
+        let recordAddition curSourceIdx curSource curSourceId =
+            if additions.ContainsKey curSourceId then
+                let (firstIdx, _) = additions.[curSourceId]
+                raise (DuplicateIdException(Source, firstIdx, curSourceIdx, curSourceId.ToString()))
+            else
+                additions.Add(curSourceId, (curSourceIdx, curSource))
+
+        let mutable curSourceIdx = 0
+        let mutable curTargetIdx = 0
+
+        let mutable shouldContinue = true
+
+        let sourceCount = source.Length
+        let targetCount = target.GetLength()
+
+        while (shouldContinue && curSourceIdx < sourceCount && curTargetIdx < targetCount) do
+            let curSource = source.[curSourceIdx]
+            let curTarget = target.GetAt curTargetIdx
+
+            let curSourceId = getSourceId curSource
+            let curTargetId = getTargetId curTarget
+
+            if curSourceId = curTargetId then
+                update curTarget curSource curTargetIdx
+
+                curSourceIdx <- curSourceIdx + 1
+                curTargetIdx <- curTargetIdx + 1
+            else
+                let mNextSource =
+                    source
+                    |> Array.tryItem (curSourceIdx + 1)
+                    |> Option.map (fun s ->
+                        let id = getSourceId s
+                        s, id, id = curTargetId) // true => need to add
+
+                let mNextTarget =
+                    if curTargetIdx + 1 < targetCount then
+                        target.GetAt(curTargetIdx + 1) |> Some
+                    else
+                        None
+                    |> Option.map (fun t ->
+                        let id = getTargetId t
+                        t, id, id = curSourceId) // true => need to remove
+
+                match mNextSource, mNextTarget with
+                | Some(nextSource, _, true), Some(nextTarget, _, true) -> // swap adjacent
+                    target.SetAt(curTargetIdx, nextTarget)
+                    target.SetAt(curTargetIdx + 1, curTarget)
+
+                    update curTarget nextSource (curTargetIdx + 1)
+                    update nextTarget curSource curTargetIdx
+
+                    curSourceIdx <- curSourceIdx + 2
+                    curTargetIdx <- curTargetIdx + 2
+                | None, Some(nextTarget, _, true)
+                | Some(_, _, false), Some(nextTarget, _, true) -> // remove
+                    recordRemoval curTargetIdx curTarget curTargetId
+
+                    update nextTarget curSource curTargetIdx
+
+                    curSourceIdx <- curSourceIdx + 1
+                    curTargetIdx <- curTargetIdx + 2
+                | Some(nextSource, _, true), None
+                | Some(nextSource, _, true), Some(_, _, false) -> // add
+                    recordAddition curSourceIdx curSource curSourceId
+
+                    update curTarget nextSource (curTargetIdx + 1)
+
+                    curSourceIdx <- curSourceIdx + 2
+                    curTargetIdx <- curTargetIdx + 1
+                | Some(_, _, false), None
+                | None, Some(_, _, false)
+                | None, None -> // source and target have different lengths and we have reached the end of one
+                    shouldContinue <- false
+                | Some(nextSource, nextSourceId, false), Some(nextTarget, nextTargetId, false) ->
+                    if nextSourceId = nextTargetId then // replace
+                        recordRemoval curTargetIdx curTarget curTargetId
+                        recordAddition curSourceIdx curSource curSourceId
+
+                        update nextTarget nextSource (curTargetIdx + 1)
+
+                        curSourceIdx <- curSourceIdx + 2
+                        curTargetIdx <- curTargetIdx + 2
+                    else // collections very different
+                        shouldContinue <- false
+
+        // replace many
+        while (curSourceIdx < sourceCount && curTargetIdx < targetCount) do
+            let curSource = source.[curSourceIdx]
+            let curTarget = target.GetAt curTargetIdx
+
+            let curSourceId = getSourceId curSource
+            let curTargetId = getTargetId curTarget
 
-        match mNextSource, mNextTarget with
-        | Some (nextSource, _, true), Some (nextTarget, _, true) -> // swap adjacent
-            target.SetAt (curTargetIdx, nextTarget)
-            target.SetAt (curTargetIdx + 1, curTarget)
-
-            update curTarget nextSource (curTargetIdx + 1)
-            update nextTarget curSource curTargetIdx
-
-            curSourceIdx <- curSourceIdx + 2
-            curTargetIdx <- curTargetIdx + 2
-        |               None, Some (nextTarget, _, true)
-        | Some (_, _, false), Some (nextTarget, _, true) -> // remove
             recordRemoval curTargetIdx curTarget curTargetId
-
-            update nextTarget curSource curTargetIdx
+            recordAddition curSourceIdx curSource curSourceId
 
             curSourceIdx <- curSourceIdx + 1
-            curTargetIdx <- curTargetIdx + 2
-        | Some (nextSource, _, true), None
-        | Some (nextSource, _, true), Some (_, _, false) -> // add
-            recordAddition curSourceIdx curSource curSourceId
+            curTargetIdx <- curTargetIdx + 1
 
-            update curTarget nextSource (curTargetIdx + 1)
+        // remove many
+        for i in targetCount - 1 .. -1 .. curTargetIdx do
+            let t = target.GetAt i
+            let id = getTargetId t
+            recordRemoval i t id
 
-            curSourceIdx <- curSourceIdx + 2
-            curTargetIdx <- curTargetIdx + 1
-        | Some (_, _, false),               None
-        |               None, Some (_, _, false)
-        |               None,               None -> // source and target have different lengths and we have reached the end of one
-            shouldContinue <- false
-        | Some (nextSource, nextSourceId, false), Some (nextTarget, nextTargetId, false) ->
-            if nextSourceId = nextTargetId then // replace
-              recordRemoval curTargetIdx curTarget curTargetId
-              recordAddition curSourceIdx curSource curSourceId
-
-              update nextTarget nextSource (curTargetIdx + 1)
-
-              curSourceIdx <- curSourceIdx + 2
-              curTargetIdx <- curTargetIdx + 2
-            else // collections very different
-              shouldContinue <- false
-
-    // replace many
-    while (curSourceIdx < sourceCount && curTargetIdx < targetCount) do
-      let curSource = source.[curSourceIdx]
-      let curTarget = target.GetAt curTargetIdx
-
-      let curSourceId = getSourceId curSource
-      let curTargetId = getTargetId curTarget
-
-      recordRemoval curTargetIdx curTarget curTargetId
-      recordAddition curSourceIdx curSource curSourceId
-
-      curSourceIdx <- curSourceIdx + 1
-      curTargetIdx <- curTargetIdx + 1
-
-    // remove many
-    for i in targetCount - 1..-1..curTargetIdx do
-      let t = target.GetAt i
-      let id = getTargetId t
-      recordRemoval i t id
-
-    // add many
-    for i in curSourceIdx..sourceCount - 1 do
-      let s = source.[i]
-      let id = getSourceId s
-      recordAddition i s id
-
-    let moves =
-      additions
-      |> Seq.toList // make copy of additions so that calling Remove doesn't happen on the same data structure while enumerating
-      |> List.collect (fun (Kvp (id, (sIdx, s))) ->
-        removals
-        |> Dictionary.tryFind id
-        |> Option.map (fun (tIdx, t) ->
-            removals.Remove id |> ignore
-            additions.Remove id |> ignore
-            (tIdx, sIdx, t, s) |> List.singleton)
-        |> Option.defaultValue [])
-
-    let actuallyRemove () =
-      Seq.empty
-      |> Seq.append (removals |> Seq.map (Kvp.value >> fst))
-      |> Seq.append (moves |> Seq.map (fun (tIdx, _, _, _) -> tIdx))
-      |> Seq.sortDescending // remove by index from largest to smallest
-      |> Seq.iter target.RemoveAt
-
-    let actuallyAdd () =
-      Seq.empty
-      |> Seq.append (additions |> Seq.map (fun (Kvp (id, (idx, s))) -> idx, create s id))
-      |> Seq.append (moves |> Seq.map (fun (_, sIdx, t, _) -> sIdx, t))
-      |> Seq.sortBy fst // insert by index from smallest to largest
-      |> Seq.iter target.InsertAt
-
-    match moves, removals.Count, additions.Count with
-    | [ (tIdx, sIdx, _, _) ], 0, 0 -> // single move
-        target.Move(tIdx, sIdx)
-    | [ (t1Idx, s1Idx, _, _); (t2Idx, s2Idx, _, _) ], 0, 0 when t1Idx = s2Idx && t2Idx = s1Idx-> // single swap
-        let temp = target.GetAt t1Idx
-        target.SetAt (t1Idx, target.GetAt t2Idx)
-        target.SetAt (t2Idx, temp)
-    | _, rc, _ when rc = targetCount && rc > 0 -> // remove everything (implies moves = [])
-        target.Clear ()
-        actuallyAdd ()
-    | _ ->
-        actuallyRemove ()
-        actuallyAdd ()
-
-    // update moved elements
-    moves |> Seq.iter (fun (_, sIdx, t, s) -> update t s sIdx)
\ No newline at end of file
+        // add many
+        for i in curSourceIdx .. sourceCount - 1 do
+            let s = source.[i]
+            let id = getSourceId s
+            recordAddition i s id
+
+        let moves =
+            additions
+            |> Seq.toList // make copy of additions so that calling Remove doesn't happen on the same data structure while enumerating
+            |> List.collect (fun (Kvp(id, (sIdx, s))) ->
+                removals
+                |> Dictionary.tryFind id
+                |> Option.map (fun (tIdx, t) ->
+                    removals.Remove id |> ignore
+                    additions.Remove id |> ignore
+                    (tIdx, sIdx, t, s) |> List.singleton)
+                |> Option.defaultValue [])
+
+        let actuallyRemove () =
+            Seq.empty
+            |> Seq.append (removals |> Seq.map (Kvp.value >> fst))
+            |> Seq.append (moves |> Seq.map (fun (tIdx, _, _, _) -> tIdx))
+            |> Seq.sortDescending // remove by index from largest to smallest
+            |> Seq.iter target.RemoveAt
+
+        let actuallyAdd () =
+            Seq.empty
+            |> Seq.append (additions |> Seq.map (fun (Kvp(id, (idx, s))) -> idx, create s id))
+            |> Seq.append (moves |> Seq.map (fun (_, sIdx, t, _) -> sIdx, t))
+            |> Seq.sortBy fst // insert by index from smallest to largest
+            |> Seq.iter target.InsertAt
+
+        match moves, removals.Count, additions.Count with
+        | [ (tIdx, sIdx, _, _) ], 0, 0 -> // single move
+            target.Move(tIdx, sIdx)
+        | [ (t1Idx, s1Idx, _, _); (t2Idx, s2Idx, _, _) ], 0, 0 when t1Idx = s2Idx && t2Idx = s1Idx -> // single swap
+            let temp = target.GetAt t1Idx
+            target.SetAt(t1Idx, target.GetAt t2Idx)
+            target.SetAt(t2Idx, temp)
+        | _, rc, _ when rc = targetCount && rc > 0 -> // remove everything (implies moves = [])
+            target.Clear()
+            actuallyAdd ()
+        | _ ->
+            actuallyRemove ()
+            actuallyAdd ()
+
+        // update moved elements
+        moves |> Seq.iter (fun (_, sIdx, t, s) -> update t s sIdx)
\ No newline at end of file
diff --git a/src/Elmish.WPF/Utils.fs b/src/Elmish.WPF/Utils.fs
index 2f6be341..28450e56 100644
--- a/src/Elmish.WPF/Utils.fs
+++ b/src/Elmish.WPF/Utils.fs
@@ -14,34 +14,36 @@ open System.Reflection
 /// Returns a fast, untyped getter for the property specified by the PropertyInfo.
 /// The getter takes an instance and returns a property value.
 let buildUntypedGetter (propertyInfo: PropertyInfo) : obj -> obj =
-  let method = propertyInfo.GetMethod
-  let objExpr = Expression.Parameter(typeof<obj>, "o")
-  let expr =
-    Expression.Lambda<Func<obj, obj>>(
-      Expression.Convert(
-        Expression.Call(
-          Expression.Convert(objExpr, method.DeclaringType), method),
-          typeof<obj>),
-      objExpr)
-  let action = expr.Compile()
-  fun target -> action.Invoke(target)
+    let method = propertyInfo.GetMethod
+    let objExpr = Expression.Parameter(typeof<obj>, "o")
+
+    let expr =
+        Expression.Lambda<Func<obj, obj>>(
+            Expression.Convert(Expression.Call(Expression.Convert(objExpr, method.DeclaringType), method), typeof<obj>),
+            objExpr
+        )
+
+    let action = expr.Compile()
+    fun target -> action.Invoke(target)
 
 
 type private ElmEq<'a>() =
 
-  static let gettersAndEq =
-    typeof<'a>.GetProperties()
-    |> Array.map (fun pi ->
-        let getter = buildUntypedGetter pi
-        let eq =
-          if pi.PropertyType.IsValueType || pi.PropertyType = typeof<string>
-          then (fun (a, b) -> a = b)
-          else obj.ReferenceEquals
-        getter, eq
-    )
+    static let gettersAndEq =
+        typeof<'a>.GetProperties()
+        |> Array.map (fun pi ->
+            let getter = buildUntypedGetter pi
+
+            let eq =
+                if pi.PropertyType.IsValueType || pi.PropertyType = typeof<string> then
+                    (fun (a, b) -> a = b)
+                else
+                    obj.ReferenceEquals
+
+            getter, eq)
 
-  static member Eq x1 x2 =
-    gettersAndEq |> Array.forall (fun (get, eq) -> eq (get (box x1), get (box x2)))
+    static member Eq x1 x2 =
+        gettersAndEq |> Array.forall (fun (get, eq) -> eq (get (box x1), get (box x2)))
 
 
 /// Memberwise equality where value-typed members and string members are
@@ -52,5 +54,4 @@ type private ElmEq<'a>() =
 /// normally immutable. For a direct reference equality check (not memberwise),
 /// see refEq (which should be used when passing a single non-string reference
 /// type from the model).
-let elmEq<'a> : 'a -> 'a -> bool =
-  ElmEq<'a>.Eq
\ No newline at end of file
+let elmEq<'a> : 'a -> 'a -> bool = ElmEq<'a>.Eq
\ No newline at end of file
diff --git a/src/Elmish.WPF/ViewModelArgs.fs b/src/Elmish.WPF/ViewModelArgs.fs
index 8ddd6f96..8f2de79b 100644
--- a/src/Elmish.WPF/ViewModelArgs.fs
+++ b/src/Elmish.WPF/ViewModelArgs.fs
@@ -5,48 +5,48 @@ open Microsoft.Extensions.Logging.Abstractions
 
 
 type internal LoggingViewModelArgs =
-  { performanceLogThresholdMs: int
-    log: ILogger
-    logPerformance: ILogger
-    nameChain: string }
+    { performanceLogThresholdMs: int
+      log: ILogger
+      logPerformance: ILogger
+      nameChain: string }
 
 module internal LoggingViewModelArgs =
 
-  let getNameChainFor nameChain name =
-    sprintf "%s.%s" nameChain name
+    let getNameChainFor nameChain name = sprintf "%s.%s" nameChain name
 
-  let getNameChainForItem nameChain collectionBindingName itemId =
-    sprintf "%s.%s.%s" nameChain collectionBindingName itemId
+    let getNameChainForItem nameChain collectionBindingName itemId =
+        sprintf "%s.%s.%s" nameChain collectionBindingName itemId
 
-  let map nameChain v = { v with nameChain = nameChain }
+    let map nameChain v = { v with nameChain = nameChain }
 
-  let none =
-    { performanceLogThresholdMs = 1
-      log = NullLogger.Instance
-      logPerformance = NullLogger.Instance
-      nameChain = "" }
+    let none =
+        { performanceLogThresholdMs = 1
+          log = NullLogger.Instance
+          logPerformance = NullLogger.Instance
+          nameChain = "" }
 
 
 type ViewModelArgs<'model, 'msg> =
-  internal
-    { initialModel: 'model
-      dispatch: 'msg -> unit
-      loggingArgs: LoggingViewModelArgs }
+    internal
+        { initialModel: 'model
+          dispatch: 'msg -> unit
+          loggingArgs: LoggingViewModelArgs }
 
 module ViewModelArgs =
-  let internal create initialModel dispatch nameChain loggingArgs =
-    { initialModel = initialModel
-      dispatch = dispatch
-      loggingArgs = LoggingViewModelArgs.map nameChain loggingArgs }
-
-  let map mapModel mapMsg v =
-    { initialModel = v.initialModel |> mapModel
-      dispatch = mapMsg >> v.dispatch
-      loggingArgs = v.loggingArgs }
-
-  let createWithoutLogging initialModel dispatch =
-    { initialModel = initialModel
-      dispatch = dispatch
-      loggingArgs = LoggingViewModelArgs.none }
-  
-  let simple initialModel = createWithoutLogging initialModel ignore
+    let internal create initialModel dispatch nameChain loggingArgs =
+        { initialModel = initialModel
+          dispatch = dispatch
+          loggingArgs = LoggingViewModelArgs.map nameChain loggingArgs }
+
+    let map mapModel mapMsg v =
+        { initialModel = v.initialModel |> mapModel
+          dispatch = mapMsg >> v.dispatch
+          loggingArgs = v.loggingArgs }
+
+    let createWithoutLogging initialModel dispatch =
+        { initialModel = initialModel
+          dispatch = dispatch
+          loggingArgs = LoggingViewModelArgs.none }
+
+    let simple initialModel =
+        createWithoutLogging initialModel ignore
\ No newline at end of file
diff --git a/src/Elmish.WPF/ViewModelModule.fs b/src/Elmish.WPF/ViewModelModule.fs
index 761e6f12..bb63be1b 100644
--- a/src/Elmish.WPF/ViewModelModule.fs
+++ b/src/Elmish.WPF/ViewModelModule.fs
@@ -2,6 +2,6 @@
 
 /// Creates a design-time view model using the given model and bindings.
 let designInstance (model: 'model) (bindings: Binding<'model, 'msg> list) =
-  let args = ViewModelArgs.simple model
+    let args = ViewModelArgs.simple model
 
-  DynamicViewModel(args, bindings) |> box
\ No newline at end of file
+    DynamicViewModel(args, bindings) |> box
\ No newline at end of file
diff --git a/src/Elmish.WPF/ViewModels.fs b/src/Elmish.WPF/ViewModels.fs
index e58c8f8a..9cdd0d29 100644
--- a/src/Elmish.WPF/ViewModels.fs
+++ b/src/Elmish.WPF/ViewModels.fs
@@ -10,9 +10,9 @@ open BindingVmHelpers
 
 /// Represents all necessary data used to create a binding.
 type Binding<'model, 'msg, 't> =
-  internal
-    { Name: string
-      Data: BindingData<'model, 'msg, 't> }
+    internal
+        { Name: string
+          Data: BindingData<'model, 'msg, 't> }
 
 type Binding<'model, 'msg> = Binding<'model, 'msg, obj>
 
@@ -20,317 +20,444 @@ type Binding<'model, 'msg> = Binding<'model, 'msg, obj>
 [<AutoOpen>]
 module internal Helpers =
 
-  let createBinding data name =
-    { Name = name
-      Data = data |> BindingData.boxT }
+    let createBinding data name =
+        { Name = name
+          Data = data |> BindingData.boxT }
 
-  let createBindingT data name =
-    { Name = name
-      Data = data }
+    let createBindingT data name = { Name = name; Data = data }
 
-  type SubModelSelectedItemLast with
-    member this.CompareBindings() : Binding<'model, 'msg> -> Binding<'model, 'msg> -> int =
-      fun a b -> this.Recursive(a.Data) - this.Recursive(b.Data)
+    type SubModelSelectedItemLast with
+        member this.CompareBindings() : Binding<'model, 'msg> -> Binding<'model, 'msg> -> int =
+            fun a b -> this.Recursive(a.Data) - this.Recursive(b.Data)
 
-type [<AllowNullLiteral>] IViewModel<'model, 'msg> =
-  abstract member CurrentModel: 'model
-  abstract member UpdateModel: 'model -> unit
+[<AllowNullLiteral>]
+type IViewModel<'model, 'msg> =
+    abstract member CurrentModel: 'model
+    abstract member UpdateModel: 'model -> unit
 
 module internal IViewModel =
-  let currentModel (vm: #IViewModel<'model, 'msg>) = vm.CurrentModel
-  let updateModel (vm: #IViewModel<'model, 'msg>, m: 'model) = vm.UpdateModel(m)
+    let currentModel (vm: #IViewModel<'model, 'msg>) = vm.CurrentModel
+    let updateModel (vm: #IViewModel<'model, 'msg>, m: 'model) = vm.UpdateModel(m)
 
 type internal ViewModelHelper<'model, 'msg> =
-  { GetSender: unit -> obj
-    LoggingArgs: LoggingViewModelArgs
-    Model: 'model
-    Bindings: Map<string, VmBinding<'model, 'msg, obj>>
-    ValidationErrors: Map<string, string list ref>
-    PropertyChanged: Event<PropertyChangedEventHandler, PropertyChangedEventArgs>
-    ErrorsChanged: DelegateEvent<EventHandler<DataErrorsChangedEventArgs>> }
-
-  interface INotifyPropertyChanged with
-    [<CLIEvent>]
-    member x.PropertyChanged = x.PropertyChanged.Publish
-
-  interface INotifyDataErrorInfo with
-    [<CLIEvent>]
-    member x.ErrorsChanged = x.ErrorsChanged.Publish
-    member x.HasErrors =
-      // WPF calls this too often, so don't log https://github.com/elmish/Elmish.WPF/issues/354
-      x.ValidationErrors
-      |> Seq.map (fun (Kvp(_, errors)) -> errors.Value)
-      |> Seq.filter (not << List.isEmpty)
-      |> (not << Seq.isEmpty)
-    member x.GetErrors name =
-      let name = name |> Option.ofObj |> Option.defaultValue "<null>" // entity-level errors are being requested when given null or ""  https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifydataerrorinfo.geterrors#:~:text=null%20or%20Empty%2C%20to%20retrieve%20entity-level%20errors
-      x.LoggingArgs.log.LogTrace("[{BindingNameChain}] GetErrors {BindingName}", x.LoggingArgs.nameChain, name)
-      x.ValidationErrors
-      |> IReadOnlyDictionary.tryFind name
-      |> Option.map (fun errors -> errors.Value)
-      |> Option.defaultValue []
-      |> (fun x -> upcast x)
+    { GetSender: unit -> obj
+      LoggingArgs: LoggingViewModelArgs
+      Model: 'model
+      Bindings: Map<string, VmBinding<'model, 'msg, obj>>
+      ValidationErrors: Map<string, string list ref>
+      PropertyChanged: Event<PropertyChangedEventHandler, PropertyChangedEventArgs>
+      ErrorsChanged: DelegateEvent<EventHandler<DataErrorsChangedEventArgs>> }
+
+    interface INotifyPropertyChanged with
+        [<CLIEvent>]
+        member x.PropertyChanged = x.PropertyChanged.Publish
+
+    interface INotifyDataErrorInfo with
+        [<CLIEvent>]
+        member x.ErrorsChanged = x.ErrorsChanged.Publish
+
+        member x.HasErrors =
+            // WPF calls this too often, so don't log https://github.com/elmish/Elmish.WPF/issues/354
+            x.ValidationErrors
+            |> Seq.map (fun (Kvp(_, errors)) -> errors.Value)
+            |> Seq.filter (not << List.isEmpty)
+            |> (not << Seq.isEmpty)
+
+        member x.GetErrors name =
+            let name = name |> Option.ofObj |> Option.defaultValue "<null>" // entity-level errors are being requested when given null or ""  https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifydataerrorinfo.geterrors#:~:text=null%20or%20Empty%2C%20to%20retrieve%20entity-level%20errors
+            x.LoggingArgs.log.LogTrace("[{BindingNameChain}] GetErrors {BindingName}", x.LoggingArgs.nameChain, name)
+
+            x.ValidationErrors
+            |> IReadOnlyDictionary.tryFind name
+            |> Option.map (fun errors -> errors.Value)
+            |> Option.defaultValue []
+            |> (fun x -> upcast x)
 
 module internal ViewModelHelper =
 
-  let create getSender args bindings validationErrors = {
-    GetSender = getSender
-    LoggingArgs = args.loggingArgs
-    Model = args.initialModel
-    ValidationErrors = validationErrors
-    Bindings = bindings
-    PropertyChanged = Event<PropertyChangedEventHandler, PropertyChangedEventArgs>()
-    ErrorsChanged = DelegateEvent<EventHandler<DataErrorsChangedEventArgs>>()
-  }
-
-  let empty getSender args =
-    create getSender args Map.empty Map.empty
-
-  let getEventsToRaise newModel helper =
-    helper.Bindings
-      |> Seq.collect (fun (Kvp (name, binding)) -> Update(helper.LoggingArgs, name).Recursive(helper.Model, newModel, binding))
-      |> Seq.toList
-
-  let raiseEvents eventsToRaise helper =
-    let {
-      log = log
-      nameChain = nameChain } = helper.LoggingArgs
-
-    let raisePropertyChanged name =
-      log.LogTrace("[{BindingNameChain}] PropertyChanged {BindingName}", nameChain, name)
-      helper.PropertyChanged.Trigger(helper.GetSender (), PropertyChangedEventArgs name)
-    let raiseCanExecuteChanged (cmd: Command) =
-      cmd.RaiseCanExecuteChanged ()
-    let raiseErrorsChanged name =
-      log.LogTrace("[{BindingNameChain}] ErrorsChanged {BindingName}", nameChain, name)
-      helper.ErrorsChanged.Trigger([| helper.GetSender (); box <| DataErrorsChangedEventArgs name |])
-
-    eventsToRaise
-    |> List.iter (function
-      | ErrorsChanged name -> raiseErrorsChanged name
-      | PropertyChanged name -> raisePropertyChanged name
-      | CanExecuteChanged cmd -> cmd |> raiseCanExecuteChanged)
-
-  let getFunctionsForSubModelSelectedItem loggingArgs initializedBindings (name: string) =
-    let log = loggingArgs.log
-    initializedBindings
-    |> IReadOnlyDictionary.tryFind name
-    |> function
-      | Some b ->
-        match FuncsFromSubModelSeqKeyed().Recursive(b |> MapOutputType.unboxVm) with
-        | Some x -> Some x
-        | None -> log.LogError("SubModelSelectedItem binding referenced binding {SubModelSeqBindingName} but it is not a SubModelSeq binding", name)
-                  None
-      | None -> log.LogError("SubModelSelectedItem binding referenced binding {SubModelSeqBindingName} but no binding was found with that name", name)
+    let create getSender args bindings validationErrors =
+        { GetSender = getSender
+          LoggingArgs = args.loggingArgs
+          Model = args.initialModel
+          ValidationErrors = validationErrors
+          Bindings = bindings
+          PropertyChanged = Event<PropertyChangedEventHandler, PropertyChangedEventArgs>()
+          ErrorsChanged = DelegateEvent<EventHandler<DataErrorsChangedEventArgs>>() }
+
+    let empty getSender args =
+        create getSender args Map.empty Map.empty
+
+    let getEventsToRaise newModel helper =
+        helper.Bindings
+        |> Seq.collect (fun (Kvp(name, binding)) ->
+            Update(helper.LoggingArgs, name).Recursive(helper.Model, newModel, binding))
+        |> Seq.toList
+
+    let raiseEvents eventsToRaise helper =
+        let { log = log; nameChain = nameChain } = helper.LoggingArgs
+
+        let raisePropertyChanged name =
+            log.LogTrace("[{BindingNameChain}] PropertyChanged {BindingName}", nameChain, name)
+            helper.PropertyChanged.Trigger(helper.GetSender(), PropertyChangedEventArgs name)
+
+        let raiseCanExecuteChanged (cmd: Command) = cmd.RaiseCanExecuteChanged()
+
+        let raiseErrorsChanged name =
+            log.LogTrace("[{BindingNameChain}] ErrorsChanged {BindingName}", nameChain, name)
+            helper.ErrorsChanged.Trigger([| helper.GetSender(); box <| DataErrorsChangedEventArgs name |])
+
+        eventsToRaise
+        |> List.iter (function
+            | ErrorsChanged name -> raiseErrorsChanged name
+            | PropertyChanged name -> raisePropertyChanged name
+            | CanExecuteChanged cmd -> cmd |> raiseCanExecuteChanged)
+
+    let getFunctionsForSubModelSelectedItem loggingArgs initializedBindings (name: string) =
+        let log = loggingArgs.log
+
+        initializedBindings
+        |> IReadOnlyDictionary.tryFind name
+        |> function
+            | Some b ->
+                match FuncsFromSubModelSeqKeyed().Recursive(b |> MapOutputType.unboxVm) with
+                | Some x -> Some x
+                | None ->
+                    log.LogError(
+                        "SubModelSelectedItem binding referenced binding {SubModelSeqBindingName} but it is not a SubModelSeq binding",
+                        name
+                    )
+
+                    None
+            | None ->
+                log.LogError(
+                    "SubModelSelectedItem binding referenced binding {SubModelSeqBindingName} but no binding was found with that name",
+                    name
+                )
+
                 None
 
-type [<AllowNullLiteral>] internal DynamicViewModel<'model, 'msg>
-      ( args: ViewModelArgs<'model, 'msg>,
-        bindings: Binding<'model, 'msg> list)
-      as this =
-  inherit DynamicObject()
+[<AllowNullLiteral>]
+type internal DynamicViewModel<'model, 'msg>(args: ViewModelArgs<'model, 'msg>, bindings: Binding<'model, 'msg> list) as this
+    =
+    inherit DynamicObject()
+
+    let { initialModel = initialModel
+          dispatch = dispatch
+          loggingArgs = loggingArgs } =
+        args
+
+    let { log = log; nameChain = nameChain } = loggingArgs
+
+    let (bindings, validationErrors) =
+        let initializeBinding initializedBindings binding =
+            Initialize(
+                loggingArgs,
+                binding.Name,
+                ViewModelHelper.getFunctionsForSubModelSelectedItem loggingArgs initializedBindings
+            )
+                .Recursive(initialModel, dispatch, (fun () -> this |> IViewModel.currentModel), binding.Data)
+
+        log.LogTrace("[{BindingNameChain}] Initializing bindings", nameChain)
+
+        let bindingDict = Dictionary<string, VmBinding<'model, 'msg, obj>>(bindings.Length)
+        let validationDict = Dictionary<string, string list ref>()
+
+        let sortedBindings =
+            bindings |> List.sortWith (SubModelSelectedItemLast().CompareBindings())
+
+        for b in sortedBindings do
+            if bindingDict.ContainsKey b.Name then
+                log.LogError(
+                    "Binding name {BindingName} is duplicated. Only the first occurrence will be used.",
+                    b.Name
+                )
+            else
+                option {
+                    let! vmBinding = initializeBinding bindingDict b
+                    do bindingDict.Add(b.Name, vmBinding)
+                    let! errorList = FirstValidationErrors().Recursive(vmBinding)
+                    do validationDict.Add(b.Name, errorList)
+                    return ()
+                }
+                |> Option.defaultValue ()
+
+        (bindingDict |> Seq.map (|KeyValue|) |> Map.ofSeq, validationDict |> Seq.map (|KeyValue|) |> Map.ofSeq)
+
+    let mutable helper =
+        ViewModelHelper.create (fun () -> this) args bindings validationErrors
+
+    interface IViewModel<'model, 'msg> with
+        member _.CurrentModel: 'model = helper.Model
+
+        member _.UpdateModel(newModel: 'model) : unit =
+            let prevHasErrors = (helper :> INotifyDataErrorInfo).HasErrors
+            let eventsToRaise = ViewModelHelper.getEventsToRaise newModel helper
+            helper <- { helper with Model = newModel }
+
+            let eventsToRaise =
+                if prevHasErrors = (helper :> INotifyDataErrorInfo).HasErrors then
+                    eventsToRaise
+                else
+                    (PropertyChanged "HasErrors") :: eventsToRaise
+
+            ViewModelHelper.raiseEvents eventsToRaise helper
+
+    override _.TryGetMember(binder, result) =
+        log.LogTrace("[{BindingNameChain}] TryGetMember {BindingName}", nameChain, binder.Name)
+
+        match bindings.TryGetValue binder.Name with
+        | false, _ ->
+            log.LogError(
+                "[{BindingNameChain}] TryGetMember FAILED: Property {BindingName} doesn't exist",
+                nameChain,
+                binder.Name
+            )
+
+            false
+        | true, binding ->
+            try
+                match Get(nameChain).Recursive(helper.Model, binding) with
+                | Ok v ->
+                    result <- v
+                    true
+                | Error e ->
+                    match e with
+                    | GetError.OneWayToSource ->
+                        log.LogError(
+                            "[{BindingNameChain}] TryGetMember FAILED: Binding {BindingName} is read-only",
+                            nameChain,
+                            binder.Name
+                        )
+                    | GetError.SubModelSelectedItem d ->
+                        log.LogError(
+                            "[{BindingNameChain}] TryGetMember FAILED: Failed to find an element of the SubModelSeq binding {SubModelSeqBindingName} with ID {ID} in the getter for the binding {BindingName}",
+                            d.NameChain,
+                            d.SubModelSeqBindingName,
+                            d.Id,
+                            binder.Name
+                        )
+                    | GetError.ToNullError(ValueOption.ToNullError.ValueCannotBeNull nonNullTypeName) ->
+                        log.LogError(
+                            "[{BindingNameChain}] TryGetMember FAILED: Binding {BindingName} is null, but type {Type} is non-nullable",
+                            nameChain,
+                            binder.Name,
+                            nonNullTypeName
+                        )
+
+                    false
+            with e ->
+                log.LogError(
+                    e,
+                    "[{BindingNameChain}] TryGetMember FAILED: Exception thrown while processing binding {BindingName}",
+                    nameChain,
+                    binder.Name
+                )
+
+                reraise ()
+
+    override _.TrySetMember(binder, value) =
+        log.LogTrace("[{BindingNameChain}] TrySetMember {BindingName}", nameChain, binder.Name)
+
+        match bindings.TryGetValue binder.Name with
+        | false, _ ->
+            log.LogError(
+                "[{BindingNameChain}] TrySetMember FAILED: Property {BindingName} doesn't exist",
+                nameChain,
+                binder.Name
+            )
+
+            false
+        | true, binding ->
+            try
+                let success = Set(value).Recursive(helper.Model, binding)
+
+                if not success then
+                    log.LogError(
+                        "[{BindingNameChain}] TrySetMember FAILED: Binding {BindingName} is read-only",
+                        nameChain,
+                        binder.Name
+                    )
+
+                success
+            with e ->
+                log.LogError(
+                    e,
+                    "[{BindingNameChain}] TrySetMember FAILED: Exception thrown while processing binding {BindingName}",
+                    nameChain,
+                    binder.Name
+                )
+
+                reraise ()
+
+    override _.GetDynamicMemberNames() =
+        log.LogTrace("[{BindingNameChain}] GetDynamicMemberNames", nameChain)
+        bindings.Keys
+
+
+    interface INotifyPropertyChanged with
+        [<CLIEvent>]
+        member _.PropertyChanged = (helper :> INotifyPropertyChanged).PropertyChanged
+
+    interface INotifyDataErrorInfo with
+        [<CLIEvent>]
+        member _.ErrorsChanged = (helper :> INotifyDataErrorInfo).ErrorsChanged
+
+        member _.HasErrors = (helper :> INotifyDataErrorInfo).HasErrors
+
+        member _.GetErrors name =
+            (helper :> INotifyDataErrorInfo).GetErrors name
 
-  let { initialModel = initialModel
-        dispatch = dispatch
-        loggingArgs = loggingArgs
-      } = args
+open System.Runtime.CompilerServices
 
-  let { log = log
-        nameChain = nameChain
-      } = loggingArgs
+[<AllowNullLiteral>]
+type ViewModelBase<'model, 'msg>(args: ViewModelArgs<'model, 'msg>) as this =
 
-  let (bindings, validationErrors) =
-    let initializeBinding initializedBindings binding =
-      Initialize(loggingArgs, binding.Name, ViewModelHelper.getFunctionsForSubModelSelectedItem loggingArgs initializedBindings)
-        .Recursive(initialModel, dispatch, (fun () -> this |> IViewModel.currentModel), binding.Data)
-
-    log.LogTrace("[{BindingNameChain}] Initializing bindings", nameChain)
-
-    let bindingDict = Dictionary<string, VmBinding<'model, 'msg, obj>>(bindings.Length)
-    let validationDict = Dictionary<string, string list ref>()
-
-    let sortedBindings =
-      bindings
-      |> List.sortWith (SubModelSelectedItemLast().CompareBindings())
-    for b in sortedBindings do
-      if bindingDict.ContainsKey b.Name then
-        log.LogError("Binding name {BindingName} is duplicated. Only the first occurrence will be used.", b.Name)
-      else
-        option {
-          let! vmBinding = initializeBinding bindingDict b
-          do bindingDict.Add(b.Name, vmBinding)
-          let! errorList = FirstValidationErrors().Recursive(vmBinding)
-          do validationDict.Add(b.Name, errorList)
-          return ()
-        } |> Option.defaultValue ()
-    (bindingDict    |> Seq.map (|KeyValue|) |> Map.ofSeq,
-     validationDict |> Seq.map (|KeyValue|) |> Map.ofSeq)
-
-  let mutable helper =
-    ViewModelHelper.create
-      (fun () -> this)
-      args
-      bindings
-      validationErrors
-
-  interface IViewModel<'model, 'msg> with
-    member _.CurrentModel : 'model = helper.Model
-
-    member _.UpdateModel (newModel: 'model) : unit =
-      let prevHasErrors = (helper :> INotifyDataErrorInfo).HasErrors
-      let eventsToRaise = ViewModelHelper.getEventsToRaise newModel helper
-      helper <- { helper with Model = newModel }
-      let eventsToRaise = if prevHasErrors = (helper :> INotifyDataErrorInfo).HasErrors then eventsToRaise else (PropertyChanged "HasErrors") :: eventsToRaise
-      ViewModelHelper.raiseEvents eventsToRaise helper
-
-  override _.TryGetMember (binder, result) =
-    log.LogTrace("[{BindingNameChain}] TryGetMember {BindingName}", nameChain, binder.Name)
-    match bindings.TryGetValue binder.Name with
-    | false, _ ->
-        log.LogError("[{BindingNameChain}] TryGetMember FAILED: Property {BindingName} doesn't exist", nameChain, binder.Name)
-        false
-    | true, binding ->
-        try
-          match Get(nameChain).Recursive(helper.Model, binding) with
-          | Ok v ->
-              result <- v
-              true
-          | Error e ->
-              match e with
-              | GetError.OneWayToSource -> log.LogError("[{BindingNameChain}] TryGetMember FAILED: Binding {BindingName} is read-only", nameChain, binder.Name)
-              | GetError.SubModelSelectedItem d -> log.LogError("[{BindingNameChain}] TryGetMember FAILED: Failed to find an element of the SubModelSeq binding {SubModelSeqBindingName} with ID {ID} in the getter for the binding {BindingName}", d.NameChain, d.SubModelSeqBindingName, d.Id, binder.Name)
-              | GetError.ToNullError (ValueOption.ToNullError.ValueCannotBeNull nonNullTypeName) -> log.LogError("[{BindingNameChain}] TryGetMember FAILED: Binding {BindingName} is null, but type {Type} is non-nullable", nameChain, binder.Name, nonNullTypeName)
-              false
-        with e ->
-          log.LogError(e, "[{BindingNameChain}] TryGetMember FAILED: Exception thrown while processing binding {BindingName}", nameChain, binder.Name)
-          reraise ()
-
-  override _.TrySetMember (binder, value) =
-    log.LogTrace("[{BindingNameChain}] TrySetMember {BindingName}", nameChain, binder.Name)
-    match bindings.TryGetValue binder.Name with
-    | false, _ ->
-        log.LogError("[{BindingNameChain}] TrySetMember FAILED: Property {BindingName} doesn't exist", nameChain, binder.Name)
-        false
-    | true, binding ->
-        try
-          let success = Set(value).Recursive(helper.Model, binding)
-          if not success then
-            log.LogError("[{BindingNameChain}] TrySetMember FAILED: Binding {BindingName} is read-only", nameChain, binder.Name)
-          success
-        with e ->
-          log.LogError(e, "[{BindingNameChain}] TrySetMember FAILED: Exception thrown while processing binding {BindingName}", nameChain, binder.Name)
-          reraise ()
-
-  override _.GetDynamicMemberNames () =
-    log.LogTrace("[{BindingNameChain}] GetDynamicMemberNames", nameChain)
-    bindings.Keys
-
-
-  interface INotifyPropertyChanged with
-    [<CLIEvent>]
-    member _.PropertyChanged = (helper :> INotifyPropertyChanged).PropertyChanged
-
-  interface INotifyDataErrorInfo with
-    [<CLIEvent>]
-    member _.ErrorsChanged = (helper :> INotifyDataErrorInfo).ErrorsChanged
-    member _.HasErrors = (helper :> INotifyDataErrorInfo).HasErrors
-    member _.GetErrors name = (helper :> INotifyDataErrorInfo).GetErrors name
+    let mutable setBindings = Map.empty<String, VmBinding<'model, 'msg, obj>>
 
-open System.Runtime.CompilerServices
+    let mutable helper = ViewModelHelper.empty (fun () -> this) args
 
-type [<AllowNullLiteral>] ViewModelBase<'model, 'msg>(args: ViewModelArgs<'model, 'msg>)
-  as this =
-
-  let mutable setBindings = Map.empty<String, VmBinding<'model, 'msg, obj>>
-
-  let mutable helper = ViewModelHelper.empty (fun () -> this) args
-
-  let { loggingArgs = loggingArgs
-        initialModel = initialModel
-        dispatch = dispatch } = args
-  let { log = log; nameChain = nameChain } = loggingArgs
-
-  let initializeBinding initializedBindings binding =
-    Initialize(loggingArgs, binding.Name, ViewModelHelper.getFunctionsForSubModelSelectedItem loggingArgs initializedBindings)
-      .Recursive(initialModel, dispatch, (fun () -> this |> IViewModel.currentModel), binding.Data)
-
-  member _.Get<'a> ([<CallerMemberName>] ?memberName: string) =
-    fun (binding: string -> Binding<'model, 'msg, 'a>) ->
-      let result =
-        option {
-          let! name = memberName
-          let! vmBinding = option {
-            match helper.Bindings.TryGetValue name with
-            | true, value ->
-              return value |> MapOutputType.unboxVm
-            | false, _ ->
-              let binding = binding name
-              let! vmBinding = binding |> initializeBinding helper.Bindings
-              let newBindings = helper.Bindings.Add (name, vmBinding |> MapOutputType.boxVm)
-              let newValidationErrors =
-                FirstValidationErrors().Recursive(vmBinding)
-                |> Option.map (fun errorList -> helper.ValidationErrors.Add (name, errorList))
-                |> Option.defaultValue helper.ValidationErrors
-              helper <-
-                { helper with
-                    Bindings = newBindings
-                    ValidationErrors = newValidationErrors }
-              return vmBinding
-          }
-          return Get(nameChain).Recursive(helper.Model, vmBinding)
-        }
-      match result with
-      | None ->
-        log.LogError("[{BindingNameChain}] Get FAILED: Binding {BindingName} could not be constructed", nameChain, memberName)
-        failwithf $"[%s{nameChain}] Get FAILED: Binding {memberName} could not be constructed"
-      | Some (Error e) ->
-        match e with
-        | GetError.OneWayToSource -> log.LogError("[{BindingNameChain}] Get FAILED: Binding {BindingName} is read-only", nameChain, memberName)
-        | GetError.SubModelSelectedItem d -> log.LogError("[{BindingNameChain}] Get FAILED: Failed to find an element of the SubModelSeq binding {SubModelSeqBindingName} with ID {ID} in the getter for the binding {BindingName}", d.NameChain, d.SubModelSeqBindingName, d.Id, memberName)
-        | GetError.ToNullError (ValueOption.ToNullError.ValueCannotBeNull nonNullTypeName) -> log.LogError("[{BindingNameChain}] Get FAILED: Binding {BindingName} is null, but type {Type} is non-nullable", nameChain, memberName, nonNullTypeName)
-        failwithf $"[%s{nameChain}] Get FAILED: Binding {memberName} returned an error {e}"
-      | Some (Ok r) -> r
-
-  member _.Set<'a> (value: 'a, [<CallerMemberName>] ?memberName: string) =
-    fun (binding: string -> Binding<'model, 'msg, 'a>) ->
-      try
-        let success =
-          option {
-            let! name = memberName
-            let! vmBinding = option {
-              match setBindings.TryGetValue name with
-              | true, value ->
-                return value |> MapOutputType.unboxVm
-              | false, _ ->
-                let binding = binding name
-                let! vmBinding = initializeBinding helper.Bindings binding
-                setBindings <- setBindings.Add (name, vmBinding |> MapOutputType.boxVm)
-                return vmBinding
-            }
-            return Set(value).Recursive(helper.Model, vmBinding)
-          }
-        if success = Some false then
-          log.LogError("[{BindingNameChain}] Set FAILED: Binding {BindingName} is read-only", nameChain, memberName)
-        else if success = None then
-          log.LogError("[{BindingNameChain}] Set FAILED: Binding {BindingName} could not be constructed", nameChain, memberName)
-      with e ->
-        log.LogError(e, "[{BindingNameChain}] Set FAILED: Exception thrown while processing binding {BindingName}", nameChain, memberName)
-        reraise ()
-
-  interface IViewModel<'model, 'msg> with
-    member _.CurrentModel = helper.Model
-
-    member _.UpdateModel(newModel: 'model) =
-      let eventsToRaise = ViewModelHelper.getEventsToRaise newModel helper
-      helper <- { helper with Model = newModel }
-      ViewModelHelper.raiseEvents eventsToRaise helper
-
-  interface INotifyPropertyChanged with
-    [<CLIEvent>]
-    member _.PropertyChanged = (helper :> INotifyPropertyChanged).PropertyChanged
-
-  interface INotifyDataErrorInfo with
-    [<CLIEvent>]
-    member _.ErrorsChanged = (helper :> INotifyDataErrorInfo).ErrorsChanged
-    member _.HasErrors = (helper :> INotifyDataErrorInfo).HasErrors
-    member _.GetErrors name = (helper :> INotifyDataErrorInfo).GetErrors name
+    let { loggingArgs = loggingArgs
+          initialModel = initialModel
+          dispatch = dispatch } =
+        args
+
+    let { log = log; nameChain = nameChain } = loggingArgs
+
+    let initializeBinding initializedBindings binding =
+        Initialize(
+            loggingArgs,
+            binding.Name,
+            ViewModelHelper.getFunctionsForSubModelSelectedItem loggingArgs initializedBindings
+        )
+            .Recursive(initialModel, dispatch, (fun () -> this |> IViewModel.currentModel), binding.Data)
+
+    member _.Get<'a>([<CallerMemberName>] ?memberName: string) =
+        fun (binding: string -> Binding<'model, 'msg, 'a>) ->
+            let result =
+                option {
+                    let! name = memberName
+
+                    let! vmBinding =
+                        option {
+                            match helper.Bindings.TryGetValue name with
+                            | true, value -> return value |> MapOutputType.unboxVm
+                            | false, _ ->
+                                let binding = binding name
+                                let! vmBinding = binding |> initializeBinding helper.Bindings
+                                let newBindings = helper.Bindings.Add(name, vmBinding |> MapOutputType.boxVm)
+
+                                let newValidationErrors =
+                                    FirstValidationErrors().Recursive(vmBinding)
+                                    |> Option.map (fun errorList -> helper.ValidationErrors.Add(name, errorList))
+                                    |> Option.defaultValue helper.ValidationErrors
+
+                                helper <-
+                                    { helper with
+                                        Bindings = newBindings
+                                        ValidationErrors = newValidationErrors }
+
+                                return vmBinding
+                        }
+
+                    return Get(nameChain).Recursive(helper.Model, vmBinding)
+                }
+
+            match result with
+            | None ->
+                log.LogError(
+                    "[{BindingNameChain}] Get FAILED: Binding {BindingName} could not be constructed",
+                    nameChain,
+                    memberName
+                )
+
+                failwithf $"[%s{nameChain}] Get FAILED: Binding {memberName} could not be constructed"
+            | Some(Error e) ->
+                match e with
+                | GetError.OneWayToSource ->
+                    log.LogError(
+                        "[{BindingNameChain}] Get FAILED: Binding {BindingName} is read-only",
+                        nameChain,
+                        memberName
+                    )
+                | GetError.SubModelSelectedItem d ->
+                    log.LogError(
+                        "[{BindingNameChain}] Get FAILED: Failed to find an element of the SubModelSeq binding {SubModelSeqBindingName} with ID {ID} in the getter for the binding {BindingName}",
+                        d.NameChain,
+                        d.SubModelSeqBindingName,
+                        d.Id,
+                        memberName
+                    )
+                | GetError.ToNullError(ValueOption.ToNullError.ValueCannotBeNull nonNullTypeName) ->
+                    log.LogError(
+                        "[{BindingNameChain}] Get FAILED: Binding {BindingName} is null, but type {Type} is non-nullable",
+                        nameChain,
+                        memberName,
+                        nonNullTypeName
+                    )
+
+                failwithf $"[%s{nameChain}] Get FAILED: Binding {memberName} returned an error {e}"
+            | Some(Ok r) -> r
+
+    member _.Set<'a>(value: 'a, [<CallerMemberName>] ?memberName: string) =
+        fun (binding: string -> Binding<'model, 'msg, 'a>) ->
+            try
+                let success =
+                    option {
+                        let! name = memberName
+
+                        let! vmBinding =
+                            option {
+                                match setBindings.TryGetValue name with
+                                | true, value -> return value |> MapOutputType.unboxVm
+                                | false, _ ->
+                                    let binding = binding name
+                                    let! vmBinding = initializeBinding helper.Bindings binding
+                                    setBindings <- setBindings.Add(name, vmBinding |> MapOutputType.boxVm)
+                                    return vmBinding
+                            }
+
+                        return Set(value).Recursive(helper.Model, vmBinding)
+                    }
+
+                if success = Some false then
+                    log.LogError(
+                        "[{BindingNameChain}] Set FAILED: Binding {BindingName} is read-only",
+                        nameChain,
+                        memberName
+                    )
+                else if success = None then
+                    log.LogError(
+                        "[{BindingNameChain}] Set FAILED: Binding {BindingName} could not be constructed",
+                        nameChain,
+                        memberName
+                    )
+            with e ->
+                log.LogError(
+                    e,
+                    "[{BindingNameChain}] Set FAILED: Exception thrown while processing binding {BindingName}",
+                    nameChain,
+                    memberName
+                )
+
+                reraise ()
+
+    interface IViewModel<'model, 'msg> with
+        member _.CurrentModel = helper.Model
+
+        member _.UpdateModel(newModel: 'model) =
+            let eventsToRaise = ViewModelHelper.getEventsToRaise newModel helper
+            helper <- { helper with Model = newModel }
+            ViewModelHelper.raiseEvents eventsToRaise helper
+
+    interface INotifyPropertyChanged with
+        [<CLIEvent>]
+        member _.PropertyChanged = (helper :> INotifyPropertyChanged).PropertyChanged
+
+    interface INotifyDataErrorInfo with
+        [<CLIEvent>]
+        member _.ErrorsChanged = (helper :> INotifyDataErrorInfo).ErrorsChanged
+
+        member _.HasErrors = (helper :> INotifyDataErrorInfo).HasErrors
+
+        member _.GetErrors name =
+            (helper :> INotifyDataErrorInfo).GetErrors name
\ No newline at end of file
diff --git a/src/Elmish.WPF/WindowState.fs b/src/Elmish.WPF/WindowState.fs
index c6cec452..4a9f9238 100644
--- a/src/Elmish.WPF/WindowState.fs
+++ b/src/Elmish.WPF/WindowState.fs
@@ -2,50 +2,45 @@
 
 [<RequireQualifiedAccess>]
 type WindowState<'model> =
-  | Closed
-  | Hidden  of 'model
-  | Visible of 'model
+    | Closed
+    | Hidden of 'model
+    | Visible of 'model
 
 
 module WindowState =
 
-  let cata a f g = function
-    | WindowState.Closed    -> a
-    | WindowState.Hidden  a -> a |> f
-    | WindowState.Visible a -> a |> g
-
-  let map f =
-    cata
-      WindowState.Closed
-      (f >> WindowState.Hidden)
-      (f >> WindowState.Visible)
-  let set a = map (fun _ -> a)
-
-  let toHidden a =
-    cata
-      (WindowState.Hidden a)
-      WindowState.Hidden
-      WindowState.Hidden
-
-  let toVisible a =
-    cata
-      (WindowState.Visible a)
-      WindowState.Visible
-      WindowState.Visible
-
-  let toOption  state = state |> cata None Some Some
-  let toVOption state = state |> cata ValueNone ValueSome ValueSome
-
-  /// Converts None to WindowState.Closed, and Some(x) to
-  /// WindowState.Visible(x).
-  let ofOption (model: 'model option) =
-    match model with
-    | Some a -> a |> WindowState.Visible
-    | None   ->      WindowState.Closed
-
-  /// Converts ValueNone to WindowState.Closed, and ValueSome(x) to
-  /// WindowState.Visible(x).
-  let ofVOption (model: 'model voption) =
-    match model with
-    | ValueSome a -> a |> WindowState.Visible
-    | ValueNone   ->      WindowState.Closed
\ No newline at end of file
+    let cata a f g =
+        function
+        | WindowState.Closed -> a
+        | WindowState.Hidden a -> a |> f
+        | WindowState.Visible a -> a |> g
+
+    let map f =
+        cata WindowState.Closed (f >> WindowState.Hidden) (f >> WindowState.Visible)
+
+    let set a = map (fun _ -> a)
+
+    let toHidden a =
+        cata (WindowState.Hidden a) WindowState.Hidden WindowState.Hidden
+
+    let toVisible a =
+        cata (WindowState.Visible a) WindowState.Visible WindowState.Visible
+
+    let toOption state = state |> cata None Some Some
+
+    let toVOption state =
+        state |> cata ValueNone ValueSome ValueSome
+
+    /// Converts None to WindowState.Closed, and Some(x) to
+    /// WindowState.Visible(x).
+    let ofOption (model: 'model option) =
+        match model with
+        | Some a -> a |> WindowState.Visible
+        | None -> WindowState.Closed
+
+    /// Converts ValueNone to WindowState.Closed, and ValueSome(x) to
+    /// WindowState.Visible(x).
+    let ofVOption (model: 'model voption) =
+        match model with
+        | ValueSome a -> a |> WindowState.Visible
+        | ValueNone -> WindowState.Closed
\ No newline at end of file
diff --git a/src/Elmish.WPF/WpfProgram.fs b/src/Elmish.WPF/WpfProgram.fs
index f1683fc6..e345aa3a 100644
--- a/src/Elmish.WPF/WpfProgram.fs
+++ b/src/Elmish.WPF/WpfProgram.fs
@@ -7,15 +7,16 @@ open Elmish
 
 
 type WpfProgram<'model, 'msg, 'viewModel> =
-  internal {
-    ElmishProgram: Program<unit, 'model, 'msg, unit>
-    CreateViewModel: ViewModelArgs<'model,'msg> -> 'viewModel
-    UpdateViewModel: 'viewModel * 'model -> unit
-    LoggerFactory: ILoggerFactory
-    ErrorHandler: string -> exn -> unit
-    /// Only log calls that take at least this many milliseconds. Default 1.
-    PerformanceLogThreshold: int
-  }
+    internal
+        {
+            ElmishProgram: Program<unit, 'model, 'msg, unit>
+            CreateViewModel: ViewModelArgs<'model, 'msg> -> 'viewModel
+            UpdateViewModel: 'viewModel * 'model -> unit
+            LoggerFactory: ILoggerFactory
+            ErrorHandler: string -> exn -> unit
+            /// Only log calls that take at least this many milliseconds. Default 1.
+            PerformanceLogThreshold: int
+        }
 
 type WpfProgram<'model, 'msg> = WpfProgram<'model, 'msg, obj>
 
@@ -23,112 +24,120 @@ type WpfProgram<'model, 'msg> = WpfProgram<'model, 'msg, obj>
 [<RequireQualifiedAccess>]
 module WpfProgram =
 
-  let private mapVm fOut fIn (p: WpfProgram<'model, 'msg, 'viewModel0>) : WpfProgram<'model, 'msg, 'viewModel1> =
-    { ElmishProgram = p.ElmishProgram
-      CreateViewModel = p.CreateViewModel >> fOut
-      UpdateViewModel = (fun (vm, m) -> p.UpdateViewModel(fIn vm, m))
-      LoggerFactory = p.LoggerFactory
-      ErrorHandler = p.ErrorHandler
-      PerformanceLogThreshold = p.PerformanceLogThreshold }
-
-  let private createWithBindings (getBindings: unit -> Binding<'model,'msg> list) program =
-    { ElmishProgram = program
-      CreateViewModel = fun args -> DynamicViewModel<'model,'msg>(args, getBindings ())
-      UpdateViewModel = IViewModel.updateModel
-      LoggerFactory = NullLoggerFactory.Instance
-      ErrorHandler = fun _ _ -> ()
-      PerformanceLogThreshold = 1 }
-    |> mapVm box unbox
-
-  let private createWithVm (createVm: ViewModelArgs<'model, 'msg> -> #IViewModel<'model, 'msg>) program =
-    { ElmishProgram = program
-      CreateViewModel = createVm
-      UpdateViewModel = IViewModel.updateModel
-      LoggerFactory = NullLoggerFactory.Instance
-      ErrorHandler = fun _ _ -> ()
-      PerformanceLogThreshold = 1 }
-
-
-  /// Creates a WpfProgram that does not use commands.
-  let mkSimple
-      (init: unit -> 'model)
-      (update: 'msg  -> 'model -> 'model)
-      (bindings: unit -> Binding<'model, 'msg> list) =
-    Program.mkSimple init update (fun _ _ -> ())
-    |> createWithBindings bindings
-
-
-  /// Creates a WpfProgram that uses commands
-  let mkProgram
-      (init: unit -> 'model * Cmd<'msg>)
-      (update: 'msg  -> 'model -> 'model * Cmd<'msg>)
-      (bindings: unit -> Binding<'model, 'msg> list) =
-    Program.mkProgram init update (fun _ _ -> ())
-    |> createWithBindings bindings
-
-  /// Creates a WpfProgram that does not use commands.
-  let mkSimpleT
-      (init: unit -> 'model)
-      (update: 'msg  -> 'model -> 'model)
-      (createVm: ViewModelArgs<'model, 'msg> -> 'viewModel) =
-    Program.mkSimple init update (fun _ _ -> ())
-    |> createWithVm createVm
-
-
-  /// Creates a WpfProgram that uses commands
-  let mkProgramT
-      (init: unit -> 'model * Cmd<'msg>)
-      (update: 'msg  -> 'model -> 'model * Cmd<'msg>)
-      (createVm: ViewModelArgs<'model, 'msg> -> 'viewModel) =
-    Program.mkProgram init update (fun _ _ -> ())
-    |> createWithVm createVm
-
-  [<Struct>]
-  type ElmishThreaderBehavior =
-  | SingleThreaded
-  | Threaded_NoUIDispatch
-  | Threaded_PendingUIDispatch of pending: System.Threading.Tasks.TaskCompletionSource<unit -> unit>
-  | Threaded_UIDispatch of active: System.Threading.Tasks.TaskCompletionSource<unit -> unit>
-
-  /// <summary>Starts an Elmish dispatch loop, setting the bindings as the DataContext for the
-  /// specified FrameworkElement. Non-blocking. If you have an explicit entry point where
-  /// you control app/window instantiation, runWindowWithConfig might be a better option.
-  ///
-  /// If you execute this from a thread other than the thread owning element.Dispatcher (UI Thread),
-  /// Elmish.WPF will use that background thread to run updates rather than the main UI thread.</summary>
-  /// <remarks>Example multithreaded use:
-  /// <code><![CDATA[
-  /// let elmishThread =
-  ///   Thread(
-  ///     ThreadStart(fun () ->
-  ///       WpfProgram.startElmishLoop window program
-  ///       Dispatcher.Run()))
-  /// elmishThread.Name <- "ElmishDispatchThread"
-  /// elmishThread.Run()
-  ///
-  /// mainWindow.Show()
-  /// let result = Application.Current.Run mainWindow
-  ///
-  /// Threading.Dispatcher.FromThread(elmishThread).InvokeShutdown()
-  /// elmishThread.Join()
-  /// ]]></code></remarks>
-  /// <param name="element"></param>
-  /// <param name="program"></param>
-  /// <returns></returns>
-  let startElmishLoop
-      (element: FrameworkElement)
-      (program: WpfProgram<'model, 'msg, 'viewModel>) =
-    let mutable viewModel = None
-
-    let updateLogger = program.LoggerFactory.CreateLogger("Elmish.WPF.Update")
-    let bindingsLogger = program.LoggerFactory.CreateLogger("Elmish.WPF.Bindings")
-    let performanceLogger = program.LoggerFactory.CreateLogger("Elmish.WPF.Performance")
-
-    let measure callName f = BindingVmHelpers.Helpers2.measure performanceLogger LogLevel.Debug program.PerformanceLogThreshold "" "main" callName f
-
-    let program = { program with UpdateViewModel = measure "updateViewModel" program.UpdateViewModel }
-
-    (*
+    let private mapVm fOut fIn (p: WpfProgram<'model, 'msg, 'viewModel0>) : WpfProgram<'model, 'msg, 'viewModel1> =
+        { ElmishProgram = p.ElmishProgram
+          CreateViewModel = p.CreateViewModel >> fOut
+          UpdateViewModel = (fun (vm, m) -> p.UpdateViewModel(fIn vm, m))
+          LoggerFactory = p.LoggerFactory
+          ErrorHandler = p.ErrorHandler
+          PerformanceLogThreshold = p.PerformanceLogThreshold }
+
+    let private createWithBindings (getBindings: unit -> Binding<'model, 'msg> list) program =
+        { ElmishProgram = program
+          CreateViewModel = fun args -> DynamicViewModel<'model, 'msg>(args, getBindings ())
+          UpdateViewModel = IViewModel.updateModel
+          LoggerFactory = NullLoggerFactory.Instance
+          ErrorHandler = fun _ _ -> ()
+          PerformanceLogThreshold = 1 }
+        |> mapVm box unbox
+
+    let private createWithVm (createVm: ViewModelArgs<'model, 'msg> -> #IViewModel<'model, 'msg>) program =
+        { ElmishProgram = program
+          CreateViewModel = createVm
+          UpdateViewModel = IViewModel.updateModel
+          LoggerFactory = NullLoggerFactory.Instance
+          ErrorHandler = fun _ _ -> ()
+          PerformanceLogThreshold = 1 }
+
+
+    /// Creates a WpfProgram that does not use commands.
+    let mkSimple
+        (init: unit -> 'model)
+        (update: 'msg -> 'model -> 'model)
+        (bindings: unit -> Binding<'model, 'msg> list)
+        =
+        Program.mkSimple init update (fun _ _ -> ()) |> createWithBindings bindings
+
+
+    /// Creates a WpfProgram that uses commands
+    let mkProgram
+        (init: unit -> 'model * Cmd<'msg>)
+        (update: 'msg -> 'model -> 'model * Cmd<'msg>)
+        (bindings: unit -> Binding<'model, 'msg> list)
+        =
+        Program.mkProgram init update (fun _ _ -> ()) |> createWithBindings bindings
+
+    /// Creates a WpfProgram that does not use commands.
+    let mkSimpleT
+        (init: unit -> 'model)
+        (update: 'msg -> 'model -> 'model)
+        (createVm: ViewModelArgs<'model, 'msg> -> 'viewModel)
+        =
+        Program.mkSimple init update (fun _ _ -> ()) |> createWithVm createVm
+
+
+    /// Creates a WpfProgram that uses commands
+    let mkProgramT
+        (init: unit -> 'model * Cmd<'msg>)
+        (update: 'msg -> 'model -> 'model * Cmd<'msg>)
+        (createVm: ViewModelArgs<'model, 'msg> -> 'viewModel)
+        =
+        Program.mkProgram init update (fun _ _ -> ()) |> createWithVm createVm
+
+    [<Struct>]
+    type ElmishThreaderBehavior =
+        | SingleThreaded
+        | Threaded_NoUIDispatch
+        | Threaded_PendingUIDispatch of pending: System.Threading.Tasks.TaskCompletionSource<unit -> unit>
+        | Threaded_UIDispatch of active: System.Threading.Tasks.TaskCompletionSource<unit -> unit>
+
+    /// <summary>Starts an Elmish dispatch loop, setting the bindings as the DataContext for the
+    /// specified FrameworkElement. Non-blocking. If you have an explicit entry point where
+    /// you control app/window instantiation, runWindowWithConfig might be a better option.
+    ///
+    /// If you execute this from a thread other than the thread owning element.Dispatcher (UI Thread),
+    /// Elmish.WPF will use that background thread to run updates rather than the main UI thread.</summary>
+    /// <remarks>Example multithreaded use:
+    /// <code><![CDATA[
+    /// let elmishThread =
+    ///   Thread(
+    ///     ThreadStart(fun () ->
+    ///       WpfProgram.startElmishLoop window program
+    ///       Dispatcher.Run()))
+    /// elmishThread.Name <- "ElmishDispatchThread"
+    /// elmishThread.Run()
+    ///
+    /// mainWindow.Show()
+    /// let result = Application.Current.Run mainWindow
+    ///
+    /// Threading.Dispatcher.FromThread(elmishThread).InvokeShutdown()
+    /// elmishThread.Join()
+    /// ]]></code></remarks>
+    /// <param name="element"></param>
+    /// <param name="program"></param>
+    /// <returns></returns>
+    let startElmishLoop (element: FrameworkElement) (program: WpfProgram<'model, 'msg, 'viewModel>) =
+        let mutable viewModel = None
+
+        let updateLogger = program.LoggerFactory.CreateLogger("Elmish.WPF.Update")
+        let bindingsLogger = program.LoggerFactory.CreateLogger("Elmish.WPF.Bindings")
+        let performanceLogger = program.LoggerFactory.CreateLogger("Elmish.WPF.Performance")
+
+        let measure callName f =
+            BindingVmHelpers.Helpers2.measure
+                performanceLogger
+                LogLevel.Debug
+                program.PerformanceLogThreshold
+                ""
+                "main"
+                callName
+                f
+
+        let program =
+            { program with
+                UpdateViewModel = measure "updateViewModel" program.UpdateViewModel }
+
+        (*
      * Capture the dispatch function before wrapping it with Dispatcher.InvokeAsync
      * so that the UI can synchronously dispatch messages.
      * In additional to being slightly more efficient,
@@ -139,139 +148,146 @@ module WpfProgram =
      * This is definitely a hack.
      * Maybe something with Elmish can change so this hack can be avoided.
      *)
-    let mutable dispatch = Unchecked.defaultof<Dispatch<'msg>>
-
-    let elmishDispatcher = Threading.Dispatcher.CurrentDispatcher
-    let mutable threader =
-      if element.Dispatcher = elmishDispatcher then
-        SingleThreaded
-      else
-        Threaded_NoUIDispatch
-
-    // Dispatch that comes in from a view model message (setter or WPF ICommand). These may come from UI thread, so must be streated specially
-    let dispatchFromViewModel msg =
-      if element.Dispatcher = Threading.Dispatcher.CurrentDispatcher then // if the message is from the UI thread
-        match threader with
-        | SingleThreaded -> dispatch msg // Dispatch directly if `elmishDispatcher` is the same as the UI thread
-        | Threaded_NoUIDispatch -> // If `elmishDispatcher` is different, invoke dispatch on it then wait around for it to finish executing, then execute the continuation on the current (UI) thread
-          let uiWaiter = System.Threading.Tasks.TaskCompletionSource<unit -> unit>()
-          threader <- Threaded_PendingUIDispatch uiWaiter
-
-          // This should always leave `threader` in the `Threaded_NoUIDispatch` state before leaving this thread invocation
-          let synchronizedUiDispatch () =
-            threader <- Threaded_UIDispatch uiWaiter
-            dispatch msg
-            threader <- Threaded_NoUIDispatch
-
-          elmishDispatcher.InvokeAsync(synchronizedUiDispatch) |> ignore
-          // Wait on `elmishDispatcher` to get to this invocation and collect result
-          let continuationOnUIThread = uiWaiter.Task.Result
-          // Result is the `program.UpdateViewModel` call, so execute here on the UI thread
-          continuationOnUIThread()
-        | Threaded_PendingUIDispatch uiWaiter
-        | Threaded_UIDispatch uiWaiter ->
-          uiWaiter.SetException(exn("Error in core Elmish.WPF threading code. Invalid state reached!"))
-      else // message is not from the UI thread
-        elmishDispatcher.InvokeAsync(fun () -> dispatch msg) |> ignore // handle as a command message
-
-    // Core Elmish calls this from `dispatch`, which means this is always called from `elmishDispatcher`
-    // (which is UI thread in single-threaded case)
-    let mutable pendingModel = ValueNone
-    let mutable ct = 0
-    let setUiState model _syncDispatch =
-      let i = ct
-      ct <- ct + 1
-      let scheduleJobThreadPriority = Threading.DispatcherPriority.Send
-      let executeJobThreadPriority = Threading.DispatcherPriority.Background
-
-      match viewModel with
-      | None -> // no view model yet, so create one
-          let args =
-            { initialModel = model
-              dispatch = dispatchFromViewModel
-              loggingArgs =
-                { performanceLogThresholdMs = program.PerformanceLogThreshold
-                  nameChain = "main"
-                  log = bindingsLogger
-                  logPerformance = performanceLogger } }
-          let vm = program.CreateViewModel args
-          element.Dispatcher.Invoke(fun () -> element.DataContext <- vm)
-          viewModel <- Some vm
-      | Some vm -> // view model exists, so update
-          match threader with
-          | Threaded_UIDispatch uiWaiter -> // We are in the specific dispatch call from the UI thread (see `synchronizedUiDispatch` in `dispatchFromViewModel`)
-            updateLogger.LogDebug("SetUIState {i} UIDISPATCH", i);
-
-            let unscheduleJob () =
-              pendingModel <- ValueNone
-              updateLogger.LogDebug("Unscheduled job already completed from main thread {i}", i)
-
-            let executeJobImmediately () =
-              program.UpdateViewModel (vm, model)
-              updateLogger.LogDebug("Update done from main thread {i}", i)
-
-            element.Dispatcher.InvokeAsync(unscheduleJob, scheduleJobThreadPriority) |> ignore // Unschedule update (already done)
-            uiWaiter.SetResult(executeJobImmediately) // execute `UpdateViewModel` on UI thread
-          | Threaded_PendingUIDispatch _ // We are in a non-UI dispatch that updated the model before the UI got its update in, but after the user interacted
-          | Threaded_NoUIDispatch -> // We are in a non-UI dispatch with no pending user interactions known
-            updateLogger.LogDebug("SetUIState {i} NOUIDISPATCH {threader}", i, threader);
-
-            let scheduleJob () =
-              pendingModel <- ValueSome model
-              updateLogger.LogDebug("Scheduled new job {i}", i)
-
-            let executeJob () =
-              match pendingModel with
-              | ValueSome m ->
-                program.UpdateViewModel (vm, m)
-                pendingModel <- ValueNone
-                updateLogger.LogDebug("Job was full - Update done {i}", i)
-              | ValueNone ->
-                updateLogger.LogDebug("Job was empty - No update done {i}", i)
-
-            element.Dispatcher.InvokeAsync(scheduleJob, scheduleJobThreadPriority) |> ignore // Schedule update
-            element.Dispatcher.InvokeAsync(executeJob, executeJobThreadPriority) |> ignore // Execute Update
-          | SingleThreaded -> // If we aren't using different threads, always process normally
-            element.Dispatcher.Invoke(fun () -> program.UpdateViewModel (vm, model))
-
-    let cmdDispatch (innerDispatch: Dispatch<'msg>) : Dispatch<'msg> =
-      let innerDispatch = measure "dispatch" innerDispatch
-      dispatch <- innerDispatch
-      (*
+        let mutable dispatch = Unchecked.defaultof<Dispatch<'msg>>
+
+        let elmishDispatcher = Threading.Dispatcher.CurrentDispatcher
+
+        let mutable threader =
+            if element.Dispatcher = elmishDispatcher then
+                SingleThreaded
+            else
+                Threaded_NoUIDispatch
+
+        // Dispatch that comes in from a view model message (setter or WPF ICommand). These may come from UI thread, so must be streated specially
+        let dispatchFromViewModel msg =
+            if element.Dispatcher = Threading.Dispatcher.CurrentDispatcher then // if the message is from the UI thread
+                match threader with
+                | SingleThreaded -> dispatch msg // Dispatch directly if `elmishDispatcher` is the same as the UI thread
+                | Threaded_NoUIDispatch -> // If `elmishDispatcher` is different, invoke dispatch on it then wait around for it to finish executing, then execute the continuation on the current (UI) thread
+                    let uiWaiter = System.Threading.Tasks.TaskCompletionSource<unit -> unit>()
+                    threader <- Threaded_PendingUIDispatch uiWaiter
+
+                    // This should always leave `threader` in the `Threaded_NoUIDispatch` state before leaving this thread invocation
+                    let synchronizedUiDispatch () =
+                        threader <- Threaded_UIDispatch uiWaiter
+                        dispatch msg
+                        threader <- Threaded_NoUIDispatch
+
+                    elmishDispatcher.InvokeAsync(synchronizedUiDispatch) |> ignore
+                    // Wait on `elmishDispatcher` to get to this invocation and collect result
+                    let continuationOnUIThread = uiWaiter.Task.Result
+                    // Result is the `program.UpdateViewModel` call, so execute here on the UI thread
+                    continuationOnUIThread ()
+                | Threaded_PendingUIDispatch uiWaiter
+                | Threaded_UIDispatch uiWaiter ->
+                    uiWaiter.SetException(exn ("Error in core Elmish.WPF threading code. Invalid state reached!"))
+            else // message is not from the UI thread
+                elmishDispatcher.InvokeAsync(fun () -> dispatch msg) |> ignore // handle as a command message
+
+        // Core Elmish calls this from `dispatch`, which means this is always called from `elmishDispatcher`
+        // (which is UI thread in single-threaded case)
+        let mutable pendingModel = ValueNone
+        let mutable ct = 0
+
+        let setUiState model _syncDispatch =
+            let i = ct
+            ct <- ct + 1
+            let scheduleJobThreadPriority = Threading.DispatcherPriority.Send
+            let executeJobThreadPriority = Threading.DispatcherPriority.Background
+
+            match viewModel with
+            | None -> // no view model yet, so create one
+                let args =
+                    { initialModel = model
+                      dispatch = dispatchFromViewModel
+                      loggingArgs =
+                        { performanceLogThresholdMs = program.PerformanceLogThreshold
+                          nameChain = "main"
+                          log = bindingsLogger
+                          logPerformance = performanceLogger } }
+
+                let vm = program.CreateViewModel args
+                element.Dispatcher.Invoke(fun () -> element.DataContext <- vm)
+                viewModel <- Some vm
+            | Some vm -> // view model exists, so update
+                match threader with
+                | Threaded_UIDispatch uiWaiter -> // We are in the specific dispatch call from the UI thread (see `synchronizedUiDispatch` in `dispatchFromViewModel`)
+                    updateLogger.LogDebug("SetUIState {i} UIDISPATCH", i)
+
+                    let unscheduleJob () =
+                        pendingModel <- ValueNone
+                        updateLogger.LogDebug("Unscheduled job already completed from main thread {i}", i)
+
+                    let executeJobImmediately () =
+                        program.UpdateViewModel(vm, model)
+                        updateLogger.LogDebug("Update done from main thread {i}", i)
+
+                    element.Dispatcher.InvokeAsync(unscheduleJob, scheduleJobThreadPriority)
+                    |> ignore // Unschedule update (already done)
+
+                    uiWaiter.SetResult(executeJobImmediately) // execute `UpdateViewModel` on UI thread
+                | Threaded_PendingUIDispatch _ // We are in a non-UI dispatch that updated the model before the UI got its update in, but after the user interacted
+                | Threaded_NoUIDispatch -> // We are in a non-UI dispatch with no pending user interactions known
+                    updateLogger.LogDebug("SetUIState {i} NOUIDISPATCH {threader}", i, threader)
+
+                    let scheduleJob () =
+                        pendingModel <- ValueSome model
+                        updateLogger.LogDebug("Scheduled new job {i}", i)
+
+                    let executeJob () =
+                        match pendingModel with
+                        | ValueSome m ->
+                            program.UpdateViewModel(vm, m)
+                            pendingModel <- ValueNone
+                            updateLogger.LogDebug("Job was full - Update done {i}", i)
+                        | ValueNone -> updateLogger.LogDebug("Job was empty - No update done {i}", i)
+
+                    element.Dispatcher.InvokeAsync(scheduleJob, scheduleJobThreadPriority) |> ignore // Schedule update
+                    element.Dispatcher.InvokeAsync(executeJob, executeJobThreadPriority) |> ignore // Execute Update
+                | SingleThreaded -> // If we aren't using different threads, always process normally
+                    element.Dispatcher.Invoke(fun () -> program.UpdateViewModel(vm, model))
+
+        let cmdDispatch (innerDispatch: Dispatch<'msg>) : Dispatch<'msg> =
+            let innerDispatch = measure "dispatch" innerDispatch
+            dispatch <- innerDispatch
+            (*
        * Have commands asynchronously dispatch messages.
        * This avoids race conditions like those that can occur when shutting down.
        * https://github.com/elmish/Elmish.WPF/issues/353
        *)
-      fun msg -> elmishDispatcher.InvokeAsync(fun () -> dispatch msg) |> ignore
-
-    let logMsgAndModel (msg: 'msg) (model: 'model) _ =
-      updateLogger.LogTrace("New message: {Message}\nUpdated state:\n{Model}", msg, model)
-
-    let errorHandler (msg: string, ex: exn) =
-      updateLogger.LogError(ex, msg)
-      program.ErrorHandler msg ex
-
-    program.ElmishProgram
-    |> if updateLogger.IsEnabled LogLevel.Trace then Program.withTrace logMsgAndModel else id
-    |> Program.withErrorHandler errorHandler
-    |> Program.withSetState setUiState
-    |> Program.runWithDispatch cmdDispatch ()
-
-
-  /// Instantiates Application and sets its MainWindow if it is not already
-  /// running.
-  let private initializeApplication window =
-    if isNull Application.Current then
-      Application () |> ignore
-      Application.Current.MainWindow <- window
-
-
-  /// Starts the Elmish and WPF dispatch loops. Will instantiate Application and set its
-  /// MainWindow if it is not already running, and then run the specified window. This is a
-  /// blocking function. If you are using App.xaml as an implicit entry point, see
-  /// startElmishLoop.
-  let runWindow window program =
-    (*
+            fun msg -> elmishDispatcher.InvokeAsync(fun () -> dispatch msg) |> ignore
+
+        let logMsgAndModel (msg: 'msg) (model: 'model) _ =
+            updateLogger.LogTrace("New message: {Message}\nUpdated state:\n{Model}", msg, model)
+
+        let errorHandler (msg: string, ex: exn) =
+            updateLogger.LogError(ex, msg)
+            program.ErrorHandler msg ex
+
+        program.ElmishProgram
+        |> if updateLogger.IsEnabled LogLevel.Trace then
+               Program.withTrace logMsgAndModel
+           else
+               id
+        |> Program.withErrorHandler errorHandler
+        |> Program.withSetState setUiState
+        |> Program.runWithDispatch cmdDispatch ()
+
+
+    /// Instantiates Application and sets its MainWindow if it is not already
+    /// running.
+    let private initializeApplication window =
+        if isNull Application.Current then
+            Application() |> ignore
+            Application.Current.MainWindow <- window
+
+
+    /// Starts the Elmish and WPF dispatch loops. Will instantiate Application and set its
+    /// MainWindow if it is not already running, and then run the specified window. This is a
+    /// blocking function. If you are using App.xaml as an implicit entry point, see
+    /// startElmishLoop.
+    let runWindow window program =
+        (*
      * This is the correct order for these four statements.
      * 1. Initialize Application.Current and set its MainWindow in case the
      *    user code accesses either of these when initializing the bindings.
@@ -280,124 +296,129 @@ module WpfProgram =
      * 3. Show the window now that the DataContext is set.
      * 4. Run the current application, which must be last because it is blocking.
      *)
-    initializeApplication window
-    startElmishLoop window program
-    window.Show ()
-    Application.Current.Run window
-
-
-  /// Same as mkProgram, except that init and update don't return Cmd<'msg>
-  /// directly, but instead return a CmdMsg discriminated union that is converted
-  /// to Cmd<'msg> using toCmd. This means that the init and update functions
-  /// return only data, and thus are easier to unit test. The CmdMsg pattern is
-  /// general; this is just a trivial convenience function that automatically
-  /// converts CmdMsg to Cmd<'msg> for you in init and update.
-  let mkProgramWithCmdMsg
-      (init: unit -> 'model * 'cmdMsg list)
-      (update: 'msg -> 'model -> 'model * 'cmdMsg list)
-      (bindings: unit -> Binding<'model, 'msg> list)
-      (toCmd: 'cmdMsg -> Cmd<'msg>) =
-    let convert (model, cmdMsgs) =
-      model, (cmdMsgs |> List.map toCmd |> Cmd.batch)
-    mkProgram
-      (init >> convert)
-      (fun msg model -> update msg model |> convert)
-      bindings
-
-
-  /// Same as mkProgramT, except that init and update don't return Cmd<'msg>
-  /// directly, but instead return a CmdMsg discriminated union that is converted
-  /// to Cmd<'msg> using toCmd. This means that the init and update functions
-  /// return only data, and thus are easier to unit test. The CmdMsg pattern is
-  /// general; this is just a trivial convenience function that automatically
-  /// converts CmdMsg to Cmd<'msg> for you in init and update.
-  let mkProgramWithCmdMsgT
-      (init: unit -> 'model * 'cmdMsg list)
-      (update: 'msg -> 'model -> 'model * 'cmdMsg list)
-      (createVm: ViewModelArgs<'model, 'msg> -> 'viewModel)
-      (toCmd: 'cmdMsg -> Cmd<'msg>) =
-    let convert (model, cmdMsgs) =
-      model, (cmdMsgs |> List.map toCmd |> Cmd.batch)
-    mkProgramT
-      (init >> convert)
-      (fun msg model -> update msg model |> convert)
-      createVm
-
-
-  /// Uses the specified ILoggerFactory for logging.
-  let withLogger loggerFactory program =
-    { program with LoggerFactory = loggerFactory }
-
-
-  /// Calls the specified function for unhandled exceptions in the Elmish
-  /// dispatch loop (e.g. in commands or the update function). This essentially
-  /// delegates to Elmish's Program.withErrorHandler.
-  ///
-  /// The first (string) argument of onError is a message from Elmish describing
-  /// the context of the exception. Note that this may contain a rendered
-  /// message case with all data ("%A" formatting).
-  ///
-  /// Note that exceptions passed to onError are also logged to the logger
-  /// specified using WpfProgram.withLogger.
-  let withElmishErrorHandler onError program =
-    { program with ErrorHandler = onError }
-
-
-  /// Subscribe to external source of events, overrides existing subscription.
-  /// Return the subscriptions that should be active based on the current model.
-  /// Subscriptions will be started or stopped automatically to match.
-  let withSubscription (subscribe: 'model -> Sub<'msg>) program =
-    { program with ElmishProgram = program.ElmishProgram |> Program.withSubscription subscribe }
-
-
-  /// Map existing subscription to external source of events.
-  let mapSubscription map program =
-      { program with ElmishProgram = program.ElmishProgram |> Program.mapSubscription map }
-
-
-  /// Only logs binding performance for calls taking longer than the specified number of
-  /// milliseconds. The default is 1ms.
-  let withPerformanceLogThreshold threshold program =
-    { program with PerformanceLogThreshold = threshold }
-
-
-  /// Exit criteria and the handler, overrides existing.
-  let withTermination predicate terminate program =
-      { program with ElmishProgram = program.ElmishProgram |> Program.withTermination predicate terminate }
-
-
-  /// Map existing criteria and the handler.
-  let mapTermination map program =
-      { program with ElmishProgram = program.ElmishProgram |> Program.mapTermination map }
+        initializeApplication window
+        startElmishLoop window program
+        window.Show()
+        Application.Current.Run window
+
+
+    /// Same as mkProgram, except that init and update don't return Cmd<'msg>
+    /// directly, but instead return a CmdMsg discriminated union that is converted
+    /// to Cmd<'msg> using toCmd. This means that the init and update functions
+    /// return only data, and thus are easier to unit test. The CmdMsg pattern is
+    /// general; this is just a trivial convenience function that automatically
+    /// converts CmdMsg to Cmd<'msg> for you in init and update.
+    let mkProgramWithCmdMsg
+        (init: unit -> 'model * 'cmdMsg list)
+        (update: 'msg -> 'model -> 'model * 'cmdMsg list)
+        (bindings: unit -> Binding<'model, 'msg> list)
+        (toCmd: 'cmdMsg -> Cmd<'msg>)
+        =
+        let convert (model, cmdMsgs) =
+            model, (cmdMsgs |> List.map toCmd |> Cmd.batch)
+
+        mkProgram (init >> convert) (fun msg model -> update msg model |> convert) bindings
+
+
+    /// Same as mkProgramT, except that init and update don't return Cmd<'msg>
+    /// directly, but instead return a CmdMsg discriminated union that is converted
+    /// to Cmd<'msg> using toCmd. This means that the init and update functions
+    /// return only data, and thus are easier to unit test. The CmdMsg pattern is
+    /// general; this is just a trivial convenience function that automatically
+    /// converts CmdMsg to Cmd<'msg> for you in init and update.
+    let mkProgramWithCmdMsgT
+        (init: unit -> 'model * 'cmdMsg list)
+        (update: 'msg -> 'model -> 'model * 'cmdMsg list)
+        (createVm: ViewModelArgs<'model, 'msg> -> 'viewModel)
+        (toCmd: 'cmdMsg -> Cmd<'msg>)
+        =
+        let convert (model, cmdMsgs) =
+            model, (cmdMsgs |> List.map toCmd |> Cmd.batch)
+
+        mkProgramT (init >> convert) (fun msg model -> update msg model |> convert) createVm
+
+
+    /// Uses the specified ILoggerFactory for logging.
+    let withLogger loggerFactory program =
+        { program with
+            LoggerFactory = loggerFactory }
+
+
+    /// Calls the specified function for unhandled exceptions in the Elmish
+    /// dispatch loop (e.g. in commands or the update function). This essentially
+    /// delegates to Elmish's Program.withErrorHandler.
+    ///
+    /// The first (string) argument of onError is a message from Elmish describing
+    /// the context of the exception. Note that this may contain a rendered
+    /// message case with all data ("%A" formatting).
+    ///
+    /// Note that exceptions passed to onError are also logged to the logger
+    /// specified using WpfProgram.withLogger.
+    let withElmishErrorHandler onError program = { program with ErrorHandler = onError }
+
+
+    /// Subscribe to external source of events, overrides existing subscription.
+    /// Return the subscriptions that should be active based on the current model.
+    /// Subscriptions will be started or stopped automatically to match.
+    let withSubscription (subscribe: 'model -> Sub<'msg>) program =
+        { program with
+            ElmishProgram = program.ElmishProgram |> Program.withSubscription subscribe }
+
+
+    /// Map existing subscription to external source of events.
+    let mapSubscription map program =
+        { program with
+            ElmishProgram = program.ElmishProgram |> Program.mapSubscription map }
+
+
+    /// Only logs binding performance for calls taking longer than the specified number of
+    /// milliseconds. The default is 1ms.
+    let withPerformanceLogThreshold threshold program =
+        { program with
+            PerformanceLogThreshold = threshold }
+
+
+    /// Exit criteria and the handler, overrides existing.
+    let withTermination predicate terminate program =
+        { program with
+            ElmishProgram = program.ElmishProgram |> Program.withTermination predicate terminate }
+
+
+    /// Map existing criteria and the handler.
+    let mapTermination map program =
+        { program with
+            ElmishProgram = program.ElmishProgram |> Program.mapTermination map }
 
 
 [<RequireQualifiedAccess>]
 module Subscribe =
 
-  /// Converts an effect to a Subscribe with a given dispose (on stop) method.
-  let ofEffect dispose (effect: Effect<'msg>) : Subscribe<'msg> =
-    fun dispatch ->
-      effect dispatch
-      { new System.IDisposable with member _.Dispose() = dispose () }
+    /// Converts an effect to a Subscribe with a given dispose (on stop) method.
+    let ofEffect dispose (effect: Effect<'msg>) : Subscribe<'msg> =
+        fun dispatch ->
+            effect dispatch
+
+            { new System.IDisposable with
+                member _.Dispose() = dispose () }
 
 
 [<RequireQualifiedAccess>]
 module Sub =
-  /// Subscribe to an external source of events. The subscribe function is called once,
-  /// with the initial model, but can dispatch messages at any time.
-  [<System.Obsolete("Migrate your v3 subscriptions to the new subscriptions with lifetimes and dispose")>]
-  let fromV3Subscription (idPrefix: string) (v3Subscription: 'model -> Cmd<'msg>) : 'model -> Sub<'msg> =
-    let mutable memoizedSub : Sub<'msg> voption = ValueNone
-
-    fun model ->
-      match memoizedSub with
-      | ValueNone ->
-        let sub =
-          v3Subscription model
-          |> List.map (Subscribe.ofEffect id)
-          |> List.indexed
-          |> List.map (fun (i, subscribe) ->
-            [ idPrefix; string i ], subscribe)
-        memoizedSub <- ValueSome sub
-        sub
-      | ValueSome sub -> sub
+    /// Subscribe to an external source of events. The subscribe function is called once,
+    /// with the initial model, but can dispatch messages at any time.
+    [<System.Obsolete("Migrate your v3 subscriptions to the new subscriptions with lifetimes and dispose")>]
+    let fromV3Subscription (idPrefix: string) (v3Subscription: 'model -> Cmd<'msg>) : 'model -> Sub<'msg> =
+        let mutable memoizedSub: Sub<'msg> voption = ValueNone
+
+        fun model ->
+            match memoizedSub with
+            | ValueNone ->
+                let sub =
+                    v3Subscription model
+                    |> List.map (Subscribe.ofEffect id)
+                    |> List.indexed
+                    |> List.map (fun (i, subscribe) -> [ idPrefix; string i ], subscribe)
+
+                memoizedSub <- ValueSome sub
+                sub
+            | ValueSome sub -> sub
\ No newline at end of file
diff --git a/src/Samples/Capabilities.Core/Program.fs b/src/Samples/Capabilities.Core/Program.fs
index cbbdb8db..83a45da4 100644
--- a/src/Samples/Capabilities.Core/Program.fs
+++ b/src/Samples/Capabilities.Core/Program.fs
@@ -10,61 +10,63 @@ open Elmish.WPF
 open Selection
 
 
-type Screen =
-  SelectionScreen
+type Screen = SelectionScreen
 
 type Model =
-  { VisibleScreen: Screen option
-    Selection: Selection }
+    { VisibleScreen: Screen option
+      Selection: Selection }
 
 type Msg =
-  | SetVisibleScreen of Screen option
-  | SelectionMsg of SelectionMsg
+    | SetVisibleScreen of Screen option
+    | SelectionMsg of SelectionMsg
 
 
 module Program =
-  module VisibleScreen =
-    let get m = m.VisibleScreen
-    let set v m = { m with VisibleScreen = v }
-  module Selection =
-    open Selection
-    let get m = m.Selection
-    let set v m = { m with Selection = v }
-    let map = map get set
-    let update = update >> map
-
-  let init =
-    { VisibleScreen = None
-      Selection = Selection.init }
-
-  let update = function
-    | SetVisibleScreen s -> s |> VisibleScreen.set
-    | SelectionMsg msg -> msg |> Selection.update
-
-  let boolToVis = function
-    | true  -> Visibility.Visible
-    | false -> Visibility.Collapsed
-
-  let bindings () = [
-    "Selection"
-      |> Binding.SubModel.required Selection.bindings
-      |> Binding.mapModel Selection.get
-      |> Binding.mapMsg SelectionMsg
-    "ShowSelection" |> Binding.cmd (SelectionScreen |> Some |> SetVisibleScreen)
-    "SelectionVisibility" |> Binding.oneWay (VisibleScreen.get >> (=) (Some SelectionScreen) >> boolToVis)
-  ]
+    module VisibleScreen =
+        let get m = m.VisibleScreen
+        let set v m = { m with VisibleScreen = v }
+
+    module Selection =
+        open Selection
+        let get m = m.Selection
+        let set v m = { m with Selection = v }
+        let map = map get set
+        let update = update >> map
+
+    let init =
+        { VisibleScreen = None
+          Selection = Selection.init }
+
+    let update =
+        function
+        | SetVisibleScreen s -> s |> VisibleScreen.set
+        | SelectionMsg msg -> msg |> Selection.update
+
+    let boolToVis =
+        function
+        | true -> Visibility.Visible
+        | false -> Visibility.Collapsed
+
+    let bindings () =
+        [ "Selection"
+          |> Binding.SubModel.required Selection.bindings
+          |> Binding.mapModel Selection.get
+          |> Binding.mapMsg SelectionMsg
+          "ShowSelection" |> Binding.cmd (SelectionScreen |> Some |> SetVisibleScreen)
+          "SelectionVisibility"
+          |> Binding.oneWay (VisibleScreen.get >> (=) (Some SelectionScreen) >> boolToVis) ]
 
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple (fun () -> Program.init) Program.update Program.bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
\ No newline at end of file
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple (fun () -> Program.init) Program.update Program.bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Capabilities.Core/Selection.fs b/src/Samples/Capabilities.Core/Selection.fs
index 22b09cf2..da249f3a 100644
--- a/src/Samples/Capabilities.Core/Selection.fs
+++ b/src/Samples/Capabilities.Core/Selection.fs
@@ -3,70 +3,73 @@
 open Elmish.WPF
 
 
-type Tree<'a> =
-  { Data: 'a
-    Children: Tree<'a> list }
+type Tree<'a> = { Data: 'a; Children: Tree<'a> list }
 
 module Tree =
-  let create a ma = { Data = a; Children = ma }
-  let createLeaf a = create a []
-  module Data =
-    let get m = m.Data
-  module Children =
-    let get m = m.Children
+    let create a ma = { Data = a; Children = ma }
+    let createLeaf a = create a []
+
+    module Data =
+        let get m = m.Data
+
+    module Children =
+        let get m = m.Children
 
 
 type Selection =
-  { SelectedIndex: int option
-    SelectedIndexData: string list
-    SelectedValue: string option
-    SelectedValueData: Tree<string> list }
+    { SelectedIndex: int option
+      SelectedIndexData: string list
+      SelectedValue: string option
+      SelectedValueData: Tree<string> list }
 
 type SelectionMsg =
-  | SetSelectedIndex of int option
-  | SetSelectedValue of string option
+    | SetSelectedIndex of int option
+    | SetSelectedValue of string option
 
 
 module Selection =
-  module SelectedIndex =
-    let get m = m.SelectedIndex
-    let set v m = { m with SelectedIndex = v }
-  module SelectedIndexData =
-    let get m = m.SelectedIndexData
-  module SelectedValue =
-    let get m = m.SelectedValue
-    let set v m = { m with SelectedValue = v }
-  module SelectedValueData =
-    let get m = m.SelectedValueData
-
-  let init =
-    { SelectedIndex = None
-      SelectedIndexData = ["A"; "B"]
-      SelectedValue = None
-      SelectedValueData =
-        [ Tree.create "A" [ Tree.createLeaf "Aa"; Tree.createLeaf "Ab" ]
-          Tree.create "B" [ Tree.createLeaf "Ba"; Tree.createLeaf "Bb" ] ] }
-
-  let update = function
-    | SetSelectedIndex x -> x |> SelectedIndex.set
-    | SetSelectedValue x -> x |> SelectedValue.set
-
-  let rec recursiveSelectedValueBindings () = [
-    "Data" |> Binding.oneWay Tree.Data.get
-    "SelectedValueChildren"
-      |> Binding.subModelSeq recursiveSelectedValueBindings
-      |> Binding.mapModel (Tree.Children.get >> List.toSeq)
-      |> Binding.mapMsg snd
-  ]
-
-  let bindings () = [
-    "SelectedIndex" |> Binding.selectedIndex (SelectedIndex.get, SetSelectedIndex)
-    "DeselectIndex" |> Binding.cmdIf (SelectedIndex.get >> Option.map (fun _ -> SetSelectedIndex None))
-    "SelectedIndexData" |> Binding.oneWay SelectedIndexData.get
-
-    "SelectedValue" |> Binding.twoWayOpt (SelectedValue.get, SetSelectedValue)
-    "SelectedValueData"
-      |> Binding.subModelSeq recursiveSelectedValueBindings
-      |> Binding.mapModel (SelectedValueData.get >> List.toSeq)
-      |> Binding.mapMsg snd
-  ]
\ No newline at end of file
+    module SelectedIndex =
+        let get m = m.SelectedIndex
+        let set v m = { m with SelectedIndex = v }
+
+    module SelectedIndexData =
+        let get m = m.SelectedIndexData
+
+    module SelectedValue =
+        let get m = m.SelectedValue
+        let set v m = { m with SelectedValue = v }
+
+    module SelectedValueData =
+        let get m = m.SelectedValueData
+
+    let init =
+        { SelectedIndex = None
+          SelectedIndexData = [ "A"; "B" ]
+          SelectedValue = None
+          SelectedValueData =
+            [ Tree.create "A" [ Tree.createLeaf "Aa"; Tree.createLeaf "Ab" ]
+              Tree.create "B" [ Tree.createLeaf "Ba"; Tree.createLeaf "Bb" ] ] }
+
+    let update =
+        function
+        | SetSelectedIndex x -> x |> SelectedIndex.set
+        | SetSelectedValue x -> x |> SelectedValue.set
+
+    let rec recursiveSelectedValueBindings () =
+        [ "Data" |> Binding.oneWay Tree.Data.get
+          "SelectedValueChildren"
+          |> Binding.subModelSeq recursiveSelectedValueBindings
+          |> Binding.mapModel (Tree.Children.get >> List.toSeq)
+          |> Binding.mapMsg snd ]
+
+    let bindings () =
+        [ "SelectedIndex" |> Binding.selectedIndex (SelectedIndex.get, SetSelectedIndex)
+          "DeselectIndex"
+          |> Binding.cmdIf (SelectedIndex.get >> Option.map (fun _ -> SetSelectedIndex None))
+          "SelectedIndexData" |> Binding.oneWay SelectedIndexData.get
+
+          "SelectedValue" |> Binding.twoWayOpt (SelectedValue.get, SetSelectedValue)
+          "SelectedValueData"
+          |> Binding.subModelSeq recursiveSelectedValueBindings
+          |> Binding.mapModel (SelectedValueData.get >> List.toSeq)
+          |> Binding.mapMsg snd ]
\ No newline at end of file
diff --git a/src/Samples/Capabilities.Core/Utilities.fs b/src/Samples/Capabilities.Core/Utilities.fs
index 1732f194..08a2ad46 100644
--- a/src/Samples/Capabilities.Core/Utilities.fs
+++ b/src/Samples/Capabilities.Core/Utilities.fs
@@ -3,5 +3,4 @@ module Utilities
 
 let flip f b a = f a b
 
-let map get set f a =
-  a |> get |> f |> flip set a
\ No newline at end of file
+let map get set f a = a |> get |> f |> flip set a
\ No newline at end of file
diff --git a/src/Samples/EventBindingsAndBehaviors.Core/Program.fs b/src/Samples/EventBindingsAndBehaviors.Core/Program.fs
index 229fd627..31f923ae 100644
--- a/src/Samples/EventBindingsAndBehaviors.Core/Program.fs
+++ b/src/Samples/EventBindingsAndBehaviors.Core/Program.fs
@@ -10,75 +10,80 @@ open Elmish.WPF
 type Position = { X: int; Y: int }
 
 type Model =
-  { Msg1: string
-    Msg2: string
-    ButtonText: string
-    Visibility: Visibility
-    MousePosition: Position }
+    { Msg1: string
+      Msg2: string
+      ButtonText: string
+      Visibility: Visibility
+      MousePosition: Position }
 
 let visibleButtonText = "Hide text box"
 let hiddenButtonText = "Show text box"
 
 let init () =
-  { Msg1 = ""
-    Msg2 = ""
-    ButtonText = visibleButtonText
-    Visibility = Visibility.Visible
-    MousePosition = { X = 0; Y = 0 } }
+    { Msg1 = ""
+      Msg2 = ""
+      ButtonText = visibleButtonText
+      Visibility = Visibility.Visible
+      MousePosition = { X = 0; Y = 0 } }
 
 type Msg =
-  | GotFocus1
-  | GotFocus2
-  | LostFocus1
-  | LostFocus2
-  | ToggleVisibility
-  | NewMousePosition of Position
+    | GotFocus1
+    | GotFocus2
+    | LostFocus1
+    | LostFocus2
+    | ToggleVisibility
+    | NewMousePosition of Position
 
 let update msg m =
-  match msg with
-  | GotFocus1 -> { m with Msg1 = "Focused" }
-  | GotFocus2 -> { m with Msg2 = "Focused" }
-  | LostFocus1 -> { m with Msg1 = "Not focused" }
-  | LostFocus2 -> { m with Msg2 = "Not focused" }
-  | ToggleVisibility ->
-    if m.Visibility = Visibility.Visible
-    then { m with Visibility = Visibility.Hidden; ButtonText = hiddenButtonText }
-    else { m with Visibility = Visibility.Visible; ButtonText = visibleButtonText }
-  | NewMousePosition p -> { m with MousePosition = p }
+    match msg with
+    | GotFocus1 -> { m with Msg1 = "Focused" }
+    | GotFocus2 -> { m with Msg2 = "Focused" }
+    | LostFocus1 -> { m with Msg1 = "Not focused" }
+    | LostFocus2 -> { m with Msg2 = "Not focused" }
+    | ToggleVisibility ->
+        if m.Visibility = Visibility.Visible then
+            { m with
+                Visibility = Visibility.Hidden
+                ButtonText = hiddenButtonText }
+        else
+            { m with
+                Visibility = Visibility.Visible
+                ButtonText = visibleButtonText }
+    | NewMousePosition p -> { m with MousePosition = p }
 
 
 let paramToNewMousePositionMsg (p: obj) =
-  let args = p :?> MouseEventArgs
-  let e = args.OriginalSource :?> UIElement;
-  let point = args.GetPosition e
-  NewMousePosition { X = int point.X; Y = int point.Y }
+    let args = p :?> MouseEventArgs
+    let e = args.OriginalSource :?> UIElement
+    let point = args.GetPosition e
+    NewMousePosition { X = int point.X; Y = int point.Y }
 
-let bindings () : Binding<Model, Msg> list = [
-  "Msg1" |> Binding.oneWay (fun m -> m.Msg1)
-  "Msg2" |> Binding.oneWay (fun m -> m.Msg2)
-  "GotFocus1" |> Binding.cmd GotFocus1
-  "GotFocus2" |> Binding.cmd GotFocus2
-  "LostFocus1" |> Binding.cmd LostFocus1
-  "LostFocus2" |> Binding.cmd LostFocus2
-  "ToggleVisibility" |> Binding.cmd ToggleVisibility
-  "ButtonText" |> Binding.oneWay (fun m -> m.ButtonText)
-  "TextBoxVisibility" |> Binding.oneWay (fun m -> m.Visibility)
-  "MouseMoveCommand" |> Binding.cmdParam paramToNewMousePositionMsg
-  "MousePosition" |> Binding.oneWay (fun m -> sprintf "%dx%d" m.MousePosition.X m.MousePosition.Y)
-]
+let bindings () : Binding<Model, Msg> list =
+    [ "Msg1" |> Binding.oneWay (fun m -> m.Msg1)
+      "Msg2" |> Binding.oneWay (fun m -> m.Msg2)
+      "GotFocus1" |> Binding.cmd GotFocus1
+      "GotFocus2" |> Binding.cmd GotFocus2
+      "LostFocus1" |> Binding.cmd LostFocus1
+      "LostFocus2" |> Binding.cmd LostFocus2
+      "ToggleVisibility" |> Binding.cmd ToggleVisibility
+      "ButtonText" |> Binding.oneWay (fun m -> m.ButtonText)
+      "TextBoxVisibility" |> Binding.oneWay (fun m -> m.Visibility)
+      "MouseMoveCommand" |> Binding.cmdParam paramToNewMousePositionMsg
+      "MousePosition"
+      |> Binding.oneWay (fun m -> sprintf "%dx%d" m.MousePosition.X m.MousePosition.Y) ]
 
 let designVm = ViewModel.designInstance (init ()) (bindings ())
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
 
-  WpfProgram.mkSimple init update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    WpfProgram.mkSimple init update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/FileDialogs.Core/Program.fs b/src/Samples/FileDialogs.Core/Program.fs
index 95f5347e..ebe37a97 100644
--- a/src/Samples/FileDialogs.Core/Program.fs
+++ b/src/Samples/FileDialogs.Core/Program.fs
@@ -9,104 +9,121 @@ open Elmish.WPF
 
 
 type Model =
-  { CurrentTime: DateTimeOffset
-    Text: string
-    StatusMsg: string }
+    { CurrentTime: DateTimeOffset
+      Text: string
+      StatusMsg: string }
 
 
 let init () =
-  { CurrentTime = DateTimeOffset.Now
-    Text = ""
-    StatusMsg = "" },
-  []
+    { CurrentTime = DateTimeOffset.Now
+      Text = ""
+      StatusMsg = "" },
+    []
 
 type Msg =
-  | SetTime of DateTimeOffset
-  | SetText of string
-  | RequestSave
-  | RequestLoad
-  | SaveSuccess
-  | LoadSuccess of string
-  | SaveCanceled
-  | LoadCanceled
-  | SaveFailed of exn
-  | LoadFailed of exn
+    | SetTime of DateTimeOffset
+    | SetText of string
+    | RequestSave
+    | RequestLoad
+    | SaveSuccess
+    | LoadSuccess of string
+    | SaveCanceled
+    | LoadCanceled
+    | SaveFailed of exn
+    | LoadFailed of exn
 
 
 let save text =
-  async {
-    let dlg = Microsoft.Win32.SaveFileDialog ()
-    dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
-    let result = dlg.ShowDialog ()
-    if result.HasValue && result.Value then
-      do! File.WriteAllTextAsync(dlg.FileName, text) |> Async.AwaitTask
-      return SaveSuccess
-    else return SaveCanceled
-  }
+    async {
+        let dlg = Microsoft.Win32.SaveFileDialog()
+        dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+        let result = dlg.ShowDialog()
+
+        if result.HasValue && result.Value then
+            do! File.WriteAllTextAsync(dlg.FileName, text) |> Async.AwaitTask
+            return SaveSuccess
+        else
+            return SaveCanceled
+    }
 
 
 let load () =
-  async {
-    let dlg = Microsoft.Win32.OpenFileDialog ()
-    dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
-    dlg.DefaultExt <- "txt"
-    let result = dlg.ShowDialog ()
-    if result.HasValue && result.Value then
-      let! contents = File.ReadAllTextAsync(dlg.FileName) |> Async.AwaitTask
-      return LoadSuccess contents
-    else return LoadCanceled
-  }
+    async {
+        let dlg = Microsoft.Win32.OpenFileDialog()
+        dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+        dlg.DefaultExt <- "txt"
+        let result = dlg.ShowDialog()
+
+        if result.HasValue && result.Value then
+            let! contents = File.ReadAllTextAsync(dlg.FileName) |> Async.AwaitTask
+            return LoadSuccess contents
+        else
+            return LoadCanceled
+    }
 
 
 let update msg m =
-  match msg with
-  | SetTime t -> { m with CurrentTime = t }, Cmd.none
-  | SetText s -> { m with Text = s}, Cmd.none
-  | RequestSave -> m, Cmd.OfAsync.either save m.Text id SaveFailed
-  | RequestLoad -> m, Cmd.OfAsync.either load () id LoadFailed
-  | SaveSuccess -> { m with StatusMsg = sprintf "Successfully saved at %O" DateTimeOffset.Now }, Cmd.none
-  | LoadSuccess s -> { m with Text = s; StatusMsg = sprintf "Successfully loaded at %O" DateTimeOffset.Now }, Cmd.none
-  | SaveCanceled -> { m with StatusMsg = "Saving canceled" }, Cmd.none
-  | LoadCanceled -> { m with StatusMsg = "Loading canceled" }, Cmd.none
-  | SaveFailed ex -> { m with StatusMsg = sprintf "Saving failed with exception %s: %s" (ex.GetType().Name) ex.Message }, Cmd.none
-  | LoadFailed ex -> { m with StatusMsg = sprintf "Loading failed with exception %s: %s" (ex.GetType().Name) ex.Message }, Cmd.none
-
-
-let bindings () : Binding<Model, Msg> list = [
-  "CurrentTime" |> Binding.oneWay (fun m -> m.CurrentTime)
-  "Text" |> Binding.twoWay ((fun m -> m.Text), SetText)
-  "StatusMsg" |> Binding.twoWay ((fun m -> m.StatusMsg), SetText)
-  "Save" |> Binding.cmd RequestSave
-  "Load" |> Binding.cmd RequestLoad
-]
+    match msg with
+    | SetTime t -> { m with CurrentTime = t }, Cmd.none
+    | SetText s -> { m with Text = s }, Cmd.none
+    | RequestSave -> m, Cmd.OfAsync.either save m.Text id SaveFailed
+    | RequestLoad -> m, Cmd.OfAsync.either load () id LoadFailed
+    | SaveSuccess ->
+        { m with
+            StatusMsg = sprintf "Successfully saved at %O" DateTimeOffset.Now },
+        Cmd.none
+    | LoadSuccess s ->
+        { m with
+            Text = s
+            StatusMsg = sprintf "Successfully loaded at %O" DateTimeOffset.Now },
+        Cmd.none
+    | SaveCanceled -> { m with StatusMsg = "Saving canceled" }, Cmd.none
+    | LoadCanceled ->
+        { m with
+            StatusMsg = "Loading canceled" },
+        Cmd.none
+    | SaveFailed ex ->
+        { m with
+            StatusMsg = sprintf "Saving failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+        Cmd.none
+    | LoadFailed ex ->
+        { m with
+            StatusMsg = sprintf "Loading failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+        Cmd.none
+
+
+let bindings () : Binding<Model, Msg> list =
+    [ "CurrentTime" |> Binding.oneWay (fun m -> m.CurrentTime)
+      "Text" |> Binding.twoWay ((fun m -> m.Text), SetText)
+      "StatusMsg" |> Binding.twoWay ((fun m -> m.StatusMsg), SetText)
+      "Save" |> Binding.cmd RequestSave
+      "Load" |> Binding.cmd RequestLoad ]
 
 
 let designVm = ViewModel.designInstance (init () |> fst) (bindings ())
 
 
 let subscriptions (model: Model) : Sub<Msg> =
-  let timerTickSub dispatch =
-    let timer = new Timers.Timer(1000.)
-    let disp = timer.Elapsed.Subscribe(fun _ -> dispatch (SetTime DateTimeOffset.Now))
-    timer.Start()
-    disp
+    let timerTickSub dispatch =
+        let timer = new Timers.Timer(1000.)
+        let disp = timer.Elapsed.Subscribe(fun _ -> dispatch (SetTime DateTimeOffset.Now))
+        timer.Start()
+        disp
 
-  [
-    [ nameof timerTickSub ], timerTickSub
-  ]
+    [ [ nameof timerTickSub ], timerTickSub ]
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
 
 
-  WpfProgram.mkProgram init update bindings
-  |> WpfProgram.withSubscription subscriptions
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    WpfProgram.mkProgram init update bindings
+    |> WpfProgram.withSubscription subscriptions
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/FileDialogsCmdMsg.Core/Program.fs b/src/Samples/FileDialogsCmdMsg.Core/Program.fs
index 8f19a5ae..29ecbb20 100644
--- a/src/Samples/FileDialogsCmdMsg.Core/Program.fs
+++ b/src/Samples/FileDialogsCmdMsg.Core/Program.fs
@@ -10,94 +10,114 @@ open Elmish.WPF
 module Core =
 
 
-  type Model =
-    { CurrentTime: DateTimeOffset
-      Text: string
-      StatusMsg: string }
-
-
-  type CmdMsg =
-    | Save of string
-    | Load
-
-
-  let init () =
-    { CurrentTime = DateTimeOffset.Now
-      Text = ""
-      StatusMsg = "" },
-    []
-
-  type Msg =
-    | SetTime of DateTimeOffset
-    | SetText of string
-    | RequestSave
-    | RequestLoad
-    | SaveSuccess
-    | LoadSuccess of string
-    | SaveCanceled
-    | LoadCanceled
-    | SaveFailed of exn
-    | LoadFailed of exn
-
-
-  let update msg m =
-    match msg with
-    | SetTime t -> { m with CurrentTime = t }, []
-    | SetText s -> { m with Text = s}, []
-    | RequestSave -> m, [Save m.Text]
-    | RequestLoad -> m, [Load]
-    | SaveSuccess -> { m with StatusMsg = sprintf "Successfully saved at %O" DateTimeOffset.Now }, []
-    | LoadSuccess s -> { m with Text = s; StatusMsg = sprintf "Successfully loaded at %O" DateTimeOffset.Now }, []
-    | SaveCanceled -> { m with StatusMsg = "Saving canceled" }, []
-    | LoadCanceled -> { m with StatusMsg = "Loading canceled" }, []
-    | SaveFailed ex -> { m with StatusMsg = sprintf "Saving failed with exception %s: %s" (ex.GetType().Name) ex.Message }, []
-    | LoadFailed ex -> { m with StatusMsg = sprintf "Loading failed with exception %s: %s" (ex.GetType().Name) ex.Message }, []
+    type Model =
+        { CurrentTime: DateTimeOffset
+          Text: string
+          StatusMsg: string }
+
+
+    type CmdMsg =
+        | Save of string
+        | Load
+
+
+    let init () =
+        { CurrentTime = DateTimeOffset.Now
+          Text = ""
+          StatusMsg = "" },
+        []
+
+    type Msg =
+        | SetTime of DateTimeOffset
+        | SetText of string
+        | RequestSave
+        | RequestLoad
+        | SaveSuccess
+        | LoadSuccess of string
+        | SaveCanceled
+        | LoadCanceled
+        | SaveFailed of exn
+        | LoadFailed of exn
+
+
+    let update msg m =
+        match msg with
+        | SetTime t -> { m with CurrentTime = t }, []
+        | SetText s -> { m with Text = s }, []
+        | RequestSave -> m, [ Save m.Text ]
+        | RequestLoad -> m, [ Load ]
+        | SaveSuccess ->
+            { m with
+                StatusMsg = sprintf "Successfully saved at %O" DateTimeOffset.Now },
+            []
+        | LoadSuccess s ->
+            { m with
+                Text = s
+                StatusMsg = sprintf "Successfully loaded at %O" DateTimeOffset.Now },
+            []
+        | SaveCanceled -> { m with StatusMsg = "Saving canceled" }, []
+        | LoadCanceled ->
+            { m with
+                StatusMsg = "Loading canceled" },
+            []
+        | SaveFailed ex ->
+            { m with
+                StatusMsg = sprintf "Saving failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+            []
+        | LoadFailed ex ->
+            { m with
+                StatusMsg = sprintf "Loading failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+            []
 
 
 
 module Platform =
 
-  open System.IO
-  open Core
+    open System.IO
+    open Core
 
 
-  let bindings () : Binding<Model, Msg> list = [
-    "CurrentTime" |> Binding.oneWay (fun m -> m.CurrentTime)
-    "Text" |> Binding.twoWay ((fun m -> m.Text), SetText)
-    "StatusMsg" |> Binding.twoWay ((fun m -> m.StatusMsg), SetText)
-    "Save" |> Binding.cmd RequestSave
-    "Load" |> Binding.cmd RequestLoad
-  ]
+    let bindings () : Binding<Model, Msg> list =
+        [ "CurrentTime" |> Binding.oneWay (fun m -> m.CurrentTime)
+          "Text" |> Binding.twoWay ((fun m -> m.Text), SetText)
+          "StatusMsg" |> Binding.twoWay ((fun m -> m.StatusMsg), SetText)
+          "Save" |> Binding.cmd RequestSave
+          "Load" |> Binding.cmd RequestLoad ]
 
 
-  let save text =
-    async {
-      let dlg = Microsoft.Win32.SaveFileDialog ()
-      dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
-      let result = dlg.ShowDialog ()
-      if result.HasValue && result.Value then
-        do! File.WriteAllTextAsync(dlg.FileName, text) |> Async.AwaitTask
-        return SaveSuccess
-      else return SaveCanceled
-    }
+    let save text =
+        async {
+            let dlg = Microsoft.Win32.SaveFileDialog()
+            dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+            let result = dlg.ShowDialog()
 
+            if result.HasValue && result.Value then
+                do! File.WriteAllTextAsync(dlg.FileName, text) |> Async.AwaitTask
+                return SaveSuccess
+            else
+                return SaveCanceled
+        }
 
-  let load () =
-    async {
-      let dlg = Microsoft.Win32.OpenFileDialog ()
-      dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
-      dlg.DefaultExt <- "txt"
-      let result = dlg.ShowDialog ()
-      if result.HasValue && result.Value then
-        let! contents = File.ReadAllTextAsync(dlg.FileName) |> Async.AwaitTask
-        return LoadSuccess contents
-      else return LoadCanceled
-    }
 
+    let load () =
+        async {
+            let dlg = Microsoft.Win32.OpenFileDialog()
+            dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+            dlg.DefaultExt <- "txt"
+            let result = dlg.ShowDialog()
 
-  let toCmd = function
-    | Save text -> Cmd.OfAsync.either save text id SaveFailed
-    | Load -> Cmd.OfAsync.either load () id LoadFailed
+            if result.HasValue && result.Value then
+                let! contents = File.ReadAllTextAsync(dlg.FileName) |> Async.AwaitTask
+                return LoadSuccess contents
+            else
+                return LoadCanceled
+        }
+
+
+    let toCmd =
+        function
+        | Save text -> Cmd.OfAsync.either save text id SaveFailed
+        | Load -> Cmd.OfAsync.either load () id LoadFailed
 
 
 
@@ -108,26 +128,24 @@ open Platform
 let designVm = ViewModel.designInstance (init () |> fst) (bindings ())
 
 let subscriptions (_model: Model) : Sub<Msg> =
-  let timerTickSub (dispatch: Msg -> unit): IDisposable =
-    let timer = new Timers.Timer(1000.)
-    let disp = timer.Elapsed.Subscribe(fun _ -> dispatch (SetTime DateTimeOffset.Now))
-    timer.Start()
-    disp
+    let timerTickSub (dispatch: Msg -> unit) : IDisposable =
+        let timer = new Timers.Timer(1000.)
+        let disp = timer.Elapsed.Subscribe(fun _ -> dispatch (SetTime DateTimeOffset.Now))
+        timer.Start()
+        disp
 
-  [
-    [ nameof timerTickSub ], timerTickSub
-  ]
+    [ [ nameof timerTickSub ], timerTickSub ]
 
 let main window =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkProgramWithCmdMsg init update bindings toCmd
-  |> WpfProgram.withSubscription subscriptions
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkProgramWithCmdMsg init update bindings toCmd
+    |> WpfProgram.withSubscription subscriptions
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Multiselect.Core/Program.fs b/src/Samples/Multiselect.Core/Program.fs
index 4aa7581d..9df84ca8 100644
--- a/src/Samples/Multiselect.Core/Program.fs
+++ b/src/Samples/Multiselect.Core/Program.fs
@@ -6,52 +6,73 @@ open Serilog.Extensions.Logging
 open Elmish.WPF
 
 type Entity =
-  { Id: int
-    Name: string
-    IsSelected: bool }
+    { Id: int
+      Name: string
+      IsSelected: bool }
 
-type Model =
-  { Entities: Entity list }
+type Model = { Entities: Entity list }
 
 let init () =
-  { Entities = [0 .. 10] |> List.map (fun i -> { Id = i; Name = sprintf "Entity %i" i; IsSelected = i < 5 }) }
+    { Entities =
+        [ 0..10 ]
+        |> List.map (fun i ->
+            { Id = i
+              Name = sprintf "Entity %i" i
+              IsSelected = i < 5 }) }
 
 type Msg =
-  | SetIsSelected of int * bool
-  | DeselectAll
+    | SetIsSelected of int * bool
+    | DeselectAll
 
 let update msg m =
-  match msg with
-  | SetIsSelected (entityId, isSelected) -> { m with Entities = m.Entities |> List.map (fun e -> if e.Id = entityId then { e with IsSelected = isSelected } else e) }
-  | DeselectAll -> { m with Entities = m.Entities |> List.map (fun e -> { e with IsSelected = false }) }
-
-let bindings () : Binding<Model, Msg> list = [
-  "SelectRandom" |> Binding.cmd
-    (fun m -> m.Entities.Item(Random().Next(m.Entities.Length)).Id |> (fun id -> SetIsSelected (id, true)))
-
-  "Deselect" |> Binding.cmd DeselectAll
-
-  "Entities" |> Binding.subModelSeq
-    ( fun m -> m.Entities
-    , fun e -> e.Id
-    , fun () -> [
-      "Name" |> Binding.oneWay (fun (_, e) -> e.Name)
-      "IsSelected" |> Binding.twoWay ((fun (_, e) -> e.IsSelected), (fun isSelected (_, e) -> SetIsSelected (e.Id, isSelected)))
-      "SelectedLabel" |> Binding.oneWay (fun (_, e) -> if e.IsSelected then " - SELECTED" else "")
-    ] )
-]
+    match msg with
+    | SetIsSelected(entityId, isSelected) ->
+        { m with
+            Entities =
+                m.Entities
+                |> List.map (fun e ->
+                    if e.Id = entityId then
+                        { e with IsSelected = isSelected }
+                    else
+                        e) }
+    | DeselectAll ->
+        { m with
+            Entities = m.Entities |> List.map (fun e -> { e with IsSelected = false }) }
+
+let bindings () : Binding<Model, Msg> list =
+    [ "SelectRandom"
+      |> Binding.cmd (fun m ->
+          m.Entities.Item(Random().Next(m.Entities.Length)).Id
+          |> (fun id -> SetIsSelected(id, true)))
+
+      "Deselect" |> Binding.cmd DeselectAll
+
+      "Entities"
+      |> Binding.subModelSeq (
+          fun m -> m.Entities
+          , fun e -> e.Id
+          , fun () ->
+              [ "Name" |> Binding.oneWay (fun (_, e) -> e.Name)
+                "IsSelected"
+                |> Binding.twoWay (
+                    (fun (_, e) -> e.IsSelected),
+                    (fun isSelected (_, e) -> SetIsSelected(e.Id, isSelected))
+                )
+                "SelectedLabel"
+                |> Binding.oneWay (fun (_, e) -> if e.IsSelected then " - SELECTED" else "") ]
+      ) ]
 
 let designVm = ViewModel.designInstance (init ()) (bindings ())
 
 let main window =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple init update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
\ No newline at end of file
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple init update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/NewWindow.Core/App.fs b/src/Samples/NewWindow.Core/App.fs
index 2a2c5c65..4ffa6678 100644
--- a/src/Samples/NewWindow.Core/App.fs
+++ b/src/Samples/NewWindow.Core/App.fs
@@ -9,64 +9,72 @@ open Window2Module
 
 
 type App =
-  { Window1: WindowState<string>
-    Window2: Window2 option }
+    { Window1: WindowState<string>
+      Window2: Window2 option }
 
 type AppMsg =
-  | Window1Show
-  | Window1Hide
-  | Window1Close
-  | Window1SetInput of string
-  | Window2Show
-  | Window2Close
-  | Window2Msg of Window2Msg
+    | Window1Show
+    | Window1Hide
+    | Window1Close
+    | Window1SetInput of string
+    | Window2Show
+    | Window2Close
+    | Window2Msg of Window2Msg
 
 
 module App =
-  module Window1 =
-    let get m = m.Window1
-    let set v m = { m with Window1 = v }
-    let map = map get set
-  module Window2 =
-    let get m = m.Window2
-    let set v m = { m with Window2 = v }
-    let map = map get set
-    let mapOutMsg = function
-      | Window2OutMsg.Close -> Window2Close
-    let mapInOutMsg = InOut.cata Window2Msg mapOutMsg
+    module Window1 =
+        let get m = m.Window1
+        let set v m = { m with Window1 = v }
+        let map = map get set
 
-  let init =
-    { Window1 = WindowState.Closed
-      Window2 = None }
+    module Window2 =
+        let get m = m.Window2
+        let set v m = { m with Window2 = v }
+        let map = map get set
 
-  let update = function
-    | Window1Show -> "" |> WindowState.toVisible |> Window1.map
-    | Window1Hide -> "" |> WindowState.toHidden  |> Window1.map
-    | Window1Close -> WindowState.Closed |> Window1.set
-    | Window1SetInput s -> s |> WindowState.set |> Window1.map
-    | Window2Show -> Window2.init |> Some |> Window2.set
-    | Window2Close -> None |> Window2.set
-    | Window2Msg msg -> msg |> Window2.update |> Option.map |> Window2.map
+        let mapOutMsg =
+            function
+            | Window2OutMsg.Close -> Window2Close
 
-  let bindings (createWindow1: unit -> #Window) (createWindow2: unit -> #Window) () = [
-    "Window1Show" |> Binding.cmd Window1Show
-    "Window1Hide" |> Binding.cmd Window1Hide
-    "Window1Close" |> Binding.cmd Window1Close
-    "Window2Show" |> Binding.cmd Window2Show
-    "Window1" |> Binding.subModelWin(
-      (fun m -> m.Window1),
-      snd,
-      id,
-      Window1.bindings >> Bindings.mapMsg Window1SetInput,
-      createWindow1)
-    "Window2" |> Binding.subModelWin(
-      Window2.get >> WindowState.ofOption,
-      snd,
-      Window2.mapInOutMsg,
-      Window2.bindings,
-      createWindow2,
-      isModal = true)
-  ]
+        let mapInOutMsg = InOut.cata Window2Msg mapOutMsg
+
+    let init =
+        { Window1 = WindowState.Closed
+          Window2 = None }
+
+    let update =
+        function
+        | Window1Show -> "" |> WindowState.toVisible |> Window1.map
+        | Window1Hide -> "" |> WindowState.toHidden |> Window1.map
+        | Window1Close -> WindowState.Closed |> Window1.set
+        | Window1SetInput s -> s |> WindowState.set |> Window1.map
+        | Window2Show -> Window2.init |> Some |> Window2.set
+        | Window2Close -> None |> Window2.set
+        | Window2Msg msg -> msg |> Window2.update |> Option.map |> Window2.map
+
+    let bindings (createWindow1: unit -> #Window) (createWindow2: unit -> #Window) () =
+        [ "Window1Show" |> Binding.cmd Window1Show
+          "Window1Hide" |> Binding.cmd Window1Hide
+          "Window1Close" |> Binding.cmd Window1Close
+          "Window2Show" |> Binding.cmd Window2Show
+          "Window1"
+          |> Binding.subModelWin (
+              (fun m -> m.Window1),
+              snd,
+              id,
+              Window1.bindings >> Bindings.mapMsg Window1SetInput,
+              createWindow1
+          )
+          "Window2"
+          |> Binding.subModelWin (
+              Window2.get >> WindowState.ofOption,
+              snd,
+              Window2.mapInOutMsg,
+              Window2.bindings,
+              createWindow2,
+              isModal = true
+          ) ]
 
 let private fail _ = failwith "never called"
 let designVm = ViewModel.designInstance App.init (App.bindings fail fail ())
\ No newline at end of file
diff --git a/src/Samples/NewWindow.Core/AutoOpen.fs b/src/Samples/NewWindow.Core/AutoOpen.fs
index e1054f12..3253ea04 100644
--- a/src/Samples/NewWindow.Core/AutoOpen.fs
+++ b/src/Samples/NewWindow.Core/AutoOpen.fs
@@ -4,29 +4,31 @@ module AutoOpen
 
 let flip f b a = f a b
 
-let map get set f a =
-  a |> get |> f |> flip set a
+let map get set f a = a |> get |> f |> flip set a
 
 
 [<RequireQualifiedAccess>]
 module Bool =
-  open System.Windows
-  let toVisibilityCollapsed = function
-    | true  -> Visibility.Visible
-    | false -> Visibility.Collapsed
+    open System.Windows
+
+    let toVisibilityCollapsed =
+        function
+        | true -> Visibility.Visible
+        | false -> Visibility.Collapsed
 
 
 [<AutoOpen>]
 module InOutModule =
 
-  [<RequireQualifiedAccess>]
-  type InOut<'a, 'b> =
-    | In of 'a
-    | Out of 'b
+    [<RequireQualifiedAccess>]
+    type InOut<'a, 'b> =
+        | In of 'a
+        | Out of 'b
 
-  [<RequireQualifiedAccess>]
-  module InOut =
+    [<RequireQualifiedAccess>]
+    module InOut =
 
-    let cata f g = function
-      | InOut.In  msg -> msg |> f
-      | InOut.Out msg -> msg |> g
+        let cata f g =
+            function
+            | InOut.In msg -> msg |> f
+            | InOut.Out msg -> msg |> g
\ No newline at end of file
diff --git a/src/Samples/NewWindow.Core/Program.fs b/src/Samples/NewWindow.Core/Program.fs
index 949342f2..a6d9a922 100644
--- a/src/Samples/NewWindow.Core/Program.fs
+++ b/src/Samples/NewWindow.Core/Program.fs
@@ -12,21 +12,24 @@ open AppModule
 
 
 let main mainWindow (createWindow1: Func<#Window>) (createWindow2: Func<#Window>) =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-  let createWindow1 () = createWindow1.Invoke()
-  let createWindow2 () =
-    let window = createWindow2.Invoke()
-    window.Owner <- mainWindow
-    window
-
-  let init () = App.init
-  let bindings = App.bindings createWindow1 createWindow2
-  WpfProgram.mkSimple init App.update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop mainWindow
\ No newline at end of file
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createWindow1 () = createWindow1.Invoke()
+
+    let createWindow2 () =
+        let window = createWindow2.Invoke()
+        window.Owner <- mainWindow
+        window
+
+    let init () = App.init
+    let bindings = App.bindings createWindow1 createWindow2
+
+    WpfProgram.mkSimple init App.update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop mainWindow
\ No newline at end of file
diff --git a/src/Samples/NewWindow.Core/Window1.fs b/src/Samples/NewWindow.Core/Window1.fs
index 9637b7b1..d6b5494a 100644
--- a/src/Samples/NewWindow.Core/Window1.fs
+++ b/src/Samples/NewWindow.Core/Window1.fs
@@ -4,10 +4,8 @@ open Elmish.WPF
 
 
 module Window1 =
-  let init = ""
+    let init = ""
 
-  let bindings () = [
-    "Input" |> Binding.twoWay (id, id)
-  ]
+    let bindings () = [ "Input" |> Binding.twoWay (id, id) ]
 
 let designVm = ViewModel.designInstance Window1.init (Window1.bindings ())
\ No newline at end of file
diff --git a/src/Samples/NewWindow.Core/Window2.fs b/src/Samples/NewWindow.Core/Window2.fs
index dff422f6..a91b9403 100644
--- a/src/Samples/NewWindow.Core/Window2.fs
+++ b/src/Samples/NewWindow.Core/Window2.fs
@@ -5,71 +5,76 @@ open Elmish.WPF
 
 [<RequireQualifiedAccess>]
 type ConfirmState =
-  | Submit
-  | Cancel
-  | Close
+    | Submit
+    | Cancel
+    | Close
 
 type Window2 =
-  { Input: string
-    IsChecked: bool
-    ConfirmState: ConfirmState option }
+    { Input: string
+      IsChecked: bool
+      ConfirmState: ConfirmState option }
 
 type Window2Msg =
-  | SetInput of string
-  | SetChecked of bool
-  | Submit
-  | Cancel
-  | Close
+    | SetInput of string
+    | SetChecked of bool
+    | Submit
+    | Cancel
+    | Close
 
 [<RequireQualifiedAccess>]
-type Window2OutMsg =
-  | Close
+type Window2OutMsg = | Close
 
 
 module Window2 =
-  module Input =
-    let get m = m.Input
-    let set v m = { m with Input = v }
-  module IsChecked =
-    let get m = m.IsChecked
-    let set v m = { m with IsChecked = v }
-  module ConfirmState =
-    let set v m = { m with ConfirmState = v }
-
-  let init =
-    { Input = ""
-      IsChecked = false
-      ConfirmState = None }
-
-  let update = function
-    | SetInput s -> s |> Input.set
-    | SetChecked b -> b |> IsChecked.set
-    | Submit -> ConfirmState.Submit |> Some |> ConfirmState.set
-    | Cancel -> ConfirmState.Cancel |> Some |> ConfirmState.set
-    | Close  -> ConfirmState.Close  |> Some |> ConfirmState.set
-
-  let private confirmStateVisibilityBinding confirmState =
-    fun m -> m.ConfirmState = Some confirmState
-    >> Bool.toVisibilityCollapsed
-    |> Binding.oneWay
-
-  let private confirmStateToMsg confirmState msg m =
-    if m.ConfirmState = Some confirmState
-    then InOut.Out Window2OutMsg.Close
-    else InOut.In msg
-
-  let bindings () =
-    let inBindings =
-      [ "Input" |> Binding.twoWay (Input.get, SetInput)
-        "IsChecked" |> Binding.twoWay (IsChecked.get, SetChecked)
-        "SubmitMsgVisibility" |> confirmStateVisibilityBinding ConfirmState.Submit
-        "CancelMsgVisibility" |> confirmStateVisibilityBinding ConfirmState.Cancel
-        "CloseMsgVisibility"  |> confirmStateVisibilityBinding ConfirmState.Close ]
-      |> Bindings.mapMsg InOut.In
-    let inOutBindings =
-      [ "Submit" |> Binding.cmd (confirmStateToMsg ConfirmState.Submit Submit)
-        "Cancel" |> Binding.cmd (confirmStateToMsg ConfirmState.Cancel Cancel)
-        "Close"  |> Binding.cmd (confirmStateToMsg ConfirmState.Close  Close) ]
-    inBindings @ inOutBindings
+    module Input =
+        let get m = m.Input
+        let set v m = { m with Input = v }
+
+    module IsChecked =
+        let get m = m.IsChecked
+        let set v m = { m with IsChecked = v }
+
+    module ConfirmState =
+        let set v m = { m with ConfirmState = v }
+
+    let init =
+        { Input = ""
+          IsChecked = false
+          ConfirmState = None }
+
+    let update =
+        function
+        | SetInput s -> s |> Input.set
+        | SetChecked b -> b |> IsChecked.set
+        | Submit -> ConfirmState.Submit |> Some |> ConfirmState.set
+        | Cancel -> ConfirmState.Cancel |> Some |> ConfirmState.set
+        | Close -> ConfirmState.Close |> Some |> ConfirmState.set
+
+    let private confirmStateVisibilityBinding confirmState =
+        fun m -> m.ConfirmState = Some confirmState
+        >> Bool.toVisibilityCollapsed
+        |> Binding.oneWay
+
+    let private confirmStateToMsg confirmState msg m =
+        if m.ConfirmState = Some confirmState then
+            InOut.Out Window2OutMsg.Close
+        else
+            InOut.In msg
+
+    let bindings () =
+        let inBindings =
+            [ "Input" |> Binding.twoWay (Input.get, SetInput)
+              "IsChecked" |> Binding.twoWay (IsChecked.get, SetChecked)
+              "SubmitMsgVisibility" |> confirmStateVisibilityBinding ConfirmState.Submit
+              "CancelMsgVisibility" |> confirmStateVisibilityBinding ConfirmState.Cancel
+              "CloseMsgVisibility" |> confirmStateVisibilityBinding ConfirmState.Close ]
+            |> Bindings.mapMsg InOut.In
+
+        let inOutBindings =
+            [ "Submit" |> Binding.cmd (confirmStateToMsg ConfirmState.Submit Submit)
+              "Cancel" |> Binding.cmd (confirmStateToMsg ConfirmState.Cancel Cancel)
+              "Close" |> Binding.cmd (confirmStateToMsg ConfirmState.Close Close) ]
+
+        inBindings @ inOutBindings
 
 let designVm = ViewModel.designInstance Window2.init (Window2.bindings ())
\ No newline at end of file
diff --git a/src/Samples/OneWaySeq.Core/Program.fs b/src/Samples/OneWaySeq.Core/Program.fs
index eba678a1..56b8c71e 100644
--- a/src/Samples/OneWaySeq.Core/Program.fs
+++ b/src/Samples/OneWaySeq.Core/Program.fs
@@ -6,41 +6,44 @@ open Elmish.WPF
 
 
 type Model =
-  { OneWaySeqNumbers: int list
-    OneWayNumbers: int list }
+    { OneWaySeqNumbers: int list
+      OneWayNumbers: int list }
 
 let init () =
-  { OneWaySeqNumbers = [ 1000..-1..1 ]
-    OneWayNumbers = [ 1000..-1..1 ] }
+    { OneWaySeqNumbers = [ 1000..-1..1 ]
+      OneWayNumbers = [ 1000..-1..1 ] }
 
 type Msg =
-  | AddOneWaySeqNumber
-  | AddOneWayNumber
+    | AddOneWaySeqNumber
+    | AddOneWayNumber
 
 let update msg m =
-  match msg with
-  | AddOneWaySeqNumber -> { m with OneWaySeqNumbers = m.OneWaySeqNumbers.Head + 1 :: m.OneWaySeqNumbers }
-  | AddOneWayNumber -> { m with OneWayNumbers = m.OneWayNumbers.Head + 1 :: m.OneWayNumbers }
-
-let bindings () : Binding<Model, Msg> list = [
-  "OneWaySeqNumbers" |> Binding.oneWaySeq((fun m -> m.OneWaySeqNumbers), (=), id)
-  "OneWayNumbers" |> Binding.oneWay (fun m -> m.OneWayNumbers)
-  "AddOneWaySeqNumber" |> Binding.cmd AddOneWaySeqNumber
-  "AddOneWayNumber" |> Binding.cmd AddOneWayNumber
-]
+    match msg with
+    | AddOneWaySeqNumber ->
+        { m with
+            OneWaySeqNumbers = m.OneWaySeqNumbers.Head + 1 :: m.OneWaySeqNumbers }
+    | AddOneWayNumber ->
+        { m with
+            OneWayNumbers = m.OneWayNumbers.Head + 1 :: m.OneWayNumbers }
+
+let bindings () : Binding<Model, Msg> list =
+    [ "OneWaySeqNumbers" |> Binding.oneWaySeq ((fun m -> m.OneWaySeqNumbers), (=), id)
+      "OneWayNumbers" |> Binding.oneWay (fun m -> m.OneWayNumbers)
+      "AddOneWaySeqNumber" |> Binding.cmd AddOneWaySeqNumber
+      "AddOneWayNumber" |> Binding.cmd AddOneWayNumber ]
 
 let designVm = ViewModel.designInstance (init ()) (bindings ())
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple init update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple init update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/SingleCounter.Core/Program.fs b/src/Samples/SingleCounter.Core/Program.fs
index 3033ae91..059a272a 100644
--- a/src/Samples/SingleCounter.Core/Program.fs
+++ b/src/Samples/SingleCounter.Core/Program.fs
@@ -4,51 +4,44 @@ open Serilog
 open Serilog.Extensions.Logging
 open Elmish.WPF
 
-type Model =
-  { Count: int
-    StepSize: int }
+type Model = { Count: int; StepSize: int }
 
 type Msg =
-  | Increment
-  | Decrement
-  | SetStepSize of int
-  | Reset
+    | Increment
+    | Decrement
+    | SetStepSize of int
+    | Reset
 
-let init =
-  { Count = 0
-    StepSize = 1 }
+let init = { Count = 0; StepSize = 1 }
 
 let canReset = (<>) init
 
 let update msg m =
-  match msg with
-  | Increment -> { m with Count = m.Count + m.StepSize }
-  | Decrement -> { m with Count = m.Count - m.StepSize }
-  | SetStepSize x -> { m with StepSize = x }
-  | Reset -> init
-
-let bindings () : Binding<Model, Msg> list = [
-  "CounterValue" |> Binding.oneWay (fun m -> m.Count)
-  "Increment" |> Binding.cmd Increment
-  "Decrement" |> Binding.cmd Decrement
-  "StepSize" |> Binding.twoWay(
-    (fun m -> float m.StepSize),
-    int >> SetStepSize)
-  "Reset" |> Binding.cmdIf(Reset, canReset)
-]
+    match msg with
+    | Increment -> { m with Count = m.Count + m.StepSize }
+    | Decrement -> { m with Count = m.Count - m.StepSize }
+    | SetStepSize x -> { m with StepSize = x }
+    | Reset -> init
+
+let bindings () : Binding<Model, Msg> list =
+    [ "CounterValue" |> Binding.oneWay (fun m -> m.Count)
+      "Increment" |> Binding.cmd Increment
+      "Decrement" |> Binding.cmd Decrement
+      "StepSize" |> Binding.twoWay ((fun m -> float m.StepSize), int >> SetStepSize)
+      "Reset" |> Binding.cmdIf (Reset, canReset) ]
 
 let designVm = ViewModel.designInstance init (bindings ())
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple (fun () -> init) update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple (fun () -> init) update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Sticky.Core/Program.fs b/src/Samples/Sticky.Core/Program.fs
index 5bed469e..727bcf6b 100644
--- a/src/Samples/Sticky.Core/Program.fs
+++ b/src/Samples/Sticky.Core/Program.fs
@@ -4,54 +4,47 @@ open Serilog
 open Serilog.Extensions.Logging
 open Elmish.WPF
 
-type Model =
-  { Count: int
-    StepSize: int }
+type Model = { Count: int; StepSize: int }
 
 type Msg =
-  | Increment
-  | Decrement
-  | SetStepSize of int
-  | Reset
+    | Increment
+    | Decrement
+    | SetStepSize of int
+    | Reset
 
-let init =
-  { Count = 0
-    StepSize = 1 }
+let init = { Count = 0; StepSize = 1 }
 
 let canReset = (<>) init
 
 let update msg m =
-  match msg with
-  | Increment -> { m with Count = m.Count + m.StepSize }
-  | Decrement -> { m with Count = m.Count - m.StepSize }
-  | SetStepSize x -> { m with StepSize = x }
-  | Reset -> init
-
-let bindings () : Binding<Model, Msg> list = [
-  "CounterValue"
-    |> Binding.oneWay id
-    |> Binding.addSticky (fun v -> v % 2 = 0)
-    |> Binding.mapModel (fun m -> m.Count)
-  "Increment" |> Binding.cmd Increment
-  "Decrement" |> Binding.cmd Decrement
-  "StepSize" |> Binding.twoWay(
-    (fun m -> float m.StepSize),
-    int >> SetStepSize)
-  "Reset" |> Binding.cmdIf(Reset, canReset)
-]
+    match msg with
+    | Increment -> { m with Count = m.Count + m.StepSize }
+    | Decrement -> { m with Count = m.Count - m.StepSize }
+    | SetStepSize x -> { m with StepSize = x }
+    | Reset -> init
+
+let bindings () : Binding<Model, Msg> list =
+    [ "CounterValue"
+      |> Binding.oneWay id
+      |> Binding.addSticky (fun v -> v % 2 = 0)
+      |> Binding.mapModel (fun m -> m.Count)
+      "Increment" |> Binding.cmd Increment
+      "Decrement" |> Binding.cmd Decrement
+      "StepSize" |> Binding.twoWay ((fun m -> float m.StepSize), int >> SetStepSize)
+      "Reset" |> Binding.cmdIf (Reset, canReset) ]
 
 let designVm = ViewModel.designInstance init (bindings ())
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple (fun () -> init) update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple (fun () -> init) update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/SubModel.Core/Program.fs b/src/Samples/SubModel.Core/Program.fs
index 0529da51..adf21687 100644
--- a/src/Samples/SubModel.Core/Program.fs
+++ b/src/Samples/SubModel.Core/Program.fs
@@ -8,177 +8,173 @@ open Elmish.WPF
 
 module Counter =
 
-  type Model =
-    { Count: int
-      StepSize: int }
-
-  type Msg =
-    | Increment
-    | Decrement
-    | SetStepSize of int
-    | Reset
-
-  let init =
-    { Count = 0
-      StepSize = 1 }
-
-  let canReset = (<>) init
-
-  let update msg m =
-    match msg with
-    | Increment -> { m with Count = m.Count + m.StepSize }
-    | Decrement -> { m with Count = m.Count - m.StepSize }
-    | SetStepSize x -> { m with StepSize = x }
-    | Reset -> init
-
-  let bindings () : Binding<Model, Msg> list = [
-    "CounterValue" |> Binding.oneWay (fun m -> m.Count)
-    "Increment" |> Binding.cmd Increment
-    "Decrement" |> Binding.cmd Decrement
-    "StepSize" |> Binding.twoWay(
-      (fun m -> float m.StepSize),
-      int >> SetStepSize)
-    "Reset" |> Binding.cmdIf(Reset, canReset)
-  ]
+    type Model = { Count: int; StepSize: int }
 
+    type Msg =
+        | Increment
+        | Decrement
+        | SetStepSize of int
+        | Reset
 
-module Clock =
+    let init = { Count = 0; StepSize = 1 }
 
-  type TimeType =
-    | Utc
-    | Local
+    let canReset = (<>) init
 
-  type Model =
-    { Time: DateTimeOffset
-      TimeType: TimeType }
+    let update msg m =
+        match msg with
+        | Increment -> { m with Count = m.Count + m.StepSize }
+        | Decrement -> { m with Count = m.Count - m.StepSize }
+        | SetStepSize x -> { m with StepSize = x }
+        | Reset -> init
 
-  let init () =
-    { Time = DateTimeOffset.Now
-      TimeType = Local }
+    let bindings () : Binding<Model, Msg> list =
+        [ "CounterValue" |> Binding.oneWay (fun m -> m.Count)
+          "Increment" |> Binding.cmd Increment
+          "Decrement" |> Binding.cmd Decrement
+          "StepSize" |> Binding.twoWay ((fun m -> float m.StepSize), int >> SetStepSize)
+          "Reset" |> Binding.cmdIf (Reset, canReset) ]
 
-  let getTime m =
-    match m.TimeType with
-    | Utc -> m.Time.UtcDateTime
-    | Local -> m.Time.LocalDateTime
 
-  type Msg =
-    | Tick of DateTimeOffset
-    | SetTimeType of TimeType
+module Clock =
 
-  let update msg m =
-    match msg with
-    | Tick t -> { m with Time = t }
-    | SetTimeType t -> { m with TimeType = t }
+    type TimeType =
+        | Utc
+        | Local
 
-  let bindings () : Binding<Model, Msg> list = [
-    "Time" |> Binding.oneWay getTime
-    "IsLocal" |> Binding.oneWay (fun m -> m.TimeType = Local)
-    "SetLocal" |> Binding.cmd (SetTimeType Local)
-    "IsUtc" |> Binding.oneWay (fun m -> m.TimeType = Utc)
-    "SetUtc" |> Binding.cmd (SetTimeType Utc)
-  ]
+    type Model =
+        { Time: DateTimeOffset
+          TimeType: TimeType }
 
+    let init () =
+        { Time = DateTimeOffset.Now
+          TimeType = Local }
 
-module CounterWithClock =
+    let getTime m =
+        match m.TimeType with
+        | Utc -> m.Time.UtcDateTime
+        | Local -> m.Time.LocalDateTime
 
-  type Model =
-    { Counter: Counter.Model
-      Clock: Clock.Model }
+    type Msg =
+        | Tick of DateTimeOffset
+        | SetTimeType of TimeType
 
-  let init () =
-    { Counter = Counter.init
-      Clock = Clock.init () }
+    let update msg m =
+        match msg with
+        | Tick t -> { m with Time = t }
+        | SetTimeType t -> { m with TimeType = t }
 
-  type Msg =
-    | CounterMsg of Counter.Msg
-    | ClockMsg of Clock.Msg
+    let bindings () : Binding<Model, Msg> list =
+        [ "Time" |> Binding.oneWay getTime
+          "IsLocal" |> Binding.oneWay (fun m -> m.TimeType = Local)
+          "SetLocal" |> Binding.cmd (SetTimeType Local)
+          "IsUtc" |> Binding.oneWay (fun m -> m.TimeType = Utc)
+          "SetUtc" |> Binding.cmd (SetTimeType Utc) ]
 
-  let update msg m =
-    match msg with
-    | CounterMsg msg -> { m with Counter = Counter.update msg m.Counter }
-    | ClockMsg msg -> { m with Clock = Clock.update msg m.Clock }
 
-  let bindings () : Binding<Model, Msg> list = [
-    "Counter"
-      |> Binding.SubModel.required Counter.bindings
-      |> Binding.mapModel (fun m -> m.Counter)
-      |> Binding.mapMsg CounterMsg
-    "Clock"
-      |> Binding.SubModel.required Clock.bindings
-      |> Binding.mapModel (fun m -> m.Clock)
-      |> Binding.mapMsg ClockMsg
-  ]
+module CounterWithClock =
+
+    type Model =
+        { Counter: Counter.Model
+          Clock: Clock.Model }
+
+    let init () =
+        { Counter = Counter.init
+          Clock = Clock.init () }
+
+    type Msg =
+        | CounterMsg of Counter.Msg
+        | ClockMsg of Clock.Msg
+
+    let update msg m =
+        match msg with
+        | CounterMsg msg ->
+            { m with
+                Counter = Counter.update msg m.Counter }
+        | ClockMsg msg ->
+            { m with
+                Clock = Clock.update msg m.Clock }
+
+    let bindings () : Binding<Model, Msg> list =
+        [ "Counter"
+          |> Binding.SubModel.required Counter.bindings
+          |> Binding.mapModel (fun m -> m.Counter)
+          |> Binding.mapMsg CounterMsg
+          "Clock"
+          |> Binding.SubModel.required Clock.bindings
+          |> Binding.mapModel (fun m -> m.Clock)
+          |> Binding.mapMsg ClockMsg ]
 
 
 module App =
 
-  type Model =
-    { ClockCounter1: CounterWithClock.Model
-      ClockCounter2: CounterWithClock.Model }
+    type Model =
+        { ClockCounter1: CounterWithClock.Model
+          ClockCounter2: CounterWithClock.Model }
 
-  let init () =
-    { ClockCounter1 = CounterWithClock.init ()
-      ClockCounter2 = CounterWithClock.init () }
+    let init () =
+        { ClockCounter1 = CounterWithClock.init ()
+          ClockCounter2 = CounterWithClock.init () }
 
-  type Msg =
-    | ClockCounter1Msg of CounterWithClock.Msg
-    | ClockCounter2Msg of CounterWithClock.Msg
+    type Msg =
+        | ClockCounter1Msg of CounterWithClock.Msg
+        | ClockCounter2Msg of CounterWithClock.Msg
 
-  let update msg m =
-    match msg with
-    | ClockCounter1Msg msg ->
-        { m with ClockCounter1 = CounterWithClock.update msg m.ClockCounter1 }
-    | ClockCounter2Msg msg ->
-        { m with ClockCounter2 = CounterWithClock.update msg m.ClockCounter2 }
+    let update msg m =
+        match msg with
+        | ClockCounter1Msg msg ->
+            { m with
+                ClockCounter1 = CounterWithClock.update msg m.ClockCounter1 }
+        | ClockCounter2Msg msg ->
+            { m with
+                ClockCounter2 = CounterWithClock.update msg m.ClockCounter2 }
 
-  let bindings () : Binding<Model, Msg> list = [
-    "ClockCounter1"
-      |> Binding.SubModel.required CounterWithClock.bindings
-      |> Binding.mapModel (fun m -> m.ClockCounter1)
-      |> Binding.mapMsg ClockCounter1Msg
+    let bindings () : Binding<Model, Msg> list =
+        [ "ClockCounter1"
+          |> Binding.SubModel.required CounterWithClock.bindings
+          |> Binding.mapModel (fun m -> m.ClockCounter1)
+          |> Binding.mapMsg ClockCounter1Msg
 
-    "ClockCounter2"
-      |> Binding.SubModel.required CounterWithClock.bindings
-      |> Binding.mapModel (fun m -> m.ClockCounter2)
-      |> Binding.mapMsg ClockCounter2Msg
-  ]
+          "ClockCounter2"
+          |> Binding.SubModel.required CounterWithClock.bindings
+          |> Binding.mapModel (fun m -> m.ClockCounter2)
+          |> Binding.mapMsg ClockCounter2Msg ]
 
 
 let counterDesignVm = ViewModel.designInstance Counter.init (Counter.bindings ())
 let clockDesignVm = ViewModel.designInstance (Clock.init ()) (Clock.bindings ())
-let counterWithClockDesignVm = ViewModel.designInstance (CounterWithClock.init ()) (CounterWithClock.bindings ())
+
+let counterWithClockDesignVm =
+    ViewModel.designInstance (CounterWithClock.init ()) (CounterWithClock.bindings ())
+
 let mainDesignVm = ViewModel.designInstance (App.init ()) (App.bindings ())
 
 
 let subscriptions (model: App.Model) : Sub<App.Msg> =
-  let timerTickSub dispatch =
-    let timer = new System.Timers.Timer(1000.)
-    let disp = timer.Elapsed.Subscribe(fun _ ->
-      let clockMsg =
-        DateTimeOffset.Now
-        |> Clock.Tick
-        |> CounterWithClock.ClockMsg
-      dispatch <| App.ClockCounter1Msg clockMsg
-      dispatch <| App.ClockCounter2Msg clockMsg
-    )
-    timer.Start()
-    disp
-
-  [
-    [ nameof timerTickSub ], timerTickSub
-  ]
+    let timerTickSub dispatch =
+        let timer = new System.Timers.Timer(1000.)
+
+        let disp =
+            timer.Elapsed.Subscribe(fun _ ->
+                let clockMsg = DateTimeOffset.Now |> Clock.Tick |> CounterWithClock.ClockMsg
+                dispatch <| App.ClockCounter1Msg clockMsg
+                dispatch <| App.ClockCounter2Msg clockMsg)
+
+        timer.Start()
+        disp
+
+    [ [ nameof timerTickSub ], timerTickSub ]
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple App.init App.update App.bindings
-  |> WpfProgram.withSubscription subscriptions
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple App.init App.update App.bindings
+    |> WpfProgram.withSubscription subscriptions
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/SubModelOpt.Core/Program.fs b/src/Samples/SubModelOpt.Core/Program.fs
index 3a8dfe50..9dbb6628 100644
--- a/src/Samples/SubModelOpt.Core/Program.fs
+++ b/src/Samples/SubModelOpt.Core/Program.fs
@@ -7,111 +7,120 @@ open Elmish.WPF
 
 module Form1 =
 
-  type Model =
-    { Text: string }
+    type Model = { Text: string }
 
-  type Msg =
-    | SetText of string
-    | Submit
+    type Msg =
+        | SetText of string
+        | Submit
 
-  let init =
-    { Text = "" }
+    let init = { Text = "" }
 
-  let update msg m =
-    match msg with
-    | SetText s -> { m with Text = s }
-    | Submit -> m  // handled by parent
+    let update msg m =
+        match msg with
+        | SetText s -> { m with Text = s }
+        | Submit -> m // handled by parent
 
-  let bindings () : Binding<Model, Msg> list = [
-    "Text" |> Binding.twoWay ((fun m -> m.Text), SetText)
-    "Submit" |> Binding.cmd Submit
-  ]
+    let bindings () : Binding<Model, Msg> list =
+        [ "Text" |> Binding.twoWay ((fun m -> m.Text), SetText)
+          "Submit" |> Binding.cmd Submit ]
 
 
 module Form2 =
 
-  type Model =
-    { Text1: string
-      Text2: string }
+    type Model = { Text1: string; Text2: string }
 
-  type Msg =
-    | SetText1 of string
-    | SetText2 of string
-    | Submit
+    type Msg =
+        | SetText1 of string
+        | SetText2 of string
+        | Submit
 
-  let init =
-    { Text1 = ""
-      Text2 = "" }
+    let init = { Text1 = ""; Text2 = "" }
 
-  let update msg m =
-    match msg with
-    | SetText1 s -> { m with Text1 = s }
-    | SetText2 s -> { m with Text2 = s }
-    | Submit -> m  // handled by parent
+    let update msg m =
+        match msg with
+        | SetText1 s -> { m with Text1 = s }
+        | SetText2 s -> { m with Text2 = s }
+        | Submit -> m // handled by parent
 
-  let bindings () : Binding<Model, Msg> list = [
-    "Text1" |> Binding.twoWay ((fun m -> m.Text1), SetText1)
-    "Text2" |> Binding.twoWay ((fun m -> m.Text2), SetText2)
-    "Submit" |> Binding.cmd Submit
-  ]
+    let bindings () : Binding<Model, Msg> list =
+        [ "Text1" |> Binding.twoWay ((fun m -> m.Text1), SetText1)
+          "Text2" |> Binding.twoWay ((fun m -> m.Text2), SetText2)
+          "Submit" |> Binding.cmd Submit ]
 
 
 module App =
 
-  type Dialog =
-    | Form1 of Form1.Model
-    | Form2 of Form2.Model
-
-  type Model =
-    { Dialog: Dialog option }
-
-  let init () =
-    { Dialog = None }
-
-  type Msg =
-    | ShowForm1
-    | ShowForm2
-    | Form1Msg of Form1.Msg
-    | Form2Msg of Form2.Msg
-
-  let update msg m =
-    match msg with
-    | ShowForm1 -> { m with Dialog = Some <| Form1 Form1.init }
-    | ShowForm2 -> { m with Dialog = Some <| Form2 Form2.init }
-    | Form1Msg Form1.Submit -> { m with Dialog = None }
-    | Form1Msg msg' ->
-        match m.Dialog with
-        | Some (Form1 m') -> { m with Dialog = Form1.update msg' m' |> Form1 |> Some }
-        | _ -> m
-    | Form2Msg Form2.Submit -> { m with Dialog = None }
-    | Form2Msg msg' ->
-        match m.Dialog with
-        | Some (Form2 m') -> { m with Dialog = Form2.update msg' m' |> Form2 |> Some }
-        | _ -> m
-
-  let bindings () : Binding<Model, Msg> list = [
-    "ShowForm1" |> Binding.cmd ShowForm1
-
-    "ShowForm2" |> Binding.cmd ShowForm2
-
-    "DialogVisible" |> Binding.oneWay (fun m -> m.Dialog.IsSome)
-
-    "Form1Visible" |> Binding.oneWay
-      (fun m -> match m.Dialog with Some (Form1 _) -> true | _ -> false)
-
-    "Form2Visible" |> Binding.oneWay
-      (fun m -> match m.Dialog with Some (Form2 _) -> true | _ -> false)
-
-    "Form1"
-      |> Binding.SubModel.opt Form1.bindings
-      |> Binding.mapModel (fun m -> match m.Dialog with Some (Form1 m') -> Some m' | _ -> None)
-      |> Binding.mapMsg Form1Msg
-
-    "Form2"
-      |> Binding.SubModel.opt Form2.bindings
-      |> Binding.mapModel (fun m -> match m.Dialog with Some (Form2 m') -> Some m' | _ -> None)
-      |> Binding.mapMsg Form2Msg
-  ]
+    type Dialog =
+        | Form1 of Form1.Model
+        | Form2 of Form2.Model
+
+    type Model = { Dialog: Dialog option }
+
+    let init () = { Dialog = None }
+
+    type Msg =
+        | ShowForm1
+        | ShowForm2
+        | Form1Msg of Form1.Msg
+        | Form2Msg of Form2.Msg
+
+    let update msg m =
+        match msg with
+        | ShowForm1 ->
+            { m with
+                Dialog = Some <| Form1 Form1.init }
+        | ShowForm2 ->
+            { m with
+                Dialog = Some <| Form2 Form2.init }
+        | Form1Msg Form1.Submit -> { m with Dialog = None }
+        | Form1Msg msg' ->
+            match m.Dialog with
+            | Some(Form1 m') ->
+                { m with
+                    Dialog = Form1.update msg' m' |> Form1 |> Some }
+            | _ -> m
+        | Form2Msg Form2.Submit -> { m with Dialog = None }
+        | Form2Msg msg' ->
+            match m.Dialog with
+            | Some(Form2 m') ->
+                { m with
+                    Dialog = Form2.update msg' m' |> Form2 |> Some }
+            | _ -> m
+
+    let bindings () : Binding<Model, Msg> list =
+        [ "ShowForm1" |> Binding.cmd ShowForm1
+
+          "ShowForm2" |> Binding.cmd ShowForm2
+
+          "DialogVisible" |> Binding.oneWay (fun m -> m.Dialog.IsSome)
+
+          "Form1Visible"
+          |> Binding.oneWay (fun m ->
+              match m.Dialog with
+              | Some(Form1 _) -> true
+              | _ -> false)
+
+          "Form2Visible"
+          |> Binding.oneWay (fun m ->
+              match m.Dialog with
+              | Some(Form2 _) -> true
+              | _ -> false)
+
+          "Form1"
+          |> Binding.SubModel.opt Form1.bindings
+          |> Binding.mapModel (fun m ->
+              match m.Dialog with
+              | Some(Form1 m') -> Some m'
+              | _ -> None)
+          |> Binding.mapMsg Form1Msg
+
+          "Form2"
+          |> Binding.SubModel.opt Form2.bindings
+          |> Binding.mapModel (fun m ->
+              match m.Dialog with
+              | Some(Form2 m') -> Some m'
+              | _ -> None)
+          |> Binding.mapMsg Form2Msg ]
 
 
 let form1DesignVm = ViewModel.designInstance Form1.init (Form1.bindings ())
@@ -121,14 +130,14 @@ let mainDesignVm = ViewModel.designInstance (App.init ()) (App.bindings ())
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple App.init App.update App.bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple App.init App.update App.bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/SubModelSelectedItem.Core/Program.fs b/src/Samples/SubModelSelectedItem.Core/Program.fs
index c8f970af..843f4582 100644
--- a/src/Samples/SubModelSelectedItem.Core/Program.fs
+++ b/src/Samples/SubModelSelectedItem.Core/Program.fs
@@ -5,53 +5,52 @@ open Serilog
 open Serilog.Extensions.Logging
 open Elmish.WPF
 
-type Entity =
-  { Id: int
-    Name: string }
+type Entity = { Id: int; Name: string }
 
 type Model =
-  { Entities: Entity list
-    Selected: int option }
+    { Entities: Entity list
+      Selected: int option }
 
 let init () =
-  { Entities = [0 .. 10] |> List.map (fun i -> { Id = i; Name = sprintf "Entity %i" i})
-    Selected = Some 4 }
+    { Entities = [ 0..10 ] |> List.map (fun i -> { Id = i; Name = sprintf "Entity %i" i })
+      Selected = Some 4 }
 
-type Msg =
-  | Select of int option
+type Msg = Select of int option
 
 let update msg m =
-  match msg with
-  | Select entityId -> { m with Selected = entityId }
+    match msg with
+    | Select entityId -> { m with Selected = entityId }
 
-let bindings () : Binding<Model, Msg> list = [
-  "SelectRandom" |> Binding.cmd
-    (fun m -> m.Entities.Item(Random().Next(m.Entities.Length)).Id |> Some |> Select)
+let bindings () : Binding<Model, Msg> list =
+    [ "SelectRandom"
+      |> Binding.cmd (fun m -> m.Entities.Item(Random().Next(m.Entities.Length)).Id |> Some |> Select)
 
-  "Deselect" |> Binding.cmd(Select None)
+      "Deselect" |> Binding.cmd (Select None)
 
-  "Entities" |> Binding.subModelSeq(
-    (fun m -> m.Entities),
-    (fun e -> e.Id),
-    (fun () -> [
-      "Name" |> Binding.oneWay (fun (_, e) -> e.Name)
-      "SelectedLabel" |> Binding.oneWay (fun (m, e) -> if m.Selected = Some e.Id then " - SELECTED" else "")
-    ]))
+      "Entities"
+      |> Binding.subModelSeq (
+          (fun m -> m.Entities),
+          (fun e -> e.Id),
+          (fun () ->
+              [ "Name" |> Binding.oneWay (fun (_, e) -> e.Name)
+                "SelectedLabel"
+                |> Binding.oneWay (fun (m, e) -> if m.Selected = Some e.Id then " - SELECTED" else "") ])
+      )
 
-  "SelectedEntity" |> Binding.subModelSelectedItem("Entities", (fun m -> m.Selected), Select)
-]
+      "SelectedEntity"
+      |> Binding.subModelSelectedItem ("Entities", (fun m -> m.Selected), Select) ]
 
 let designVm = ViewModel.designInstance (init ()) (bindings ())
 
 let main window =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple init update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple init update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/SubModelSeq.Core/Program.fs b/src/Samples/SubModelSeq.Core/Program.fs
index 1f0a6f5c..5ad6297b 100644
--- a/src/Samples/SubModelSeq.Core/Program.fs
+++ b/src/Samples/SubModelSeq.Core/Program.fs
@@ -7,308 +7,302 @@ open Elmish.WPF
 
 
 type InOutMsg<'a, 'b> =
-  | InMsg of 'a
-  | OutMsg of 'b
+    | InMsg of 'a
+    | OutMsg of 'b
 
 
 module Option =
 
-  let set a = Option.map (fun _ -> a)
+    let set a = Option.map (fun _ -> a)
 
 
 module Func =
 
-  let flip f b a = f a b
+    let flip f b a = f a b
 
 
 module FuncOption =
 
-  let inputIfNone f a = a |> f |> Option.defaultValue a
+    let inputIfNone f a = a |> f |> Option.defaultValue a
 
-  let map (f: 'b -> 'c) (mb: 'a -> 'b option) =
-    mb >> Option.map f
+    let map (f: 'b -> 'c) (mb: 'a -> 'b option) = mb >> Option.map f
 
-  let bind (f: 'b -> 'a -> 'c) (mb: 'a -> 'b option) a =
-    mb a |> Option.bind (fun b -> Some(f b a))
+    let bind (f: 'b -> 'a -> 'c) (mb: 'a -> 'b option) a =
+        mb a |> Option.bind (fun b -> Some(f b a))
 
 
-let map get set f a =
-  a |> get |> f |> Func.flip set a
+let map get set f a = a |> get |> f |> Func.flip set a
 
 
 module List =
 
-  let swap i j =
-    List.permute
-      (function
-        | a when a = i -> j
-        | a when a = j -> i
-        | a -> a)
+    let swap i j =
+        List.permute (function
+            | a when a = i -> j
+            | a when a = j -> i
+            | a -> a)
 
-  let swapWithNext i = swap i (i + 1)
-  let swapWithPrev i = swap i (i - 1)
+    let swapWithNext i = swap i (i + 1)
+    let swapWithPrev i = swap i (i - 1)
 
-  let cons head tail = head :: tail
+    let cons head tail = head :: tail
 
-  let mapFirst p f input =
-    let rec mapFirstRec reverseFront back =
-      match back with
-      | [] ->
-          (*
+    let mapFirst p f input =
+        let rec mapFirstRec reverseFront back =
+            match back with
+            | [] ->
+                (*
            * Conceptually, the correct value to return is
            * reverseFront |> List.rev
            * but this is the same as
            * input
            * so returning that instead.
            *)
-          input
-      | a :: ma ->
-          if p a then
-            (reverseFront |> List.rev) @ (f a :: ma)
-          else
-            mapFirstRec (a :: reverseFront) ma
-    mapFirstRec [] input
+                input
+            | a :: ma ->
+                if p a then
+                    (reverseFront |> List.rev) @ (f a :: ma)
+                else
+                    mapFirstRec (a :: reverseFront) ma
+
+        mapFirstRec [] input
 
 
 [<AutoOpen>]
 module Identifiable =
 
-  type Identifiable<'a> =
-    { Id: Guid
-      Value: 'a }
+    type Identifiable<'a> = { Id: Guid; Value: 'a }
 
-  module Identifiable =
+    module Identifiable =
 
-    let getId m = m.Id
-    let get m = m.Value
-    let set v m = { m with Value = v }
-    let map f = f |> map get set
+        let getId m = m.Id
+        let get m = m.Value
+        let set v m = { m with Value = v }
+        let map f = f |> map get set
 
 
 [<AutoOpen>]
 module Counter =
 
-  type Counter =
-    { Count: int
-      StepSize: int }
+    type Counter = { Count: int; StepSize: int }
 
-  type CounterMsg =
-    | Increment
-    | Decrement
-    | SetStepSize of int
-    | Reset
+    type CounterMsg =
+        | Increment
+        | Decrement
+        | SetStepSize of int
+        | Reset
 
-  module Counter =
+    module Counter =
 
-    let init =
-      { Count = 0
-        StepSize = 1 }
+        let init = { Count = 0; StepSize = 1 }
 
-    let canReset = (<>) init
+        let canReset = (<>) init
 
-    let update msg m =
-      match msg with
-      | Increment -> { m with Count = m.Count + m.StepSize }
-      | Decrement -> { m with Count = m.Count - m.StepSize }
-      | SetStepSize x -> { m with StepSize = x }
-      | Reset -> init
+        let update msg m =
+            match msg with
+            | Increment -> { m with Count = m.Count + m.StepSize }
+            | Decrement -> { m with Count = m.Count - m.StepSize }
+            | SetStepSize x -> { m with StepSize = x }
+            | Reset -> init
 
-    let bindings () : Binding<Counter, CounterMsg> list = [
-      "CounterValue" |> Binding.oneWay (fun m -> m.Count)
-      "Increment" |> Binding.cmd Increment
-      "Decrement" |> Binding.cmd Decrement
-      "StepSize" |> Binding.twoWay(
-        (fun m -> float m.StepSize),
-        int >> SetStepSize)
-      "Reset" |> Binding.cmdIf(Reset, canReset)
-    ]
+        let bindings () : Binding<Counter, CounterMsg> list =
+            [ "CounterValue" |> Binding.oneWay (fun m -> m.Count)
+              "Increment" |> Binding.cmd Increment
+              "Decrement" |> Binding.cmd Decrement
+              "StepSize" |> Binding.twoWay ((fun m -> float m.StepSize), int >> SetStepSize)
+              "Reset" |> Binding.cmdIf (Reset, canReset) ]
 
 
 [<AutoOpen>]
 module RoseTree =
 
-  type RoseTree<'model> =
-    { Data: 'model
-      Children: RoseTree<'model> list }
+    type RoseTree<'model> =
+        { Data: 'model
+          Children: RoseTree<'model> list }
+
+    type RoseTreeMsg<'a, 'msg> =
+        | BranchMsg of 'a * RoseTreeMsg<'a, 'msg>
+        | LeafMsg of 'msg
 
-  type RoseTreeMsg<'a, 'msg> =
-    | BranchMsg of 'a * RoseTreeMsg<'a, 'msg>
-    | LeafMsg of 'msg
+    module RoseTree =
 
-  module RoseTree =
+        let create data children = { Data = data; Children = children }
+        let createLeaf a = create a []
 
-    let create data children =
-      { Data = data
-        Children = children }
-    let createLeaf a = create a []
+        let getData t = t.Data
+        let setData (d: 'a) (t: RoseTree<'a>) = { t with Data = d }
+        let mapData f = map getData setData f
 
-    let getData t = t.Data
-    let setData (d: 'a) (t: RoseTree<'a>) = { t with Data = d }
-    let mapData f = map getData setData f
+        let getChildren t = t.Children
+        let setChildren c t = { t with Children = c }
+        let mapChildren f = map getChildren setChildren f
 
-    let getChildren t = t.Children
-    let setChildren c t = { t with Children = c }
-    let mapChildren f = map getChildren setChildren f
+        let addSubtree t = t |> List.cons |> mapChildren
+        let addChildData a = a |> createLeaf |> addSubtree
 
-    let addSubtree t = t |> List.cons |> mapChildren
-    let addChildData a = a |> createLeaf |> addSubtree
+        let update p (f: 'msg -> RoseTree<'model> -> RoseTree<'model>) =
+            let rec updateRec =
+                function
+                | BranchMsg(a, msg) -> msg |> updateRec |> List.mapFirst (p a) |> mapChildren
+                | LeafMsg msg -> msg |> f
 
-    let update p (f: 'msg -> RoseTree<'model> -> RoseTree<'model>) =
-      let rec updateRec = function
-        | BranchMsg (a, msg) -> msg |> updateRec |> List.mapFirst (p a) |> mapChildren
-        | LeafMsg msg -> msg |> f
-      updateRec
+            updateRec
 
 
 module App =
 
-  type Model =
-    { SomeGlobalState: bool
-      DummyRoot: RoseTree<Identifiable<Counter>> }
-
-  type SubtreeMsg =
-    | CounterMsg of CounterMsg
-    | AddChild
-    | Remove of Guid
-    | MoveUp of Guid
-    | MoveDown of Guid
-
-  type SubtreeOutMsg =
-    | OutRemove
-    | OutMoveUp
-    | OutMoveDown
-
-  type Msg =
-    | ToggleGlobalState
-    | SubtreeMsg of RoseTreeMsg<Guid, SubtreeMsg>
-
-
-  let getSomeGlobalState m = m.SomeGlobalState
-  let setSomeGlobalState v m = { m with SomeGlobalState = v }
-  let mapSomeGlobalState f = f |> map getSomeGlobalState setSomeGlobalState
-
-  let getDummyRoot m = m.DummyRoot
-  let setDummyRoot v m = { m with DummyRoot = v }
-  let mapDummyRoot f = f |> map getDummyRoot setDummyRoot
-
-  let createNewIdentifiableCounter () =
-    { Id = Guid.NewGuid ()
-      Value = Counter.init }
-
-  let createNewLeaf () =
-    createNewIdentifiableCounter ()
-    |> RoseTree.createLeaf
-
-  let init () =
-    let dummyRootData = createNewIdentifiableCounter () // Placeholder data to satisfy type system. User never sees this.
-    { SomeGlobalState = false
-      DummyRoot =
-        createNewLeaf ()
-        |> List.singleton
-        |> RoseTree.create dummyRootData }
-
-  let hasId id t = t.Data.Id = id
-
-  let swapCounters swap nId =
-    nId
-    |> hasId
-    |> List.tryFindIndex
-    |> FuncOption.bind swap
-    |> FuncOption.inputIfNone
-
-  let updateSubtree = function
-    | CounterMsg msg -> msg |> Counter.update |> Identifiable.map |> RoseTree.mapData
-    | AddChild -> createNewLeaf () |> List.cons |> RoseTree.mapChildren
-    | Remove cId -> cId |> hasId >> not |> List.filter |> RoseTree.mapChildren
-    | MoveUp cId -> cId |> swapCounters List.swapWithPrev |> RoseTree.mapChildren
-    | MoveDown cId -> cId |> swapCounters List.swapWithNext |> RoseTree.mapChildren
-
-  let update = function
-    | ToggleGlobalState -> mapSomeGlobalState not
-    | SubtreeMsg msg -> msg |> RoseTree.update hasId updateSubtree |> mapDummyRoot
-
-  let mapOutMsg = function
-    | OutRemove -> Remove
-    | OutMoveUp -> MoveUp
-    | OutMoveDown -> MoveDown
+    type Model =
+        { SomeGlobalState: bool
+          DummyRoot: RoseTree<Identifiable<Counter>> }
 
+    type SubtreeMsg =
+        | CounterMsg of CounterMsg
+        | AddChild
+        | Remove of Guid
+        | MoveUp of Guid
+        | MoveDown of Guid
 
-module Bindings =
+    type SubtreeOutMsg =
+        | OutRemove
+        | OutMoveUp
+        | OutMoveDown
 
-  open App
-
-  type SelfWithParent<'a> =
-    { Self: 'a
-      Parent: 'a }
-
-  let moveUpMsg (_, { Parent = p; Self = s }) =
-    match p.Children |> List.tryHead with
-    | Some c when c.Data.Id <> s.Data.Id ->
-        OutMoveUp |> Some
-    | _ -> None
-
-  let moveDownMsg (_, { Parent = p; Self = s }) =
-    match p.Children |> List.tryLast with
-    | Some c when c.Data.Id <> s.Data.Id ->
-        OutMoveDown |> Some
-    | _ -> None
-
-  let rec subtreeBindings () : Binding<Model * SelfWithParent<RoseTree<Identifiable<Counter>>>, InOutMsg<RoseTreeMsg<Guid, SubtreeMsg>, SubtreeOutMsg>> list =
-    let counterBindings =
-      Counter.bindings ()
-      |> Bindings.mapModel (fun (_, { Self = s }) -> s.Data.Value)
-      |> Bindings.mapMsg (CounterMsg >> LeafMsg)
-
-    let inMsgBindings =
-      [ "CounterIdText" |> Binding.oneWay(fun (_, { Self = s }) -> s.Data.Id)
-        "AddChild" |> Binding.cmd(AddChild |> LeafMsg)
-        "GlobalState" |> Binding.oneWay(fun (m, _) -> m.SomeGlobalState)
-        "ChildCounters"
-          |> Binding.subModelSeq (subtreeBindings, (fun (_, { Self = c }) -> c.Data.Id))
-          |> Binding.mapModel (fun (m, { Self = p }) -> p.Children |> Seq.map (fun c -> m, { Self = c; Parent = p }))
-          |> Binding.mapMsg (fun (cId, inOutMsg) ->
-            match inOutMsg with
-            | InMsg msg -> (cId, msg) |> BranchMsg
-            | OutMsg msg -> cId |> mapOutMsg msg |> LeafMsg)
-      ] @ counterBindings
-      |> Bindings.mapMsg InMsg
+    type Msg =
+        | ToggleGlobalState
+        | SubtreeMsg of RoseTreeMsg<Guid, SubtreeMsg>
+
+
+    let getSomeGlobalState m = m.SomeGlobalState
+    let setSomeGlobalState v m = { m with SomeGlobalState = v }
+
+    let mapSomeGlobalState f =
+        f |> map getSomeGlobalState setSomeGlobalState
+
+    let getDummyRoot m = m.DummyRoot
+    let setDummyRoot v m = { m with DummyRoot = v }
+    let mapDummyRoot f = f |> map getDummyRoot setDummyRoot
+
+    let createNewIdentifiableCounter () =
+        { Id = Guid.NewGuid()
+          Value = Counter.init }
 
-    let outMsgBindings =
-      [ "Remove" |> Binding.cmd OutRemove
-        "MoveUp" |> Binding.cmdIf moveUpMsg
-        "MoveDown" |> Binding.cmdIf moveDownMsg
-      ] |> Bindings.mapMsg OutMsg
+    let createNewLeaf () =
+        createNewIdentifiableCounter () |> RoseTree.createLeaf
 
-    outMsgBindings @ inMsgBindings
+    let init () =
+        let dummyRootData = createNewIdentifiableCounter () // Placeholder data to satisfy type system. User never sees this.
 
+        { SomeGlobalState = false
+          DummyRoot = createNewLeaf () |> List.singleton |> RoseTree.create dummyRootData }
 
-  let rootBindings () : Binding<Model, Msg> list = [
-    "Counters"
-      |> Binding.subModelSeq (subtreeBindings, (fun (_, { Self = c }) -> c.Data.Id))
-      |> Binding.mapModel (fun m -> m.DummyRoot.Children |> Seq.map (fun c -> m, { Self = c; Parent = m.DummyRoot }))
-      |> Binding.mapMsg (fun (cId, inOutMsg) ->
-        match inOutMsg with
-        | InMsg msg -> (cId, msg) |> BranchMsg
-        | OutMsg msg -> cId |> mapOutMsg msg |> LeafMsg
-        |> SubtreeMsg)
+    let hasId id t = t.Data.Id = id
+
+    let swapCounters swap nId =
+        nId
+        |> hasId
+        |> List.tryFindIndex
+        |> FuncOption.bind swap
+        |> FuncOption.inputIfNone
+
+    let updateSubtree =
+        function
+        | CounterMsg msg -> msg |> Counter.update |> Identifiable.map |> RoseTree.mapData
+        | AddChild -> createNewLeaf () |> List.cons |> RoseTree.mapChildren
+        | Remove cId -> cId |> hasId >> not |> List.filter |> RoseTree.mapChildren
+        | MoveUp cId -> cId |> swapCounters List.swapWithPrev |> RoseTree.mapChildren
+        | MoveDown cId -> cId |> swapCounters List.swapWithNext |> RoseTree.mapChildren
+
+    let update =
+        function
+        | ToggleGlobalState -> mapSomeGlobalState not
+        | SubtreeMsg msg -> msg |> RoseTree.update hasId updateSubtree |> mapDummyRoot
+
+    let mapOutMsg =
+        function
+        | OutRemove -> Remove
+        | OutMoveUp -> MoveUp
+        | OutMoveDown -> MoveDown
+
+
+module Bindings =
+
+    open App
+
+    type SelfWithParent<'a> = { Self: 'a; Parent: 'a }
+
+    let moveUpMsg (_, { Parent = p; Self = s }) =
+        match p.Children |> List.tryHead with
+        | Some c when c.Data.Id <> s.Data.Id -> OutMoveUp |> Some
+        | _ -> None
+
+    let moveDownMsg (_, { Parent = p; Self = s }) =
+        match p.Children |> List.tryLast with
+        | Some c when c.Data.Id <> s.Data.Id -> OutMoveDown |> Some
+        | _ -> None
+
+    let rec subtreeBindings
+        ()
+        : Binding<
+              Model * SelfWithParent<RoseTree<Identifiable<Counter>>>,
+              InOutMsg<RoseTreeMsg<Guid, SubtreeMsg>, SubtreeOutMsg>
+           > list
+        =
+        let counterBindings =
+            Counter.bindings ()
+            |> Bindings.mapModel (fun (_, { Self = s }) -> s.Data.Value)
+            |> Bindings.mapMsg (CounterMsg >> LeafMsg)
+
+        let inMsgBindings =
+            [ "CounterIdText" |> Binding.oneWay (fun (_, { Self = s }) -> s.Data.Id)
+              "AddChild" |> Binding.cmd (AddChild |> LeafMsg)
+              "GlobalState" |> Binding.oneWay (fun (m, _) -> m.SomeGlobalState)
+              "ChildCounters"
+              |> Binding.subModelSeq (subtreeBindings, (fun (_, { Self = c }) -> c.Data.Id))
+              |> Binding.mapModel (fun (m, { Self = p }) ->
+                  p.Children |> Seq.map (fun c -> m, { Self = c; Parent = p }))
+              |> Binding.mapMsg (fun (cId, inOutMsg) ->
+                  match inOutMsg with
+                  | InMsg msg -> (cId, msg) |> BranchMsg
+                  | OutMsg msg -> cId |> mapOutMsg msg |> LeafMsg) ]
+            @ counterBindings
+            |> Bindings.mapMsg InMsg
+
+        let outMsgBindings =
+            [ "Remove" |> Binding.cmd OutRemove
+              "MoveUp" |> Binding.cmdIf moveUpMsg
+              "MoveDown" |> Binding.cmdIf moveDownMsg ]
+            |> Bindings.mapMsg OutMsg
+
+        outMsgBindings @ inMsgBindings
+
+
+    let rootBindings () : Binding<Model, Msg> list =
+        [ "Counters"
+          |> Binding.subModelSeq (subtreeBindings, (fun (_, { Self = c }) -> c.Data.Id))
+          |> Binding.mapModel (fun m ->
+              m.DummyRoot.Children |> Seq.map (fun c -> m, { Self = c; Parent = m.DummyRoot }))
+          |> Binding.mapMsg (fun (cId, inOutMsg) ->
+              match inOutMsg with
+              | InMsg msg -> (cId, msg) |> BranchMsg
+              | OutMsg msg -> cId |> mapOutMsg msg |> LeafMsg
+              |> SubtreeMsg)
 
-    "ToggleGlobalState" |> Binding.cmd ToggleGlobalState
+          "ToggleGlobalState" |> Binding.cmd ToggleGlobalState
 
-    "AddCounter" |> Binding.cmd (AddChild |> LeafMsg |> SubtreeMsg)
-  ]
+          "AddCounter" |> Binding.cmd (AddChild |> LeafMsg |> SubtreeMsg) ]
 
 let counterDesignVm = ViewModel.designInstance Counter.init (Counter.bindings ())
 let mainDesignVm = ViewModel.designInstance (App.init ()) (Bindings.rootBindings ())
 
 let main window =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple App.init App.update Bindings.rootBindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple App.init App.update Bindings.rootBindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic.Core/Program.fs b/src/Samples/SubModelStatic.Core/Program.fs
index c983a4eb..8bbd1f46 100644
--- a/src/Samples/SubModelStatic.Core/Program.fs
+++ b/src/Samples/SubModelStatic.Core/Program.fs
@@ -1,4 +1,5 @@
 namespace Elmish.WPF.Samples.SubModelStatic
+
 #nowarn "44"
 
 open System
@@ -9,187 +10,251 @@ open Elmish.WPF
 
 module Counter =
 
-  type Model =
-    { Count: int
-      StepSize: int
-      History: (int * int) list }
+    type Model =
+        { Count: int
+          StepSize: int
+          History: (int * int) list }
+
+    type Msg =
+        | Increment
+        | Decrement
+        | SetStepSize of int
+        | Reset
+
+    let init =
+        { Count = 0
+          StepSize = 1
+          History = [] }
+
+    let canReset = (<>) init
+
+    let update msg m =
+        match msg with
+        | Increment ->
+            { m with
+                Count = m.Count + m.StepSize
+                History = (m.Count, m.History.Length) :: m.History }
+        | Decrement ->
+            { m with
+                Count = m.Count - m.StepSize
+                History = (m.Count, m.History.Length) :: m.History }
+        | SetStepSize x -> { m with StepSize = x }
+        | Reset -> init
+
+[<AllowNullLiteral>]
+type CounterViewModel(args) =
+    inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
+
+    let stepSizeBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Counter.Model) -> m.StepSize)
+        >> Binding.mapMsg Counter.Msg.SetStepSize
+
+    new() =
+        CounterViewModel(
+            { Counter.init with
+                History = [ (3, 1); (0, 0) ] }
+            |> ViewModelArgs.simple
+        )
+
+    member _.StepSize
+        with get () = base.Get () stepSizeBinding
+        and set (v) = base.Set (v) stepSizeBinding
+
+    member _.CounterValue =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Count))
+
+    member _.Increment = base.Get () (Binding.CmdT.setAlways Counter.Increment)
+    member _.Decrement = base.Get () (Binding.CmdT.setAlways Counter.Decrement)
+    member _.Reset = base.Get () (Binding.CmdT.set Counter.canReset Counter.Reset)
+
+    member _.History =
+        base.Get () (Binding.OneWaySeqT.id (=) snd >> Binding.mapModel (fun m -> m.History))
 
-  type Msg =
-    | Increment
-    | Decrement
-    | SetStepSize of int
-    | Reset
 
-  let init =
-    { Count = 0
-      StepSize = 1
-      History = [] }
+module Clock =
 
-  let canReset = (<>) init
+    type TimeType =
+        | Utc
+        | Local
 
-  let update msg m =
-    match msg with
-    | Increment -> { m with Count = m.Count + m.StepSize; History = (m.Count, m.History.Length) :: m.History }
-    | Decrement -> { m with Count = m.Count - m.StepSize; History = (m.Count, m.History.Length) :: m.History }
-    | SetStepSize x -> { m with StepSize = x }
-    | Reset -> init
+    type Model =
+        { Time: DateTimeOffset
+          TimeType: TimeType }
 
-type [<AllowNullLiteral>] CounterViewModel (args) =
-  inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
+    let init () =
+        { Time = DateTimeOffset.Now
+          TimeType = Local }
 
-  let stepSizeBinding =
-    Binding.TwoWayT.id
-    >> Binding.addLazy (=)
-    >> Binding.mapModel (fun (m: Counter.Model) -> m.StepSize)
-    >> Binding.mapMsg Counter.Msg.SetStepSize
+    let getTime m =
+        match m.TimeType with
+        | Utc -> m.Time.UtcDateTime
+        | Local -> m.Time.LocalDateTime
 
-  new() = CounterViewModel({ Counter.init with History = [ (3,1); (0,0) ] } |> ViewModelArgs.simple)
+    type Msg =
+        | Tick of DateTimeOffset
+        | SetTimeType of TimeType
 
-  member _.StepSize
-    with get() = base.Get() stepSizeBinding
-    and set(v) = base.Set(v) stepSizeBinding
-  member _.CounterValue = base.Get() (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Count))
-  member _.Increment = base.Get() (Binding.CmdT.setAlways Counter.Increment)
-  member _.Decrement = base.Get() (Binding.CmdT.setAlways Counter.Decrement)
-  member _.Reset = base.Get() (Binding.CmdT.set Counter.canReset Counter.Reset)
-  member _.History = base.Get() (Binding.OneWaySeqT.id (=) snd >> Binding.mapModel (fun m -> m.History))
+    let update msg m =
+        match msg with
+        | Tick t -> { m with Time = t }
+        | SetTimeType t -> { m with TimeType = t }
 
+[<AllowNullLiteral>]
+type ClockViewModel(args) =
+    inherit ViewModelBase<Clock.Model, Clock.Msg>(args)
 
-module Clock =
+    new() = ClockViewModel(Clock.init () |> ViewModelArgs.simple)
 
-  type TimeType =
-    | Utc
-    | Local
+    member _.Time =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel Clock.getTime)
 
-  type Model =
-    { Time: DateTimeOffset
-      TimeType: TimeType }
+    member _.IsLocal =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.TimeType = Clock.Local))
 
-  let init () =
-    { Time = DateTimeOffset.Now
-      TimeType = Local }
+    member _.SetLocal =
+        base.Get () (Binding.CmdT.setAlways (Clock.SetTimeType Clock.Local))
 
-  let getTime m =
-    match m.TimeType with
-    | Utc -> m.Time.UtcDateTime
-    | Local -> m.Time.LocalDateTime
+    member _.IsUtc =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.TimeType = Clock.Utc))
 
-  type Msg =
-    | Tick of DateTimeOffset
-    | SetTimeType of TimeType
+    member _.SetUtc = base.Get () (Binding.CmdT.setAlways (Clock.SetTimeType Clock.Utc))
 
-  let update msg m =
-    match msg with
-    | Tick t -> { m with Time = t }
-    | SetTimeType t -> { m with TimeType = t }
 
-type [<AllowNullLiteral>] ClockViewModel (args) =
-  inherit ViewModelBase<Clock.Model, Clock.Msg>(args)
-  
-  new() = ClockViewModel(Clock.init () |> ViewModelArgs.simple)
+module CounterWithClock =
 
-  member _.Time = base.Get() (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel Clock.getTime)
-  member _.IsLocal = base.Get() (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.TimeType = Clock.Local))
-  member _.SetLocal = base.Get() (Binding.CmdT.setAlways (Clock.SetTimeType Clock.Local))
-  member _.IsUtc = base.Get() (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.TimeType = Clock.Utc))
-  member _.SetUtc = base.Get() (Binding.CmdT.setAlways (Clock.SetTimeType Clock.Utc))
+    type Model =
+        { Counter: Counter.Model
+          Clock: Clock.Model }
 
+    module ModelM =
+        module Counter =
+            let get m = m.Counter
 
-module CounterWithClock =
+        module Clock =
+            let get m = m.Clock
 
-  type Model =
-    { Counter: Counter.Model
-      Clock: Clock.Model }
+    let init () =
+        { Counter = Counter.init
+          Clock = Clock.init () }
 
-  module ModelM =
-    module Counter =
-      let get m = m.Counter
-    module Clock =
-      let get m = m.Clock
+    type Msg =
+        | CounterMsg of Counter.Msg
+        | ClockMsg of Clock.Msg
 
-  let init () =
-    { Counter = Counter.init
-      Clock = Clock.init () }
+    let update msg m =
+        match msg with
+        | CounterMsg msg ->
+            { m with
+                Counter = Counter.update msg m.Counter }
+        | ClockMsg msg ->
+            { m with
+                Clock = Clock.update msg m.Clock }
 
-  type Msg =
-    | CounterMsg of Counter.Msg
-    | ClockMsg of Clock.Msg
+[<AllowNullLiteral>]
+type CounterWithClockViewModel(args) =
+    inherit ViewModelBase<CounterWithClock.Model, CounterWithClock.Msg>(args)
 
-  let update msg m =
-    match msg with
-    | CounterMsg msg -> { m with Counter = Counter.update msg m.Counter }
-    | ClockMsg msg -> { m with Clock = Clock.update msg m.Clock }
+    new() = CounterWithClockViewModel(CounterWithClock.init () |> ViewModelArgs.simple)
 
-type [<AllowNullLiteral>] CounterWithClockViewModel (args) =
-  inherit ViewModelBase<CounterWithClock.Model, CounterWithClock.Msg>(args)
-  
-  new() = CounterWithClockViewModel(CounterWithClock.init () |> ViewModelArgs.simple)
+    member _.Counter =
+        base.Get
+            ()
+            (Binding.SubModelT.req CounterViewModel
+             >> Binding.mapModel CounterWithClock.ModelM.Counter.get
+             >> Binding.mapMsg CounterWithClock.CounterMsg)
 
-  member _.Counter = base.Get() (Binding.SubModelT.req CounterViewModel >> Binding.mapModel CounterWithClock.ModelM.Counter.get >> Binding.mapMsg CounterWithClock.CounterMsg)
-  member _.Clock = base.Get() (Binding.SubModelT.req ClockViewModel >> Binding.mapModel CounterWithClock.ModelM.Clock.get >> Binding.mapMsg CounterWithClock.ClockMsg)
+    member _.Clock =
+        base.Get
+            ()
+            (Binding.SubModelT.req ClockViewModel
+             >> Binding.mapModel CounterWithClock.ModelM.Clock.get
+             >> Binding.mapMsg CounterWithClock.ClockMsg)
 
 
 module App2 =
 
-  type Model =
-    { ClockCounter1: CounterWithClock.Model
-      ClockCounter2: CounterWithClock.Model }
+    type Model =
+        { ClockCounter1: CounterWithClock.Model
+          ClockCounter2: CounterWithClock.Model }
+
+    module ModelM =
+        module ClockCounter1 =
+            let get m = m.ClockCounter1
+
+        module ClockCounter2 =
+            let get m = m.ClockCounter2
+
+    let init () =
+        { ClockCounter1 = CounterWithClock.init ()
+          ClockCounter2 = CounterWithClock.init () }
+
+    type Msg =
+        | ClockCounter1Msg of CounterWithClock.Msg
+        | ClockCounter2Msg of CounterWithClock.Msg
+
+    let update msg m =
+        match msg with
+        | ClockCounter1Msg msg ->
+            { m with
+                ClockCounter1 = CounterWithClock.update msg m.ClockCounter1 }
+        | ClockCounter2Msg msg ->
+            { m with
+                ClockCounter2 = CounterWithClock.update msg m.ClockCounter2 }
+
+[<AllowNullLiteral>]
+type AppViewModel(args) =
+    inherit ViewModelBase<App2.Model, App2.Msg>(args)
+
+    new() = AppViewModel(App2.init () |> ViewModelArgs.simple)
+
+    member _.ClockCounter1 =
+        base.Get
+            ()
+            (Binding.SubModelT.req CounterWithClockViewModel
+             >> Binding.mapModel App2.ModelM.ClockCounter1.get
+             >> Binding.mapMsg App2.ClockCounter1Msg)
+
+    member _.ClockCounter2 =
+        base.Get
+            ()
+            (Binding.SubModelT.req CounterWithClockViewModel
+             >> Binding.mapModel App2.ModelM.ClockCounter2.get
+             >> Binding.mapMsg App2.ClockCounter2Msg)
 
-  module ModelM =
-    module ClockCounter1 =
-      let get m = m.ClockCounter1
-    module ClockCounter2 =
-      let get m = m.ClockCounter2
+module Program =
 
-  let init () =
-    { ClockCounter1 = CounterWithClock.init ()
-      ClockCounter2 = CounterWithClock.init () }
+    let timerTick dispatch =
+        let timer = new System.Timers.Timer(1000.)
 
-  type Msg =
-    | ClockCounter1Msg of CounterWithClock.Msg
-    | ClockCounter2Msg of CounterWithClock.Msg
+        timer.Elapsed.Add(fun _ ->
+            let clockMsg = DateTimeOffset.Now |> Clock.Tick |> CounterWithClock.ClockMsg
+            dispatch <| App2.ClockCounter1Msg clockMsg
+            dispatch <| App2.ClockCounter2Msg clockMsg)
 
-  let update msg m =
-    match msg with
-    | ClockCounter1Msg msg ->
-        { m with ClockCounter1 = CounterWithClock.update msg m.ClockCounter1 }
-    | ClockCounter2Msg msg ->
-        { m with ClockCounter2 = CounterWithClock.update msg m.ClockCounter2 }
+        timer.Start()
 
-type [<AllowNullLiteral>] AppViewModel (args) =
-  inherit ViewModelBase<App2.Model, App2.Msg>(args)
-  
-  new() = AppViewModel(App2.init () |> ViewModelArgs.simple)
 
-  member _.ClockCounter1 = base.Get() (Binding.SubModelT.req CounterWithClockViewModel >> Binding.mapModel App2.ModelM.ClockCounter1.get >> Binding.mapMsg App2.ClockCounter1Msg)
-  member _.ClockCounter2 = base.Get() (Binding.SubModelT.req CounterWithClockViewModel >> Binding.mapModel App2.ModelM.ClockCounter2.get >> Binding.mapMsg App2.ClockCounter2Msg)
+    let main window =
 
-module Program =
+        let logger =
+            LoggerConfiguration()
+                .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+                .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+                .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+                .WriteTo.Console()
+                .CreateLogger()
 
-  let timerTick dispatch =
-    let timer = new System.Timers.Timer(1000.)
-    timer.Elapsed.Add (fun _ ->
-      let clockMsg =
-        DateTimeOffset.Now
-        |> Clock.Tick
-        |> CounterWithClock.ClockMsg
-      dispatch <| App2.ClockCounter1Msg clockMsg
-      dispatch <| App2.ClockCounter2Msg clockMsg
-    )
-    timer.Start()
-
-
-  let main window =
-
-    let logger =
-      LoggerConfiguration()
-        .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-        .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-        .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-        .WriteTo.Console()
-        .CreateLogger()
-
-    WpfProgram.mkSimpleT App2.init App2.update AppViewModel
-    |> WpfProgram.withSubscription (Sub.fromV3Subscription "sub" (fun _ -> Cmd.ofEffect timerTick))
-    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-    |> WpfProgram.startElmishLoop window
+        WpfProgram.mkSimpleT App2.init App2.update AppViewModel
+        |> WpfProgram.withSubscription (Sub.fromV3Subscription "sub" (fun _ -> Cmd.ofEffect timerTick))
+        |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+        |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Threading.Core/Program.fs b/src/Samples/Threading.Core/Program.fs
index 1e34fa94..92461c21 100644
--- a/src/Samples/Threading.Core/Program.fs
+++ b/src/Samples/Threading.Core/Program.fs
@@ -10,68 +10,66 @@ open Elmish.WPF
 
 
 
-type Model =
-  { Pings: int
-    Message: string }
+type Model = { Pings: int; Message: string }
 
 type Msg =
-  | IncrementPings
-  | UpdateMessage of string
+    | IncrementPings
+    | UpdateMessage of string
 
-type Cmd =
-  | DelayThenIncrementPings
+type Cmd = | DelayThenIncrementPings
 
 
 module Program =
-  module Pings =
-    let get m = m.Pings
-    let set v m = { m with Pings = v }
-    let map f m = m |> get |> f |> set <| m
+    module Pings =
+        let get m = m.Pings
+        let set v m = { m with Pings = v }
+        let map f m = m |> get |> f |> set <| m
 
-  module Message =
-    let get m = m.Message
-    let set v m = { m with Message = v }
+    module Message =
+        let get m = m.Message
+        let set v m = { m with Message = v }
 
-  let init =
-    { Pings = 0; Message = "" }, [ DelayThenIncrementPings ]
+    let init = { Pings = 0; Message = "" }, [ DelayThenIncrementPings ]
 
-  let update msg m =
-    match msg with
-    | IncrementPings -> m |> Pings.map ((+) 1), [ DelayThenIncrementPings ]
-    | UpdateMessage message -> m |> Message.set message, [ ]
+    let update msg m =
+        match msg with
+        | IncrementPings -> m |> Pings.map ((+) 1), [ DelayThenIncrementPings ]
+        | UpdateMessage message -> m |> Message.set message, []
 
-  let bindings () = [
-    "Pings" |> Binding.oneWay Pings.get
-    "Message" |> Binding.twoWay (Message.get, UpdateMessage)
-  ]
+    let bindings () =
+        [ "Pings" |> Binding.oneWay Pings.get
+          "Message" |> Binding.twoWay (Message.get, UpdateMessage) ]
 
-  let toCmd =
-    function
-    | DelayThenIncrementPings ->
-      Elmish.Cmd.OfAsyncImmediate.perform (fun () -> Async.Sleep 1000) () (fun () -> IncrementPings)
+    let toCmd =
+        function
+        | DelayThenIncrementPings ->
+            Elmish.Cmd.OfAsyncImmediate.perform (fun () -> Async.Sleep 1000) () (fun () -> IncrementPings)
 
-let designVm =  ViewModel.designInstance { Pings = 2; Message = "Hello" } (Program.bindings ())
+let designVm =
+    ViewModel.designInstance { Pings = 2; Message = "Hello" } (Program.bindings ())
 
 let main window =
 
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  let program =
-    WpfProgram.mkProgramWithCmdMsg (fun () -> Program.init) Program.update Program.bindings Program.toCmd
-    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-
-  let elmishThread =
-    Thread(
-      ThreadStart(fun () ->
-        WpfProgram.startElmishLoop window program
-        Dispatcher.Run()))
-  elmishThread.Name <- "ElmishDispatchThread"
-  elmishThread.Start()
-
-  elmishThread
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let program =
+        WpfProgram.mkProgramWithCmdMsg (fun () -> Program.init) Program.update Program.bindings Program.toCmd
+        |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+
+    let elmishThread =
+        Thread(
+            ThreadStart(fun () ->
+                WpfProgram.startElmishLoop window program
+                Dispatcher.Run())
+        )
+
+    elmishThread.Name <- "ElmishDispatchThread"
+    elmishThread.Start()
+
+    elmishThread
\ No newline at end of file
diff --git a/src/Samples/UiBoundCmdParam.Core/Program.fs b/src/Samples/UiBoundCmdParam.Core/Program.fs
index ce87dc6b..13878e38 100644
--- a/src/Samples/UiBoundCmdParam.Core/Program.fs
+++ b/src/Samples/UiBoundCmdParam.Core/Program.fs
@@ -6,42 +6,43 @@ open Elmish.WPF
 
 
 type Model =
-  { Numbers: int list
-    EnabledMaxLimit: int }
+    { Numbers: int list
+      EnabledMaxLimit: int }
 
 let init () =
-  { Numbers = [0 .. 10]
-    EnabledMaxLimit = 5 }
+    { Numbers = [ 0..10 ]
+      EnabledMaxLimit = 5 }
 
 type Msg =
-  | SetLimit of int
-  | Command
+    | SetLimit of int
+    | Command
 
 let update msg m =
-  match msg with
-  | SetLimit x -> { m with EnabledMaxLimit = x }
-  | Command -> m
-
-let bindings () : Binding<Model, Msg> list = [
-  "Numbers" |> Binding.oneWay(fun m -> m.Numbers)
-  "Limit" |> Binding.twoWay((fun m -> float m.EnabledMaxLimit), int >> SetLimit)
-  "Command" |> Binding.cmdParamIf(
-    (fun p m -> Command),
-    (fun (p: obj) m -> not (isNull p) && p :?> int <= m.EnabledMaxLimit),
-    true)
-]
+    match msg with
+    | SetLimit x -> { m with EnabledMaxLimit = x }
+    | Command -> m
+
+let bindings () : Binding<Model, Msg> list =
+    [ "Numbers" |> Binding.oneWay (fun m -> m.Numbers)
+      "Limit" |> Binding.twoWay ((fun m -> float m.EnabledMaxLimit), int >> SetLimit)
+      "Command"
+      |> Binding.cmdParamIf (
+          (fun p m -> Command),
+          (fun (p: obj) m -> not (isNull p) && p :?> int <= m.EnabledMaxLimit),
+          true
+      ) ]
 
 let designVm = ViewModel.designInstance (init ()) (bindings ())
 
 let main window =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple init update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple init update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Validation.Core/Program.fs b/src/Samples/Validation.Core/Program.fs
index 8d3da7cd..a333fc8f 100644
--- a/src/Samples/Validation.Core/Program.fs
+++ b/src/Samples/Validation.Core/Program.fs
@@ -9,98 +9,105 @@ open Elmish.WPF
 
 module Result =
 
-  module Error =
+    module Error =
 
-    let toList = function
-      | Ok _ -> []
-      | Error e -> [ e ]
+        let toList =
+            function
+            | Ok _ -> []
+            | Error e -> [ e ]
 
 
 let requireNotEmpty s =
-  if String.IsNullOrEmpty s then Error "This field is required" else Ok s
+    if String.IsNullOrEmpty s then
+        Error "This field is required"
+    else
+        Ok s
 
 let parseInt (s: string) =
-  match Int32.TryParse s with
-  | true, i -> Ok i
-  | false, _ -> Error "Please enter a valid integer"
+    match Int32.TryParse s with
+    | true, i -> Ok i
+    | false, _ -> Error "Please enter a valid integer"
 
 let requireExactly y x =
-  if x = y then Ok x else Error <| sprintf "Please enter %A" y
+    if x = y then Ok x else Error <| sprintf "Please enter %A" y
 
 let validateInt42 =
-  requireNotEmpty
-  >> Result.bind parseInt
-  >> Result.bind (requireExactly 42)
+    requireNotEmpty >> Result.bind parseInt >> Result.bind (requireExactly 42)
 
 
 let validatePassword (s: string) =
-  [
-    if s.All(fun c -> Char.IsDigit c |> not) then
-      "Must contain a digit"
-    if s.All(fun c -> Char.IsLower c |> not) then
-      "Must contain a lowercase letter"
-    if s.All(fun c -> Char.IsUpper c |> not) then
-      "Must contain an uppercase letter"
-  ]
+    [ if s.All(fun c -> Char.IsDigit c |> not) then
+          "Must contain a digit"
+      if s.All(fun c -> Char.IsLower c |> not) then
+          "Must contain a lowercase letter"
+      if s.All(fun c -> Char.IsUpper c |> not) then
+          "Must contain an uppercase letter" ]
 
 
 type Model =
-  { UpdateCount: int
-    Value: string
-    Password: string }
+    { UpdateCount: int
+      Value: string
+      Password: string }
 
 let init () =
-  { UpdateCount = 0
-    Value = ""
-    Password = "" }
+    { UpdateCount = 0
+      Value = ""
+      Password = "" }
 
 type Msg =
-  | NewValue of string
-  | NewPassword of string
-  | Submit
+    | NewValue of string
+    | NewPassword of string
+    | Submit
 
 let increaseUpdateCount m =
-  { m with UpdateCount = m.UpdateCount + 1 }
+    { m with
+        UpdateCount = m.UpdateCount + 1 }
 
 let update msg m =
-  let m = increaseUpdateCount m
-  match msg with
-  | NewValue x -> { m with Value = x }
-  | NewPassword x -> { m with Password = x }
-  | Submit -> m
+    let m = increaseUpdateCount m
+
+    match msg with
+    | NewValue x -> { m with Value = x }
+    | NewPassword x -> { m with Password = x }
+    | Submit -> m
 
 let errorOnEven m =
-  if m.UpdateCount % 2 = 0 then
-    [ "Even counts have this error" ]
-  else
-    []
-
-let bindings () : Binding<Model, Msg> list = [
-  "UpdateCount"
-    |> Binding.oneWay(fun m -> m.UpdateCount)
-    |> Binding.addValidation errorOnEven
-  "Value"
-    |> Binding.twoWay((fun m -> m.Value), NewValue)
-    |> Binding.addValidation(fun m ->  m.Value |> validateInt42 |> Result.Error.toList)
-  "Password"
-    |> Binding.twoWay((fun m -> m.Password), NewPassword)
-    |> Binding.addValidation(fun m -> m.Password |> validatePassword)
-  "Submit" |> Binding.cmdIf(
-    (fun _ -> Submit),
-    (fun m -> (match validateInt42 m.Value with Ok _ -> true | Error _ -> false) && (validatePassword m.Password |> List.isEmpty)))
-]
+    if m.UpdateCount % 2 = 0 then
+        [ "Even counts have this error" ]
+    else
+        []
+
+let bindings () : Binding<Model, Msg> list =
+    [ "UpdateCount"
+      |> Binding.oneWay (fun m -> m.UpdateCount)
+      |> Binding.addValidation errorOnEven
+      "Value"
+      |> Binding.twoWay ((fun m -> m.Value), NewValue)
+      |> Binding.addValidation (fun m -> m.Value |> validateInt42 |> Result.Error.toList)
+      "Password"
+      |> Binding.twoWay ((fun m -> m.Password), NewPassword)
+      |> Binding.addValidation (fun m -> m.Password |> validatePassword)
+      "Submit"
+      |> Binding.cmdIf (
+          (fun _ -> Submit),
+          (fun m ->
+              (match validateInt42 m.Value with
+               | Ok _ -> true
+               | Error _ -> false)
+              && (validatePassword m.Password |> List.isEmpty))
+      ) ]
 
 let designVm = ViewModel.designInstance (init ()) (bindings ())
 
 let main window =
-  let logger =
-    LoggerConfiguration()
-      .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
-      .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
-      .WriteTo.Console()
-      .CreateLogger()
-
-  WpfProgram.mkSimple init update bindings
-  |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
-  |> WpfProgram.startElmishLoop window
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimple init update bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file

From 78bc7b16df257566489a35d72c7099a50d3e4730 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 17:15:51 +0200
Subject: [PATCH 05/18] Improve XML documentation in code

Improve code documentation comments of Elmish.WPF project.
---
 src/Elmish.WPF/Binding.fs          | 185 ++++++++++++++++++++++++++++-
 src/Elmish.WPF/BindingData.fs      | 115 ++++++++++++++++++
 src/Elmish.WPF/BindingVmHelpers.fs | 103 ++++++++++++++++
 src/Elmish.WPF/Command.fs          |  10 ++
 src/Elmish.WPF/InternalUtils.fs    |  90 ++++++++++++++
 src/Elmish.WPF/Merge.fs            |  51 ++++++++
 src/Elmish.WPF/Utils.fs            |  15 +++
 src/Elmish.WPF/ViewModelArgs.fs    |  24 ++++
 src/Elmish.WPF/ViewModelModule.fs  |   6 +
 src/Elmish.WPF/ViewModels.fs       |  37 ++++++
 src/Elmish.WPF/WindowState.fs      |  58 ++++++++-
 src/Elmish.WPF/WpfProgram.fs       | 106 +++++++++++++++--
 12 files changed, 783 insertions(+), 17 deletions(-)

diff --git a/src/Elmish.WPF/Binding.fs b/src/Elmish.WPF/Binding.fs
index 1a71758e..3077b11e 100644
--- a/src/Elmish.WPF/Binding.fs
+++ b/src/Elmish.WPF/Binding.fs
@@ -14,34 +14,72 @@ module Binding =
         { Name = binding.Name
           Data = binding.Data |> f }
 
+    /// <summary>
     /// Boxes the output parameter.
     /// Allows using a strongly-typed submodel binding (from a module ending in "T")
     /// in a binding list (rather than in a view model class member as normal).
+    /// </summary>
+    /// <param name="binding">The strongly-typed binding to box.</param>
+    /// <returns>A boxed binding suitable for use in binding lists.</returns>
     let boxT (binding: Binding<'b, 'msg, 't>) = BindingData.boxT |> mapData <| binding
 
-    /// Unboxes the output parameter
+    /// <summary>
+    /// Unboxes the output parameter.
+    /// </summary>
+    /// <param name="binding">The boxed binding to unbox.</param>
+    /// <returns>A strongly-typed binding with the output parameter unboxed.</returns>
     let unboxT (binding: Binding<'b, 'msg>) : Binding<'b, 'msg, 't> =
         BindingData.unboxT |> mapData <| binding
 
+    /// <summary>
     /// Maps the model of a binding via a contravariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function from 'a to 'b.</param>
+    /// <param name="binding">The binding whose model is to be mapped.</param>
+    /// <returns>A binding with the model mapped.</returns>
     let mapModel (f: 'a -> 'b) (binding: Binding<'b, 'msg, 't>) = f |> mapModel |> mapData <| binding
 
+    /// <summary>
     /// Maps the message of a binding with access to the model via a covariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function that takes a message and the model to produce a new message.</param>
+    /// <param name="binding">The binding whose message is to be mapped.</param>
+    /// <returns>A binding with the message mapped.</returns>
     let mapMsgWithModel (f: 'a -> 'model -> 'b) (binding: Binding<'model, 'a, 't>) =
         f |> mapMsgWithModel |> mapData <| binding
 
+    /// <summary>
     /// Maps the message of a binding via a covariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function from message 'a to message 'b.</param>
+    /// <param name="binding">The binding whose message is to be mapped.</param>
+    /// <returns>A binding with the message mapped.</returns>
     let mapMsg (f: 'a -> 'b) (binding: Binding<'model, 'a, 't>) = f |> mapMsg |> mapData <| binding
 
+    /// <summary>
     /// Sets the message of a binding with access to the model.
+    /// </summary>
+    /// <param name="f">The function that takes the model and produces the message.</param>
+    /// <param name="binding">The binding whose message is to be set.</param>
+    /// <returns>A binding with the message set based on the model.</returns>
     let setMsgWithModel (f: 'model -> 'b) (binding: Binding<'model, 'a, 't>) =
         f |> setMsgWithModel |> mapData <| binding
 
+    /// <summary>
     /// Sets the message of a binding.
+    /// </summary>
+    /// <param name="msg">The message to set.</param>
+    /// <param name="binding">The binding whose message is to be set.</param>
+    /// <returns>A binding with the specified message.</returns>
     let setMsg (msg: 'b) (binding: Binding<'model, 'a, 't>) = msg |> setMsg |> mapData <| binding
 
 
+    /// <summary>
     /// Restricts the binding to models that satisfy the predicate after some model satisfies the predicate.
+    /// </summary>
+    /// <param name="predicate">The predicate that determines which models are valid.</param>
+    /// <param name="binding">The binding to which the sticky behavior is added.</param>
+    /// <returns>A binding that remains active only for models satisfying the predicate once triggered.</returns>
     let addSticky (predicate: 'model -> bool) (binding: Binding<'model, 'msg, 't>) =
         predicate |> addSticky |> mapData <| binding
 
@@ -106,29 +144,49 @@ module Binding =
     /// </summary>
     module OneWayT =
 
+        /// <summary>
         /// Elemental instance of a one-way binding.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way binding.</returns>
         let id<'a, 'msg> : string -> Binding<'a, 'msg, 'a> = OneWay.id |> createBindingT
 
+        /// <summary>
         /// Creates a one-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="x">The name of the binding.</param>
+        /// <returns>A one-way binding for optional values.</returns>
         let opt x : Binding<'a option, 'msg, System.Nullable<'a>> = x |> id |> mapModel Option.toNullable
 
+        /// <summary>
         /// Creates a one-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="x">The name of the binding.</param>
+        /// <returns>A one-way binding for value optional values.</returns>
         let vopt x : Binding<'a voption, 'msg, System.Nullable<'a>> =
             x |> id |> mapModel ValueOption.toNullable
 
+        /// <summary>
         /// Creates a one-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way binding for optional reference types.</returns>
         let optobj<'a, 'msg when 'a: null> : string -> Binding<'a option, 'msg, 'a> =
             id<'a, 'msg> >> mapModel Option.toObj
 
+        /// <summary>
         /// Creates a one-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way binding for value optional reference types.</returns>
         let voptobj<'a, 'msg when 'a: null> : string -> Binding<'a voption, 'msg, 'a> =
             id<'a, 'msg> >> mapModel ValueOption.toObj
 
@@ -137,30 +195,50 @@ module Binding =
     /// </summary>
     module OneWayToSourceT =
 
+        /// <summary>
         /// Elemental instance of a one-way-to-source binding.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding.</returns>
         let id<'model, 'a> : string -> Binding<'model, 'a, 'a> =
             OneWayToSource.id |> createBindingT
 
+        /// <summary>
         /// Creates a one-way-to-source binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding for optional reference types.</returns>
         let optobj<'a, 'model when 'a: null> : string -> Binding<'model, 'a option, 'a> =
             id<'model, 'a> >> mapMsg Option.ofObj
 
+        /// <summary>
         /// Creates a one-way-to-source binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding for value optional reference types.</returns>
         let voptobj<'a, 'model when 'a: null> : string -> Binding<'model, 'a voption, 'a> =
             id<'model, 'a> >> mapMsg ValueOption.ofObj
 
+        /// <summary>
         /// Creates a one-way-to-source binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="x">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding for optional nullable values.</returns>
         let opt x : Binding<'model, 'a option, System.Nullable<'a>> = x |> id |> mapMsg Option.ofNullable
 
+        /// <summary>
         /// Creates a one-way-to-source binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="x">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding for value optional nullable values.</returns>
         let vopt x : Binding<'model, 'a voption, System.Nullable<'a>> =
             x |> id |> mapMsg ValueOption.ofNullable
 
@@ -169,30 +247,50 @@ module Binding =
     /// </summary>
     module TwoWayT =
 
+        /// <summary>
         /// Elemental instance of a two-way binding.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding.</returns>
         let id<'a> : string -> Binding<'a, 'a, 'a> = TwoWay.id |> createBindingT
 
+        /// <summary>
         /// Creates a two-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="x">The name of the binding.</param>
+        /// <returns>A two-way binding for optional nullable values.</returns>
         let opt x : Binding<'a option, 'a option, System.Nullable<'a>> =
             x |> id |> mapMsg Option.ofNullable |> mapModel Option.toNullable
 
+        /// <summary>
         /// Creates a two-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="x">The name of the binding.</param>
+        /// <returns>A two-way binding for value optional nullable values.</returns>
         let vopt x : Binding<'a voption, 'a voption, System.Nullable<'a>> =
             x |> id |> mapMsg ValueOption.ofNullable |> mapModel ValueOption.toNullable
 
+        /// <summary>
         /// Creates a two-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for optional reference types.</returns>
         let optobj<'a when 'a: null> : string -> Binding<'a option, 'a option, 'a> =
             id<'a> >> mapModel Option.toObj >> mapMsg Option.ofObj
 
+        /// <summary>
         /// Creates a two-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for value optional reference types.</returns>
         let voptobj<'a when 'a: null> : string -> Binding<'a voption, 'a voption, 'a> =
             id<'a> >> mapMsg ValueOption.ofObj >> mapModel ValueOption.toObj
 
@@ -268,67 +366,105 @@ module Binding =
 
     module OneWay =
 
+        /// <summary>
         /// Elemental instance of a one-way binding.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way binding.</returns>
         let id<'a, 'msg> : string -> Binding<'a, 'msg> = OneWay.id |> createBinding
 
+        /// <summary>
         /// Creates a one-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way binding for optional values.</returns>
         let opt<'a, 'msg> : string -> Binding<'a option, 'msg> =
             id<obj, 'msg> >> mapModel Option.box
 
+        /// <summary>
         /// Creates a one-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way binding for value optional values.</returns>
         let vopt<'a, 'msg> : string -> Binding<'a voption, 'msg> =
             id<obj, 'msg> >> mapModel ValueOption.box
 
 
     module OneWayToSource =
 
+        /// <summary>
         /// Elemental instance of a one-way-to-source binding.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding.</returns>
         let id<'model, 'a> : string -> Binding<'model, 'a> =
             OneWayToSource.id |> createBinding
 
+        /// <summary>
         /// Creates a one-way-to-source binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding for value optional values.</returns>
         let vopt<'model, 'a> : string -> Binding<'model, 'a voption> =
             id<'model, obj> >> mapMsg ValueOption.unbox
 
+        /// <summary>
         /// Creates a one-way-to-source binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A one-way-to-source binding for optional values.</returns>
         let opt<'model, 'a> : string -> Binding<'model, 'a option> =
             id<'model, obj> >> mapMsg Option.unbox
 
 
     module TwoWay =
 
+        /// <summary>
         /// Elemental instance of a two-way binding.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding.</returns>
         let id<'a> : string -> Binding<'a, 'a> = TwoWay.id |> createBinding
 
+        /// <summary>
         /// Creates a two-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for value optional values.</returns>
         let vopt<'a> : string -> Binding<'a voption, 'a voption> =
             id<obj> >> mapModel ValueOption.box >> mapMsg ValueOption.unbox
 
+        /// <summary>
         /// Creates a two-way binding to an optional value. The binding
         /// automatically converts between a missing value in the model and
         /// a <c>null</c> value in the view.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for optional values.</returns>
         let opt<'a> : string -> Binding<'a option, 'a option> =
             id<obj> >> mapModel Option.box >> mapMsg Option.unbox
 
 
     module SubModelSelectedItem =
 
+        /// <summary>
         /// Creates a two-way binding to a <c>SelectedItem</c>-like property where
         /// the <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
         /// binding. Automatically converts the dynamically created Elmish.WPF view
         /// models to/from their corresponding IDs, so the Elmish user code only has
         /// to work with the IDs.
-        ///
+        /// </summary>
+        /// <remarks>
         /// Only use this if you are unable to use some kind of <c>SelectedValue</c>
         /// or <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
         /// binding. This binding is less type-safe. It will throw when initializing
@@ -336,18 +472,24 @@ module Binding =
         /// does not correspond to a <see cref="subModelSeq" /> binding, and it will
         /// throw at runtime if the inferred <c>'id</c> type does not match the
         /// actual ID type used in that binding.
+        /// </remarks>
+        /// <param name="subModelSeqBindingName">The name of the subModelSeq binding.</param>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for the selected item ID.</returns>
         let vopt subModelSeqBindingName : string -> Binding<'id voption, 'id voption> =
             SubModelSelectedItem.create subModelSeqBindingName
             |> createBinding
             >> mapModel (ValueOption.map box)
             >> mapMsg (ValueOption.map unbox)
 
+        /// <summary>
         /// Creates a two-way binding to a <c>SelectedItem</c>-like property where
         /// the <c>ItemsSource</c>-like property is a <see cref="subModelSeq" />
         /// binding. Automatically converts the dynamically created Elmish.WPF view
         /// models to/from their corresponding IDs, so the Elmish user code only has
         /// to work with the IDs.
-        ///
+        /// </summary>
+        /// <remarks>
         /// Only use this if you are unable to use some kind of <c>SelectedValue</c>
         /// or <c>SelectedIndex</c> property with a normal <see cref="twoWay" />
         /// binding. This binding is less type-safe. It will throw when initializing
@@ -355,6 +497,10 @@ module Binding =
         /// does not correspond to a <see cref="subModelSeq" /> binding, and it will
         /// throw at runtime if the inferred <c>'id</c> type does not match the
         /// actual ID type used in that binding.
+        /// </remarks>
+        /// <param name="subModelSeqBindingName">The name of the subModelSeq binding.</param>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for the selected item ID.</returns>
         let opt subModelSeqBindingName : string -> Binding<'id option, 'id option> =
             vopt subModelSeqBindingName
             >> mapModel ValueOption.ofOption
@@ -412,13 +558,21 @@ module Binding =
     /// </summary>
     module SubModelT =
 
+        /// <summary>
         /// Exposes an optional view model member for binding.
+        /// </summary>
+        /// <param name="createVm">Function to create the view model.</param>
+        /// <returns>A binding function for optional view models.</returns>
         let opt
             (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
             : (string -> Binding<'bindingModel voption, 'msg, #IViewModel<'bindingModel, 'msg>>) =
             SubModel.create createVm IViewModel.updateModel |> createBindingT
 
+        /// <summary>
         /// Exposes a non-optional view model member for binding.
+        /// </summary>
+        /// <param name="createVm">Function to create the view model.</param>
+        /// <returns>A binding function for required view models.</returns>
         let req
             (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
             : (string -> Binding<'bindingModel, 'msg, #IViewModel<'bindingModel, 'msg>>) =
@@ -455,6 +609,8 @@ module Binding =
         ///   The function applied to every element of the bound <c>ObservableCollection</c>
         ///   to create a child view model.
         /// </param>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A binding for a collection of view models identified by index.</returns>
         let id
             (createVm: ViewModelArgs<'bindingModel, 'msg> -> #IViewModel<'bindingModel, 'msg>)
             : (string
@@ -547,13 +703,21 @@ module Binding =
 
 
     module SelectedIndex =
+        /// <summary>
         /// Prebuilt binding intended for use with <code>Selector.SelectedIndex</code>.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for nullable selected index.</returns>
         let vopt =
             TwoWay.id
             >> mapModel (ValueOption.defaultValue -1)
             >> mapMsg (fun i -> if i < 0 then ValueNone else ValueSome i)
 
+        /// <summary>
         /// Prebuilt binding intended for use with <code>Selector.SelectedIndex</code>.
+        /// </summary>
+        /// <param name="name">The name of the binding.</param>
+        /// <returns>A two-way binding for optional selected index.</returns>
         let opt = vopt >> mapModel ValueOption.ofOption >> mapMsg ValueOption.toOption
 
 
@@ -579,15 +743,30 @@ module Binding =
 
 module Bindings =
 
+    /// <summary>
     /// Maps the model of a list of bindings via a contravariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function from 'a to 'b.</param>
+    /// <param name="bindings">The list of bindings to map.</param>
+    /// <returns>A list of bindings with the model mapped.</returns>
     let mapModel (f: 'a -> 'b) (bindings: Binding<'b, 'msg> list) =
         f |> Binding.mapModel |> List.map <| bindings
 
+    /// <summary>
     /// Maps the message of a list of bindings with access to the model via a covariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function that takes a message and the model to produce a new message.</param>
+    /// <param name="bindings">The list of bindings to map.</param>
+    /// <returns>A list of bindings with the message mapped.</returns>
     let mapMsgWithModel (f: 'a -> 'model -> 'b) (bindings: Binding<'model, 'a> list) =
         f |> Binding.mapMsgWithModel |> List.map <| bindings
 
+    /// <summary>
     /// Maps the message of a list of bindings via a covariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function from message 'a to message 'b.</param>
+    /// <param name="bindings">The list of bindings to map.</param>
+    /// <returns>A list of bindings with the message mapped.</returns>
     let mapMsg (f: 'a -> 'b) (bindings: Binding<'model, 'a> list) =
         f |> Binding.mapMsg |> List.map <| bindings
 
diff --git a/src/Elmish.WPF/BindingData.fs b/src/Elmish.WPF/BindingData.fs
index d06e2245..a128e2e1 100644
--- a/src/Elmish.WPF/BindingData.fs
+++ b/src/Elmish.WPF/BindingData.fs
@@ -10,6 +10,14 @@ open Elmish
 
 module Helper =
 
+    /// <summary>
+    /// Maps dispatch function to handle binding messages by getting the current model,
+    /// applying a message transformation, and dispatching the result.
+    /// </summary>
+    /// <param name="getCurrentModel">Function to get the current model state.</param>
+    /// <param name="set">Function to transform binding message and model into a message.</param>
+    /// <param name="dispatch">The dispatch function to send messages.</param>
+    /// <returns>A function that takes a binding message and dispatches the transformed message.</returns>
     let mapDispatch
         (getCurrentModel: unit -> 'model)
         (set: 'bindingMsg -> 'model -> 'msg)
@@ -18,12 +26,21 @@ module Helper =
         fun bMsg -> getCurrentModel () |> set bMsg |> dispatch
 
 
+/// <summary>
+/// Represents a one-way binding that flows data from the model to the view.
+/// </summary>
 type OneWayData<'model, 'a> = { Get: 'model -> 'a }
 
 
+/// <summary>
+/// Represents a one-way binding that flows data from the view to the model.
+/// </summary>
 type OneWayToSourceData<'model, 'msg, 'a> = { Set: 'a -> 'model -> 'msg }
 
 
+/// <summary>
+/// Represents a one-way binding for sequences/collections with efficient updating.
+/// </summary>
 type OneWaySeqData<'model, 'a, 'aCollection, 'id when 'id: equality> =
     { Get: 'model -> 'a seq
       CreateCollection: 'a seq -> CollectionTarget<'a, 'aCollection>
@@ -41,23 +58,35 @@ type OneWaySeqData<'model, 'a, 'aCollection, 'id when 'id: equality> =
         Merge.keyed d.GetId d.GetId create update values newVals
 
 
+/// <summary>
+/// Represents a two-way binding that flows data between the model and view in both directions.
+/// </summary>
 type TwoWayData<'model, 'msg, 'a> =
     { Get: 'model -> 'a
       Set: 'a -> 'model -> 'msg }
 
 
+/// <summary>
+/// Represents a command binding following the WPF ICommand pattern.
+/// </summary>
 type CmdData<'model, 'msg> =
     { Exec: obj -> 'model -> 'msg voption
       CanExec: obj -> 'model -> bool
       AutoRequery: bool }
 
 
+/// <summary>
+/// Represents a binding for selected items in a sub-model sequence.
+/// </summary>
 type SubModelSelectedItemData<'model, 'msg, 'id> =
     { Get: 'model -> 'id voption
       Set: 'id voption -> 'model -> 'msg
       SubModelSeqBindingName: string }
 
 
+/// <summary>
+/// Represents a binding to a sub-model/child view model.
+/// </summary>
 type SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
     { GetModel: 'model -> 'bindingModel voption
       CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
@@ -65,6 +94,9 @@ type SubModelData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
       ToMsg: 'model -> 'bindingMsg -> 'msg }
 
 
+/// <summary>
+/// Represents a binding to a sub-model displayed in a separate window.
+/// </summary>
 and SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
     { GetState: 'model -> WindowState<'bindingModel>
       CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
@@ -75,6 +107,9 @@ and SubModelWinData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm> =
       OnCloseRequested: 'model -> 'msg voption }
 
 
+/// <summary>
+/// Represents a binding to a sequence of sub-models without unique identifiers.
+/// </summary>
 and SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection> =
     { GetModels: 'model -> 'bindingModel seq
       CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
@@ -83,6 +118,9 @@ and SubModelSeqUnkeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCol
       ToMsg: 'model -> int * 'bindingMsg -> 'msg }
 
 
+/// <summary>
+/// Represents a binding to a sequence of sub-models with unique identifiers for efficient updates.
+/// </summary>
 and SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmCollection, 'id when 'id: equality> =
     { GetSubModels: 'model -> 'bindingModel seq
       CreateViewModel: ViewModelArgs<'bindingModel, 'bindingMsg> -> 'vm
@@ -103,11 +141,17 @@ and SubModelSeqKeyedData<'model, 'msg, 'bindingModel, 'bindingMsg, 'vm, 'vmColle
         Merge.keyed d.BmToId d.VmToId create update values newSubModels
 
 
+/// <summary>
+/// Wraps a binding with validation capabilities using INotifyDataErrorInfo.
+/// </summary>
 and ValidationData<'model, 'msg, 't> =
     { BindingData: BindingData<'model, 'msg, 't>
       Validate: 'model -> string list }
 
 
+/// <summary>
+/// Wraps a binding with lazy evaluation to skip updates when models are equal.
+/// </summary>
 and LazyData<'model, 'msg, 'bindingModel, 'bindingMsg, 't> =
     { BindingData: BindingData<'bindingModel, 'bindingMsg, 't>
       Get: 'model -> 'bindingModel
@@ -118,6 +162,9 @@ and LazyData<'model, 'msg, 'bindingModel, 'bindingMsg, 't> =
         Helper.mapDispatch getCurrentModel this.Set dispatch
 
 
+/// <summary>
+/// Wraps a binding allowing transformation of the message stream (e.g., throttling, debouncing).
+/// </summary>
 and AlterMsgStreamData<'model, 'msg, 'bindingModel, 'bindingMsg, 'dispatchMsg, 't> =
     { BindingData: BindingData<'bindingModel, 'bindingMsg, 't>
       Get: 'model -> 'bindingModel
@@ -128,6 +175,9 @@ and AlterMsgStreamData<'model, 'msg, 'bindingModel, 'bindingMsg, 'dispatchMsg, '
         Helper.mapDispatch getCurrentModel this.Set dispatch |> this.AlterMsgStream
 
 
+/// <summary>
+/// Discriminated union representing all base binding types.
+/// </summary>
 and BaseBindingData<'model, 'msg, 't> =
     | OneWayData of OneWayData<'model, 't>
     | OneWayToSourceData of OneWayToSourceData<'model, 'msg, 't>
@@ -141,6 +191,9 @@ and BaseBindingData<'model, 'msg, 't> =
     | SubModelSelectedItemData of SubModelSelectedItemData<'model, 'msg, obj>
 
 
+/// <summary>
+/// Main discriminated union representing binding data with possible decorators.
+/// </summary>
 and BindingData<'model, 'msg, 't> =
     | BaseBindingData of BaseBindingData<'model, 'msg, 't>
     | CachingData of BindingData<'model, 'msg, 't>
@@ -234,9 +287,25 @@ module BindingData =
                       Get = d.Get
                       Set = d.Set }
 
+    /// <summary>
+    /// Boxes the type parameter of a binding for generic handling.
+    /// </summary>
+    /// <param name="b">The binding to box.</param>
+    /// <returns>A binding with boxed type parameter.</returns>
     let boxT b = MapT.recursiveCase box unbox b
+    
+    /// <summary>
+    /// Unboxes the type parameter of a binding.
+    /// </summary>
+    /// <param name="b">The binding to unbox.</param>
+    /// <returns>A binding with unboxed type parameter.</returns>
     let unboxT b = MapT.recursiveCase unbox box b
 
+    /// <summary>
+    /// Maps the model of a binding via a contravariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function.</param>
+    /// <returns>A function that transforms the binding's model type.</returns>
     let mapModel f =
         let binaryHelper binary x m = binary x (f m)
 
@@ -319,6 +388,11 @@ module BindingData =
 
         recursiveCase
 
+    /// <summary>
+    /// Maps the message of a binding with access to the model via a covariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function that takes a message and the model.</param>
+    /// <returns>A function that transforms the binding's message type.</returns>
     let mapMsgWithModel (f: 'a -> 'model -> 'b) =
         let baseCase =
             function
@@ -394,16 +468,51 @@ module BindingData =
 
         recursiveCase
 
+    /// <summary>
+    /// Maps the message of a binding via a covariant mapping.
+    /// </summary>
+    /// <param name="f">The mapping function.</param>
+    /// <returns>A function that transforms the binding's message type.</returns>
     let mapMsg f = mapMsgWithModel (fun a _ -> f a)
 
+    /// <summary>
+    /// Sets the message of a binding with access to the model.
+    /// </summary>
+    /// <param name="f">Function that produces the message from the model.</param>
+    /// <returns>A function that sets the binding's message based on the model.</returns>
     let setMsgWithModel f = mapMsgWithModel (fun _ m -> f m)
+    
+    /// <summary>
+    /// Sets the message of a binding to a constant value.
+    /// </summary>
+    /// <param name="msg">The message to set.</param>
+    /// <returns>A function that sets the binding's message.</returns>
     let setMsg msg = mapMsg (fun _ -> msg)
 
+    /// <summary>
+    /// Adds caching to the given binding. The cache holds a single value and
+    /// is invalidated after the binding raises the PropertyChanged event.
+    /// </summary>
+    /// <param name="b">The binding to add caching to.</param>
+    /// <returns>A cached binding.</returns>
     let addCaching b = b |> CachingData
 
+    /// <summary>
+    /// Adds validation to the given binding using INotifyDataErrorInfo.
+    /// </summary>
+    /// <param name="validate">Function that returns validation errors for the model.</param>
+    /// <param name="b">The binding to add validation to.</param>
+    /// <returns>A binding with validation.</returns>
     let addValidation validate b =
         { BindingData = b; Validate = validate } |> ValidationData
 
+    /// <summary>
+    /// Adds laziness to the updating of the given binding. If the models are considered equal,
+    /// then updating of the given binding is skipped.
+    /// </summary>
+    /// <param name="equals">Function to determine if two models are equal.</param>
+    /// <param name="b">The binding to add laziness to.</param>
+    /// <returns>A lazy binding.</returns>
     let addLazy (equals: 'model -> 'model -> bool) b =
         { BindingData = b |> mapModel unbox |> mapMsg box
           Get = box
@@ -425,6 +534,12 @@ module BindingData =
                 unbox >> g }
         |> AlterMsgStreamData
 
+    /// <summary>
+    /// Restricts the binding to models that satisfy the predicate after some model satisfies the predicate.
+    /// </summary>
+    /// <param name="predicate">The predicate that determines which models are valid.</param>
+    /// <param name="binding">The binding to which the sticky behavior is added.</param>
+    /// <returns>A binding that remains active only for models satisfying the predicate once triggered.</returns>
     let addSticky (predicate: 'model -> bool) (binding: BindingData<'model, 'msg, 't>) =
         let mutable stickyModel = None
 
diff --git a/src/Elmish.WPF/BindingVmHelpers.fs b/src/Elmish.WPF/BindingVmHelpers.fs
index e9d46550..8df76512 100644
--- a/src/Elmish.WPF/BindingVmHelpers.fs
+++ b/src/Elmish.WPF/BindingVmHelpers.fs
@@ -7,9 +7,15 @@ open Microsoft.Extensions.Logging
 open Elmish
 
 
+/// <summary>
+/// Discriminated union representing different types of UI update events
+/// </summary>
 type UpdateData =
+    /// <summary>Validation errors changed for the specified property</summary>
     | ErrorsChanged of string
+    /// <summary>Property value changed for the specified property</summary>
     | PropertyChanged of string
+    /// <summary>Command's CanExecute state changed</summary>
     | CanExecuteChanged of Command
 
 module UpdateData =
@@ -24,14 +30,32 @@ type GetErrorSubModelSelectedItem =
       SubModelSeqBindingName: string
       Id: string }
 
+/// <summary>
+/// Errors that can occur when getting a binding value
+/// </summary>
 [<RequireQualifiedAccess>]
 type GetError =
+    /// <summary>Attempted to get value from a one-way-to-source binding</summary>
     | OneWayToSource
+    /// <summary>Failed to find selected item in sub-model sequence</summary>
     | SubModelSelectedItem of GetErrorSubModelSelectedItem
+    /// <summary>Failed to convert value option to null</summary>
     | ToNullError of ValueOption.ToNullError
 
 
 module Helpers2 =
+    /// <summary>
+    /// Shows a new window with the specified configuration
+    /// </summary>
+    /// <param name="winRef">Weak reference to store the window</param>
+    /// <param name="getWindow">Function to create the window</param>
+    /// <param name="isDialog">Whether to show as modal dialog</param>
+    /// <param name="onCloseRequested">Handler for close requests</param>
+    /// <param name="preventClose">Reference to control close prevention</param>
+    /// <param name="dataContext">Data context for the window</param>
+    /// <param name="initialVisibility">Initial visibility state</param>
+    /// <param name="getCurrentModel">Function to get current model</param>
+    /// <param name="dispatch">Message dispatch function</param>
     let showNewWindow
         (winRef: WeakReference<Window>)
         (getWindow: 'model -> Dispatch<'msg> -> Window)
@@ -75,6 +99,17 @@ module Helpers2 =
                 win.Visibility <- initialVisibility)
         |> ignore
 
+    /// <summary>
+    /// Measures execution time of a function and logs if it exceeds threshold
+    /// </summary>
+    /// <param name="logPerformance">Logger for performance metrics</param>
+    /// <param name="logLevel">Log level to use</param>
+    /// <param name="performanceLogThresholdMs">Threshold in milliseconds</param>
+    /// <param name="name">Name of the measurement</param>
+    /// <param name="nameChain">Binding name chain for context</param>
+    /// <param name="callName">Name of the call being measured</param>
+    /// <param name="f">Function to measure</param>
+    /// <returns>The measured function</returns>
     let measure
         (logPerformance: ILogger)
         (logLevel: LogLevel)
@@ -206,7 +241,13 @@ and AlterMsgStreamBinding<'model, 'bindingModel, 'bindingMsg, 't> =
     { Binding: VmBinding<'bindingModel, 'bindingMsg, 't>
       Get: 'model -> 'bindingModel }
 
+/// <summary>
 /// Represents all necessary data used in an active binding.
+/// This is the core type that encapsulates different binding behaviors.
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
+/// <typeparam name="'t">The type of the binding value</typeparam>
 and VmBinding<'model, 'msg, 't> =
     | BaseVmBinding of BaseVmBinding<'model, 'msg, 't>
     | Cached of CachedBinding<'model, 'msg, 't>
@@ -215,6 +256,10 @@ and VmBinding<'model, 'msg, 't> =
     | AlterMsgStream of AlterMsgStreamBinding<'model, obj, obj, 't>
 
 
+    /// <summary>
+    /// Adds caching behavior to this binding
+    /// </summary>
+    /// <returns>A new binding with caching enabled</returns>
     member this.AddCaching =
         let mutable cache = None in
 
@@ -223,6 +268,12 @@ and VmBinding<'model, 'msg, 't> =
               GetCache = (fun () -> cache)
               SetCache = fun c -> cache <- c }
 
+    /// <summary>
+    /// Adds validation behavior to this binding
+    /// </summary>
+    /// <param name="currentModel">The current model state</param>
+    /// <param name="validate">Validation function</param>
+    /// <returns>A new binding with validation enabled</returns>
     member this.AddValidation currentModel validate =
         { Binding = this
           Validate = validate
@@ -656,11 +707,22 @@ type Initialize<'t>
         }
 
 
+/// <summary>
 /// Updates the binding and returns a list indicating what events to raise for this binding
+/// </summary>
+/// <typeparam name="'t">The type of the binding value</typeparam>
+/// <param name="loggingArgs">Logging configuration</param>
+/// <param name="name">The binding name</param>
 type Update<'t>(loggingArgs: LoggingViewModelArgs, name: string) =
 
     let { log = log; nameChain = nameChain } = loggingArgs
 
+    /// <summary>
+    /// Updates a base binding and returns events to raise
+    /// </summary>
+    /// <param name="newModel">The new model state</param>
+    /// <param name="binding">The binding to update</param>
+    /// <returns>List of update events to raise</returns>
     member _.Base<'model, 'msg>(newModel: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
         match binding with
         | OneWay _
@@ -827,6 +889,13 @@ type Update<'t>(loggingArgs: LoggingViewModelArgs, name: string) =
 
             []
 
+    /// <summary>
+    /// Recursively updates a binding and its wrappers
+    /// </summary>
+    /// <param name="currentModel">The current model state</param>
+    /// <param name="newModel">The new model state</param>
+    /// <param name="binding">The binding to update</param>
+    /// <returns>List of update events to raise</returns>
     member this.Recursive<'model, 'msg>
         (currentModel: 'model, newModel: 'model, binding: VmBinding<'model, 'msg, 't>)
         : UpdateData list =
@@ -860,8 +929,19 @@ type Update<'t>(loggingArgs: LoggingViewModelArgs, name: string) =
         | AlterMsgStream b -> this.Recursive(currentModel |> b.Get, b.Get newModel, b.Binding)
 
 
+/// <summary>
+/// Gets the value from a binding
+/// </summary>
+/// <typeparam name="'t">The type of the binding value</typeparam>
+/// <param name="nameChain">The binding name chain for logging</param>
 type Get<'t>(nameChain: string) =
 
+    /// <summary>
+    /// Gets the value from a base binding
+    /// </summary>
+    /// <param name="model">The current model state</param>
+    /// <param name="binding">The binding to get value from</param>
+    /// <returns>Result containing the value or an error</returns>
     member _.Base(model: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
         match binding with
         | OneWay { OneWayData = d } -> d.Get model |> Ok
@@ -892,6 +972,12 @@ type Get<'t>(nameChain: string) =
                         |> Error
             |> Result.bind (ValueOption.toNull >> Result.mapError GetError.ToNullError)
 
+    /// <summary>
+    /// Recursively gets the value from a binding and its wrappers
+    /// </summary>
+    /// <param name="model">The current model state</param>
+    /// <param name="binding">The binding to get value from</param>
+    /// <returns>Result containing the value or an error</returns>
     member this.Recursive<'model, 'msg>(model: 'model, binding: VmBinding<'model, 'msg, 't>) : Result<'t, GetError> =
         match binding with
         | BaseVmBinding b -> this.Base(model, b)
@@ -907,8 +993,19 @@ type Get<'t>(nameChain: string) =
         | AlterMsgStream b -> this.Recursive(b.Get model, b.Binding)
 
 
+/// <summary>
+/// Sets a value in a binding
+/// </summary>
+/// <typeparam name="'t">The type of the binding value</typeparam>
+/// <param name="value">The value to set</param>
 type Set<'t>(value: 't) =
 
+    /// <summary>
+    /// Sets the value in a base binding
+    /// </summary>
+    /// <param name="model">The current model state</param>
+    /// <param name="binding">The binding to set value in</param>
+    /// <returns>True if the value was set, false if binding is read-only</returns>
     member _.Base(model: 'model, binding: BaseVmBinding<'model, 'msg, 't>) =
         match binding with
         | TwoWay b ->
@@ -928,6 +1025,12 @@ type Set<'t>(value: 't) =
         | SubModelSeqUnkeyed _
         | SubModelSeqKeyed _ -> false
 
+    /// <summary>
+    /// Recursively sets the value in a binding and its wrappers
+    /// </summary>
+    /// <param name="model">The current model state</param>
+    /// <param name="binding">The binding to set value in</param>
+    /// <returns>True if the value was set, false if binding is read-only</returns>
     member this.Recursive<'model, 'msg>(model: 'model, binding: VmBinding<'model, 'msg, 't>) : bool =
         match binding with
         | BaseVmBinding b -> this.Base(model, b)
diff --git a/src/Elmish.WPF/Command.fs b/src/Elmish.WPF/Command.fs
index 301d9b7f..46b8344f 100644
--- a/src/Elmish.WPF/Command.fs
+++ b/src/Elmish.WPF/Command.fs
@@ -3,11 +3,15 @@
 open System
 open System.Windows.Input
 
+/// <summary>
 /// A command that optionally hooks into CommandManager.RequerySuggested to
 /// automatically trigger CanExecuteChanged whenever the CommandManager detects
 /// conditions that might change the output of canExecute. It's necessary to use
 /// this feature for command bindings where the CommandParameter is bound to
 /// another UI control (e.g. a ListView.SelectedItem).
+/// </summary>
+/// <param name="execute">The function to execute when the command is invoked.</param>
+/// <param name="canExecute">The function that determines whether the command can execute.</param>
 type internal Command(execute, canExecute) =
 
     let canExecuteChanged = Event<EventHandler, EventArgs>()
@@ -18,11 +22,17 @@ type internal Command(execute, canExecute) =
     // Can test this via the UiBoundCmdParam sample.
     let mutable _handler = Unchecked.defaultof<EventHandler>
 
+    /// <summary>
+    /// Adds a handler to CommandManager.RequerySuggested for automatic CanExecuteChanged updates.
+    /// </summary>
     member this.AddRequeryHandler() =
         let handler = EventHandler(fun _ _ -> this.RaiseCanExecuteChanged())
         CommandManager.RequerySuggested.AddHandler handler
         _handler <- handler
 
+    /// <summary>
+    /// Raises the CanExecuteChanged event to notify that the command's ability to execute may have changed.
+    /// </summary>
     member this.RaiseCanExecuteChanged() =
         canExecuteChanged.Trigger(this, EventArgs.Empty)
 
diff --git a/src/Elmish.WPF/InternalUtils.fs b/src/Elmish.WPF/InternalUtils.fs
index ebc4c5dd..8cd632c4 100644
--- a/src/Elmish.WPF/InternalUtils.fs
+++ b/src/Elmish.WPF/InternalUtils.fs
@@ -5,64 +5,127 @@ open System.Collections.Generic
 open System.Diagnostics
 
 
+/// <summary>
+/// Flips the order of arguments for a two-argument function.
+/// </summary>
+/// <param name="f">The function to flip.</param>
+/// <param name="b">The second argument.</param>
+/// <param name="a">The first argument.</param>
+/// <returns>The result of f a b.</returns>
 let flip f b a = f a b
 
+/// <summary>
+/// Ignores two arguments and returns unit.
+/// </summary>
+/// <param name="_">First ignored argument.</param>
+/// <param name="_">Second ignored argument.</param>
 let ignore2 _ _ = ()
 
+/// <summary>
 /// Deconstructs a KeyValuePair into a tuple.
+/// </summary>
+/// <param name="kvp">The KeyValuePair to deconstruct.</param>
+/// <returns>A tuple of (key, value).</returns>
 [<DebuggerStepThrough>]
 let (|Kvp|) (kvp: KeyValuePair<_, _>) = Kvp(kvp.Key, kvp.Value)
 
 
+/// <summary>
+/// Computation expression builder for Option monad.
+/// </summary>
 [<Struct>]
 type OptionalBuilder =
     member _.Bind(ma, f) = ma |> Option.bind f
     member _.Return(a) = Some a
     member _.ReturnFrom(ma) = ma
 
+/// <summary>
+/// Instance of the optional computation expression builder.
+/// </summary>
 let option = OptionalBuilder()
 
 
+/// <summary>
+/// Utility functions for KeyValuePair.
+/// </summary>
 [<RequireQualifiedAccess>]
 module Kvp =
 
+    /// <summary>
+    /// Gets the key from a KeyValuePair.
+    /// </summary>
+    /// <param name="kvp">The KeyValuePair.</param>
+    /// <returns>The key.</returns>
     let key (kvp: KeyValuePair<_, _>) = kvp.Key
 
+    /// <summary>
+    /// Gets the value from a KeyValuePair.
+    /// </summary>
+    /// <param name="kvp">The KeyValuePair.</param>
+    /// <returns>The value.</returns>
     let value (kvp: KeyValuePair<_, _>) = kvp.Value
 
 
+/// <summary>
+/// Utility functions for Result type.
+/// </summary>
 [<RequireQualifiedAccess>]
 module Result =
 
+    /// <summary>
+    /// Checks if a Result is Ok.
+    /// </summary>
+    /// <param name="result">The Result to check.</param>
+    /// <returns>True if Ok, false if Error.</returns>
     let isOk =
         function
         | Ok _ -> true
         | Error _ -> false
 
+    /// <summary>
+    /// Applies a function to the Ok value if present, otherwise does nothing.
+    /// </summary>
+    /// <param name="f">The function to apply.</param>
+    /// <param name="result">The Result value.</param>
     let iter f =
         function
         | Ok x -> f x
         | Error _ -> ()
 
 
+/// <summary>
+/// Utility functions for ValueOption type.
+/// </summary>
 [<RequireQualifiedAccess>]
 module ValueOption =
 
+    /// <summary>
+    /// Converts an Option to a ValueOption.
+    /// </summary>
     let ofOption =
         function
         | Some x -> ValueSome x
         | None -> ValueNone
 
+    /// <summary>
+    /// Converts a ValueOption to an Option.
+    /// </summary>
     let toOption =
         function
         | ValueSome x -> Some x
         | ValueNone -> None
 
+    /// <summary>
+    /// Extracts the Error value as a ValueOption, returning ValueNone for Ok.
+    /// </summary>
     let ofError =
         function
         | Ok _ -> ValueNone
         | Error x -> ValueSome x
 
+    /// <summary>
+    /// Extracts the Ok value as a ValueOption, returning ValueNone for Error.
+    /// </summary>
     let ofOk =
         function
         | Ok x -> ValueSome x
@@ -71,11 +134,20 @@ module ValueOption =
     [<RequireQualifiedAccess>]
     type ToNullError = ValueCannotBeNull of string
 
+    /// <summary>
+    /// Converts a nullable value to a ValueOption.
+    /// </summary>
+    /// <param name="x">The value to convert.</param>
+    /// <returns>ValueSome if not null, ValueNone otherwise.</returns>
     let ofNull<'a> (x: 'a) =
         match box x with
         | null -> ValueNone
         | _ -> ValueSome x
 
+    /// <summary>
+    /// Converts a ValueOption to a nullable value.
+    /// </summary>
+    /// <returns>Ok with the value or null, Error if the type cannot be null.</returns>
     let toNull<'a> =
         function
         | ValueSome x -> Ok x
@@ -88,15 +160,33 @@ module ValueOption =
                 typeof<'a>.Name |> ToNullError.ValueCannotBeNull |> Error
 
 
+/// <summary>
+/// Utility functions for by-reference pairs.
+/// </summary>
 [<RequireQualifiedAccess>]
 module ByRefPair =
 
+    /// <summary>
+    /// Converts a bool * 'a pair to an Option.
+    /// </summary>
+    /// <param name="b">The boolean flag.</param>
+    /// <param name="a">The value.</param>
+    /// <returns>Some a if b is true, None otherwise.</returns>
     let toOption (b, a) = if b then Some a else None
 
 
+/// <summary>
+/// Utility functions for Dictionary.
+/// </summary>
 [<RequireQualifiedAccess>]
 module Dictionary =
 
+    /// <summary>
+    /// Tries to find a value in the dictionary.
+    /// </summary>
+    /// <param name="key">The key to search for.</param>
+    /// <param name="d">The dictionary.</param>
+    /// <returns>Some value if found, None otherwise.</returns>
     let tryFind key (d: Dictionary<_, _>) =
         key |> d.TryGetValue |> ByRefPair.toOption
 
diff --git a/src/Elmish.WPF/Merge.fs b/src/Elmish.WPF/Merge.fs
index 64321877..f13b2a73 100644
--- a/src/Elmish.WPF/Merge.fs
+++ b/src/Elmish.WPF/Merge.fs
@@ -5,10 +5,20 @@ open System.Collections.Generic
 open System.Collections.ObjectModel
 
 
+/// <summary>
+/// Discriminated union indicating whether an error occurred in the source or target sequence
+/// </summary>
 type SourceOrTarget =
     | Source
     | Target
 
+/// <summary>
+/// Exception thrown when duplicate IDs are found in a keyed collection merge operation
+/// </summary>
+/// <param name="sourceOrTarget">Whether the duplicate was found in the source or target sequence</param>
+/// <param name="index1">Index of the first occurrence of the duplicate ID</param>
+/// <param name="index2">Index of the second occurrence of the duplicate ID</param>
+/// <param name="id">The duplicate ID value</param>
 type DuplicateIdException(sourceOrTarget: SourceOrTarget, index1: int, index2: int, id: string) =
     inherit
         System.Exception(
@@ -25,6 +35,11 @@ type DuplicateIdException(sourceOrTarget: SourceOrTarget, index1: int, index2: i
     member this.Index2 = index2
     member this.Id = id
 
+/// <summary>
+/// Abstraction over mutable collections that allows for efficient updates during merge operations
+/// </summary>
+/// <typeparam name="'a">The type of elements in the collection</typeparam>
+/// <typeparam name="'aCollection">The type of the collection itself</typeparam>
 type CollectionTarget<'a, 'aCollection> =
     { GetLength: unit -> int
       GetAt: int -> 'a
@@ -39,6 +54,11 @@ type CollectionTarget<'a, 'aCollection> =
 
 module CollectionTarget =
 
+    /// <summary>
+    /// Creates a CollectionTarget from an ObservableCollection
+    /// </summary>
+    /// <param name="oc">The ObservableCollection to wrap</param>
+    /// <returns>A CollectionTarget that manipulates the ObservableCollection</returns>
     let create (oc: ObservableCollection<'a>) =
         { GetLength = fun () -> oc.Count
           GetAt = fun i -> oc.[i]
@@ -51,6 +71,13 @@ module CollectionTarget =
           Enumerate = fun () -> upcast oc
           GetCollection = fun () -> oc }
 
+    /// <summary>
+    /// Maps the element type of a CollectionTarget using bidirectional transformation functions
+    /// </summary>
+    /// <param name="fOut">Function to transform elements when reading from the collection</param>
+    /// <param name="fIn">Function to transform elements when writing to the collection</param>
+    /// <param name="ct">The CollectionTarget to map</param>
+    /// <returns>A new CollectionTarget with transformed element type</returns>
     let mapA
         (fOut: 'a0 -> 'a1)
         (fIn: 'a1 -> 'a0)
@@ -67,6 +94,12 @@ module CollectionTarget =
           Enumerate = ct.Enumerate >> Seq.map fOut
           GetCollection = ct.GetCollection }
 
+    /// <summary>
+    /// Maps the collection type of a CollectionTarget
+    /// </summary>
+    /// <param name="fOut">Function to transform the collection type</param>
+    /// <param name="ct">The CollectionTarget to map</param>
+    /// <returns>A new CollectionTarget with transformed collection type</returns>
     let mapCollection
         (fOut: 'aCollection0 -> 'aCollection1)
         (ct: CollectionTarget<'a, 'aCollection0>)
@@ -86,6 +119,13 @@ module CollectionTarget =
 
 module Merge =
 
+    /// <summary>
+    /// Merges a source sequence into a target collection without using keys, updating by position
+    /// </summary>
+    /// <param name="create">Function to create a new target element from a source element and index</param>
+    /// <param name="update">Function to update an existing target element with data from a source element</param>
+    /// <param name="target">The target collection to merge into</param>
+    /// <param name="source">The source sequence to merge from</param>
     let unkeyed
         (create: 's -> int -> 't)
         (update: 't -> 's -> unit)
@@ -109,6 +149,17 @@ module Merge =
             idx <- idx - 1
 
 
+    /// <summary>
+    /// Merges a source array into a target collection using keys for efficient updates.
+    /// Based on Elm's HTML.keyed algorithm for efficient virtual DOM updates.
+    /// </summary>
+    /// <param name="getSourceId">Function to extract ID from source elements</param>
+    /// <param name="getTargetId">Function to extract ID from target elements</param>
+    /// <param name="create">Function to create a new target element from source element and ID</param>
+    /// <param name="update">Function to update an existing target element with data from source element and index</param>
+    /// <param name="target">The target collection to merge into</param>
+    /// <param name="source">The source array to merge from</param>
+    /// <exception cref="DuplicateIdException">Thrown when duplicate IDs are found in either sequence</exception>
     let keyed
         (getSourceId: 's -> 'id)
         (getTargetId: 't -> 'id)
diff --git a/src/Elmish.WPF/Utils.fs b/src/Elmish.WPF/Utils.fs
index 28450e56..8b22ca9f 100644
--- a/src/Elmish.WPF/Utils.fs
+++ b/src/Elmish.WPF/Utils.fs
@@ -2,8 +2,13 @@
 module Elmish.WPF.Utils
 
 
+/// <summary>
 /// Reference/physical equality for reference types. Alias for
 /// LanguagePrimitives.PhysicalEquality. Also see elmEq.
+/// </summary>
+/// <param name="a">First object to compare</param>
+/// <param name="b">Second object to compare</param>
+/// <returns>True if both references point to the same object</returns>
 let refEq = LanguagePrimitives.PhysicalEquality
 
 
@@ -11,8 +16,12 @@ open System
 open System.Linq.Expressions
 open System.Reflection
 
+/// <summary>
 /// Returns a fast, untyped getter for the property specified by the PropertyInfo.
 /// The getter takes an instance and returns a property value.
+/// </summary>
+/// <param name="propertyInfo">The property to create a getter for</param>
+/// <returns>A function that takes an object instance and returns the property value</returns>
 let buildUntypedGetter (propertyInfo: PropertyInfo) : obj -> obj =
     let method = propertyInfo.GetMethod
     let objExpr = Expression.Parameter(typeof<obj>, "o")
@@ -46,6 +55,7 @@ type private ElmEq<'a>() =
         gettersAndEq |> Array.forall (fun (get, eq) -> eq (get (box x1), get (box x2)))
 
 
+/// <summary>
 /// Memberwise equality where value-typed members and string members are
 /// compared using structural comparison (the standard F# (=) operator),
 /// and reference-typed members (except strings) are compared using reference
@@ -54,4 +64,9 @@ type private ElmEq<'a>() =
 /// normally immutable. For a direct reference equality check (not memberwise),
 /// see refEq (which should be used when passing a single non-string reference
 /// type from the model).
+/// </summary>
+/// <typeparam name="'a">The type to compare</typeparam>
+/// <param name="x1">First value to compare</param>
+/// <param name="x2">Second value to compare</param>
+/// <returns>True if all members are equal according to the rules described</returns>
 let elmEq<'a> : 'a -> 'a -> bool = ElmEq<'a>.Eq
\ No newline at end of file
diff --git a/src/Elmish.WPF/ViewModelArgs.fs b/src/Elmish.WPF/ViewModelArgs.fs
index 8f2de79b..52fb2daf 100644
--- a/src/Elmish.WPF/ViewModelArgs.fs
+++ b/src/Elmish.WPF/ViewModelArgs.fs
@@ -26,6 +26,12 @@ module internal LoggingViewModelArgs =
           nameChain = "" }
 
 
+/// <summary>
+/// Arguments required to create a view model, including the initial model state,
+/// dispatch function for messages, and logging configuration
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
 type ViewModelArgs<'model, 'msg> =
     internal
         { initialModel: 'model
@@ -38,15 +44,33 @@ module ViewModelArgs =
           dispatch = dispatch
           loggingArgs = LoggingViewModelArgs.map nameChain loggingArgs }
 
+    /// <summary>
+    /// Maps both the model and message types of ViewModelArgs
+    /// </summary>
+    /// <param name="mapModel">Function to transform the model type</param>
+    /// <param name="mapMsg">Function to transform the message type</param>
+    /// <param name="v">The ViewModelArgs to map</param>
+    /// <returns>New ViewModelArgs with transformed types</returns>
     let map mapModel mapMsg v =
         { initialModel = v.initialModel |> mapModel
           dispatch = mapMsg >> v.dispatch
           loggingArgs = v.loggingArgs }
 
+    /// <summary>
+    /// Creates ViewModelArgs without logging enabled
+    /// </summary>
+    /// <param name="initialModel">The initial model state</param>
+    /// <param name="dispatch">The message dispatch function</param>
+    /// <returns>ViewModelArgs configured without logging</returns>
     let createWithoutLogging initialModel dispatch =
         { initialModel = initialModel
           dispatch = dispatch
           loggingArgs = LoggingViewModelArgs.none }
 
+    /// <summary>
+    /// Creates simple ViewModelArgs with no logging and no dispatch handling
+    /// </summary>
+    /// <param name="initialModel">The initial model state</param>
+    /// <returns>ViewModelArgs with no-op dispatch and no logging</returns>
     let simple initialModel =
         createWithoutLogging initialModel ignore
\ No newline at end of file
diff --git a/src/Elmish.WPF/ViewModelModule.fs b/src/Elmish.WPF/ViewModelModule.fs
index bb63be1b..30984fa3 100644
--- a/src/Elmish.WPF/ViewModelModule.fs
+++ b/src/Elmish.WPF/ViewModelModule.fs
@@ -1,6 +1,12 @@
 module Elmish.WPF.ViewModel
 
+/// <summary>
 /// Creates a design-time view model using the given model and bindings.
+/// This is useful for XAML design-time data support in WPF designers.
+/// </summary>
+/// <param name="model">The model instance to use at design time</param>
+/// <param name="bindings">The list of bindings to configure</param>
+/// <returns>A boxed DynamicViewModel suitable for design-time use</returns>
 let designInstance (model: 'model) (bindings: Binding<'model, 'msg> list) =
     let args = ViewModelArgs.simple model
 
diff --git a/src/Elmish.WPF/ViewModels.fs b/src/Elmish.WPF/ViewModels.fs
index 9cdd0d29..66e9afc1 100644
--- a/src/Elmish.WPF/ViewModels.fs
+++ b/src/Elmish.WPF/ViewModels.fs
@@ -8,7 +8,12 @@ open Microsoft.Extensions.Logging
 
 open BindingVmHelpers
 
+/// <summary>
 /// Represents all necessary data used to create a binding.
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
+/// <typeparam name="'t">The type of the binding value</typeparam>
 type Binding<'model, 'msg, 't> =
     internal
         { Name: string
@@ -30,9 +35,16 @@ module internal Helpers =
         member this.CompareBindings() : Binding<'model, 'msg> -> Binding<'model, 'msg> -> int =
             fun a b -> this.Recursive(a.Data) - this.Recursive(b.Data)
 
+/// <summary>
+/// Interface for view models that can be updated with new model states
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
 [<AllowNullLiteral>]
 type IViewModel<'model, 'msg> =
+    /// <summary>Gets the current model state</summary>
     abstract member CurrentModel: 'model
+    /// <summary>Updates the view model with a new model state</summary>
     abstract member UpdateModel: 'model -> unit
 
 module internal IViewModel =
@@ -136,6 +148,12 @@ module internal ViewModelHelper =
 
                 None
 
+/// <summary>
+/// Dynamic view model that uses DynamicObject to expose bindings as properties.
+/// This is the primary view model implementation for dynamic binding scenarios.
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
 [<AllowNullLiteral>]
 type internal DynamicViewModel<'model, 'msg>(args: ViewModelArgs<'model, 'msg>, bindings: Binding<'model, 'msg> list) as this
     =
@@ -309,6 +327,12 @@ type internal DynamicViewModel<'model, 'msg>(args: ViewModelArgs<'model, 'msg>,
 
 open System.Runtime.CompilerServices
 
+/// <summary>
+/// Base class for strongly-typed view models that provides Get and Set helper methods
+/// for accessing bindings in a type-safe manner.
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
 [<AllowNullLiteral>]
 type ViewModelBase<'model, 'msg>(args: ViewModelArgs<'model, 'msg>) as this =
 
@@ -331,6 +355,12 @@ type ViewModelBase<'model, 'msg>(args: ViewModelArgs<'model, 'msg>) as this =
         )
             .Recursive(initialModel, dispatch, (fun () -> this |> IViewModel.currentModel), binding.Data)
 
+    /// <summary>
+    /// Gets a binding value using the caller member name as the binding name
+    /// </summary>
+    /// <typeparam name="'a">The type of the binding value</typeparam>
+    /// <param name="memberName">Automatically captured member name</param>
+    /// <returns>Function that takes a binding factory and returns the value</returns>
     member _.Get<'a>([<CallerMemberName>] ?memberName: string) =
         fun (binding: string -> Binding<'model, 'msg, 'a>) ->
             let result =
@@ -398,6 +428,13 @@ type ViewModelBase<'model, 'msg>(args: ViewModelArgs<'model, 'msg>) as this =
                 failwithf $"[%s{nameChain}] Get FAILED: Binding {memberName} returned an error {e}"
             | Some(Ok r) -> r
 
+    /// <summary>
+    /// Sets a binding value using the caller member name as the binding name
+    /// </summary>
+    /// <typeparam name="'a">The type of the binding value</typeparam>
+    /// <param name="value">The value to set</param>
+    /// <param name="memberName">Automatically captured member name</param>
+    /// <returns>Function that takes a binding factory</returns>
     member _.Set<'a>(value: 'a, [<CallerMemberName>] ?memberName: string) =
         fun (binding: string -> Binding<'model, 'msg, 'a>) ->
             try
diff --git a/src/Elmish.WPF/WindowState.fs b/src/Elmish.WPF/WindowState.fs
index 4a9f9238..e14a5d4c 100644
--- a/src/Elmish.WPF/WindowState.fs
+++ b/src/Elmish.WPF/WindowState.fs
@@ -1,45 +1,95 @@
 namespace Elmish.WPF
 
+/// <summary>
+/// Represents the state of a window with an associated model
+/// </summary>
+/// <typeparam name="'model">The type of model associated with the window</typeparam>
 [<RequireQualifiedAccess>]
 type WindowState<'model> =
+    /// <summary>Window is closed and has no model</summary>
     | Closed
+    /// <summary>Window exists but is hidden with the given model</summary>
     | Hidden of 'model
+    /// <summary>Window is visible with the given model</summary>
     | Visible of 'model
 
 
 module WindowState =
 
+    /// <summary>
+    /// Catamorphism for WindowState. Applies one of three functions based on the state.
+    /// </summary>
+    /// <param name="a">Value to return for Closed state</param>
+    /// <param name="f">Function to apply to Hidden state's model</param>
+    /// <param name="g">Function to apply to Visible state's model</param>
+    /// <returns>Result of applying the appropriate function</returns>
     let cata a f g =
         function
         | WindowState.Closed -> a
         | WindowState.Hidden a -> a |> f
         | WindowState.Visible a -> a |> g
 
+    /// <summary>
+    /// Maps the model inside a WindowState
+    /// </summary>
+    /// <param name="f">Function to transform the model</param>
+    /// <returns>New WindowState with transformed model</returns>
     let map f =
         cata WindowState.Closed (f >> WindowState.Hidden) (f >> WindowState.Visible)
 
+    /// <summary>
+    /// Sets the model in a WindowState, preserving the window visibility state
+    /// </summary>
+    /// <param name="a">The new model value</param>
+    /// <returns>WindowState with the new model</returns>
     let set a = map (fun _ -> a)
 
+    /// <summary>
+    /// Converts any WindowState to Hidden with the given model
+    /// </summary>
+    /// <param name="a">The model for the hidden state</param>
+    /// <returns>WindowState.Hidden with the given model</returns>
     let toHidden a =
         cata (WindowState.Hidden a) WindowState.Hidden WindowState.Hidden
 
+    /// <summary>
+    /// Converts any WindowState to Visible with the given model
+    /// </summary>
+    /// <param name="a">The model for the visible state</param>
+    /// <returns>WindowState.Visible with the given model</returns>
     let toVisible a =
         cata (WindowState.Visible a) WindowState.Visible WindowState.Visible
 
+    /// <summary>
+    /// Converts WindowState to Option, where Closed becomes None
+    /// </summary>
+    /// <param name="state">The WindowState to convert</param>
+    /// <returns>Some(model) for Hidden/Visible states, None for Closed</returns>
     let toOption state = state |> cata None Some Some
 
+    /// <summary>
+    /// Converts WindowState to ValueOption, where Closed becomes ValueNone
+    /// </summary>
+    /// <param name="state">The WindowState to convert</param>
+    /// <returns>ValueSome(model) for Hidden/Visible states, ValueNone for Closed</returns>
     let toVOption state =
         state |> cata ValueNone ValueSome ValueSome
 
-    /// Converts None to WindowState.Closed, and Some(x) to
-    /// WindowState.Visible(x).
+    /// <summary>
+    /// Converts None to WindowState.Closed, and Some(x) to WindowState.Visible(x)
+    /// </summary>
+    /// <param name="model">The optional model</param>
+    /// <returns>WindowState.Closed for None, WindowState.Visible for Some</returns>
     let ofOption (model: 'model option) =
         match model with
         | Some a -> a |> WindowState.Visible
         | None -> WindowState.Closed
 
-    /// Converts ValueNone to WindowState.Closed, and ValueSome(x) to
-    /// WindowState.Visible(x).
+    /// <summary>
+    /// Converts ValueNone to WindowState.Closed, and ValueSome(x) to WindowState.Visible(x)
+    /// </summary>
+    /// <param name="model">The value optional model</param>
+    /// <returns>WindowState.Closed for ValueNone, WindowState.Visible for ValueSome</returns>
     let ofVOption (model: 'model voption) =
         match model with
         | ValueSome a -> a |> WindowState.Visible
diff --git a/src/Elmish.WPF/WpfProgram.fs b/src/Elmish.WPF/WpfProgram.fs
index e345aa3a..e9c27566 100644
--- a/src/Elmish.WPF/WpfProgram.fs
+++ b/src/Elmish.WPF/WpfProgram.fs
@@ -6,6 +6,12 @@ open Microsoft.Extensions.Logging.Abstractions
 open Elmish
 
 
+/// <summary>
+/// Represents a WPF program configuration that combines Elmish architecture with WPF data binding
+/// </summary>
+/// <typeparam name="'model">The type of the model</typeparam>
+/// <typeparam name="'msg">The type of messages</typeparam>
+/// <typeparam name="'viewModel">The type of the view model</typeparam>
 type WpfProgram<'model, 'msg, 'viewModel> =
     internal
         {
@@ -50,7 +56,13 @@ module WpfProgram =
           PerformanceLogThreshold = 1 }
 
 
+    /// <summary>
     /// Creates a WpfProgram that does not use commands.
+    /// </summary>
+    /// <param name="init">Function to initialize the model</param>
+    /// <param name="update">Function to update the model based on messages</param>
+    /// <param name="bindings">Function that returns the list of bindings</param>
+    /// <returns>A configured WpfProgram</returns>
     let mkSimple
         (init: unit -> 'model)
         (update: 'msg -> 'model -> 'model)
@@ -59,7 +71,13 @@ module WpfProgram =
         Program.mkSimple init update (fun _ _ -> ()) |> createWithBindings bindings
 
 
-    /// Creates a WpfProgram that uses commands
+    /// <summary>
+    /// Creates a WpfProgram that uses commands for side effects
+    /// </summary>
+    /// <param name="init">Function to initialize the model and commands</param>
+    /// <param name="update">Function to update the model and produce commands</param>
+    /// <param name="bindings">Function that returns the list of bindings</param>
+    /// <returns>A configured WpfProgram</returns>
     let mkProgram
         (init: unit -> 'model * Cmd<'msg>)
         (update: 'msg -> 'model -> 'model * Cmd<'msg>)
@@ -67,7 +85,13 @@ module WpfProgram =
         =
         Program.mkProgram init update (fun _ _ -> ()) |> createWithBindings bindings
 
-    /// Creates a WpfProgram that does not use commands.
+    /// <summary>
+    /// Creates a WpfProgram with a typed view model that does not use commands
+    /// </summary>
+    /// <param name="init">Function to initialize the model</param>
+    /// <param name="update">Function to update the model based on messages</param>
+    /// <param name="createVm">Function to create the typed view model</param>
+    /// <returns>A configured WpfProgram</returns>
     let mkSimpleT
         (init: unit -> 'model)
         (update: 'msg -> 'model -> 'model)
@@ -76,7 +100,13 @@ module WpfProgram =
         Program.mkSimple init update (fun _ _ -> ()) |> createWithVm createVm
 
 
-    /// Creates a WpfProgram that uses commands
+    /// <summary>
+    /// Creates a WpfProgram with a typed view model that uses commands
+    /// </summary>
+    /// <param name="init">Function to initialize the model and commands</param>
+    /// <param name="update">Function to update the model and produce commands</param>
+    /// <param name="createVm">Function to create the typed view model</param>
+    /// <returns>A configured WpfProgram</returns>
     let mkProgramT
         (init: unit -> 'model * Cmd<'msg>)
         (update: 'msg -> 'model -> 'model * Cmd<'msg>)
@@ -282,10 +312,15 @@ module WpfProgram =
             Application.Current.MainWindow <- window
 
 
+    /// <summary>
     /// Starts the Elmish and WPF dispatch loops. Will instantiate Application and set its
     /// MainWindow if it is not already running, and then run the specified window. This is a
     /// blocking function. If you are using App.xaml as an implicit entry point, see
     /// startElmishLoop.
+    /// </summary>
+    /// <param name="window">The main window to run</param>
+    /// <param name="program">The WpfProgram configuration</param>
+    /// <returns>The application run result</returns>
     let runWindow window program =
         (*
      * This is the correct order for these four statements.
@@ -302,12 +337,19 @@ module WpfProgram =
         Application.Current.Run window
 
 
+    /// <summary>
     /// Same as mkProgram, except that init and update don't return Cmd<'msg>
     /// directly, but instead return a CmdMsg discriminated union that is converted
     /// to Cmd<'msg> using toCmd. This means that the init and update functions
     /// return only data, and thus are easier to unit test. The CmdMsg pattern is
     /// general; this is just a trivial convenience function that automatically
     /// converts CmdMsg to Cmd<'msg> for you in init and update.
+    /// </summary>
+    /// <param name="init">Function to initialize model and command messages</param>
+    /// <param name="update">Function to update model and produce command messages</param>
+    /// <param name="bindings">Function that returns the list of bindings</param>
+    /// <param name="toCmd">Function to convert command messages to Cmd</param>
+    /// <returns>A configured WpfProgram</returns>
     let mkProgramWithCmdMsg
         (init: unit -> 'model * 'cmdMsg list)
         (update: 'msg -> 'model -> 'model * 'cmdMsg list)
@@ -338,53 +380,87 @@ module WpfProgram =
         mkProgramT (init >> convert) (fun msg model -> update msg model |> convert) createVm
 
 
-    /// Uses the specified ILoggerFactory for logging.
+    /// <summary>
+    /// Uses the specified ILoggerFactory for logging
+    /// </summary>
+    /// <param name="loggerFactory">The logger factory to use</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with logging configured</returns>
     let withLogger loggerFactory program =
         { program with
             LoggerFactory = loggerFactory }
 
 
+    /// <summary>
     /// Calls the specified function for unhandled exceptions in the Elmish
     /// dispatch loop (e.g. in commands or the update function). This essentially
     /// delegates to Elmish's Program.withErrorHandler.
-    ///
     /// The first (string) argument of onError is a message from Elmish describing
     /// the context of the exception. Note that this may contain a rendered
     /// message case with all data ("%A" formatting).
-    ///
     /// Note that exceptions passed to onError are also logged to the logger
     /// specified using WpfProgram.withLogger.
+    /// </summary>
+    /// <param name="onError">Function to handle errors</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with error handler configured</returns>
     let withElmishErrorHandler onError program = { program with ErrorHandler = onError }
 
 
+    /// <summary>
     /// Subscribe to external source of events, overrides existing subscription.
     /// Return the subscriptions that should be active based on the current model.
     /// Subscriptions will be started or stopped automatically to match.
+    /// </summary>
+    /// <param name="subscribe">Function that returns active subscriptions based on model</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with subscription configured</returns>
     let withSubscription (subscribe: 'model -> Sub<'msg>) program =
         { program with
             ElmishProgram = program.ElmishProgram |> Program.withSubscription subscribe }
 
 
-    /// Map existing subscription to external source of events.
+    /// <summary>
+    /// Map existing subscription to external source of events
+    /// </summary>
+    /// <param name="map">Function to transform the subscription</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with mapped subscription</returns>
     let mapSubscription map program =
         { program with
             ElmishProgram = program.ElmishProgram |> Program.mapSubscription map }
 
 
+    /// <summary>
     /// Only logs binding performance for calls taking longer than the specified number of
     /// milliseconds. The default is 1ms.
+    /// </summary>
+    /// <param name="threshold">Minimum milliseconds before logging performance</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with performance threshold configured</returns>
     let withPerformanceLogThreshold threshold program =
         { program with
             PerformanceLogThreshold = threshold }
 
 
-    /// Exit criteria and the handler, overrides existing.
+    /// <summary>
+    /// Exit criteria and the handler, overrides existing
+    /// </summary>
+    /// <param name="predicate">Function to determine if program should terminate</param>
+    /// <param name="terminate">Function to handle termination</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with termination configured</returns>
     let withTermination predicate terminate program =
         { program with
             ElmishProgram = program.ElmishProgram |> Program.withTermination predicate terminate }
 
 
-    /// Map existing criteria and the handler.
+    /// <summary>
+    /// Map existing termination criteria and handler
+    /// </summary>
+    /// <param name="map">Function to transform the termination configuration</param>
+    /// <param name="program">The program to configure</param>
+    /// <returns>Program with mapped termination</returns>
     let mapTermination map program =
         { program with
             ElmishProgram = program.ElmishProgram |> Program.mapTermination map }
@@ -393,7 +469,12 @@ module WpfProgram =
 [<RequireQualifiedAccess>]
 module Subscribe =
 
-    /// Converts an effect to a Subscribe with a given dispose (on stop) method.
+    /// <summary>
+    /// Converts an effect to a Subscribe with a given dispose (on stop) method
+    /// </summary>
+    /// <param name="dispose">Function to call when subscription is stopped</param>
+    /// <param name="effect">The effect to convert</param>
+    /// <returns>A subscription that can be managed by Elmish</returns>
     let ofEffect dispose (effect: Effect<'msg>) : Subscribe<'msg> =
         fun dispatch ->
             effect dispatch
@@ -404,8 +485,13 @@ module Subscribe =
 
 [<RequireQualifiedAccess>]
 module Sub =
+    /// <summary>
     /// Subscribe to an external source of events. The subscribe function is called once,
     /// with the initial model, but can dispatch messages at any time.
+    /// </summary>
+    /// <param name="idPrefix">Prefix for subscription IDs</param>
+    /// <param name="v3Subscription">Legacy v3 subscription function</param>
+    /// <returns>Function that creates subscriptions from model</returns>
     [<System.Obsolete("Migrate your v3 subscriptions to the new subscriptions with lifetimes and dispose")>]
     let fromV3Subscription (idPrefix: string) (v3Subscription: 'model -> Cmd<'msg>) : 'model -> Sub<'msg> =
         let mutable memoizedSub: Sub<'msg> voption = ValueNone

From 2df060ae2b2be004ea0fa17ea99047b1227bedce Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 17:57:56 +0200
Subject: [PATCH 06/18] Reorganize project structure

Move all dynamic binding samples to src/Samples/Dynamic/
Move typed ViewModel samples to src/Samples/Typed/
Relocate test projects to tests/ folder
Update .slnx file to reflect new project structure
Add README explaining both binding approaches

This reorganization makes it clearer for users to understand and choose
between the dynamic bindings() approach and the typed ViewModelBase approach.
---
 .claude/settings.local.json                   |  10 +
 Elmish.WPF.slnx                               | 100 ++---
 README.md                                     | 188 ++++++---
 REFERENCE.md                                  | 367 ++++++++++++------
 RELEASE_NOTES.md                              | 195 +++++++---
 TUTORIAL.md                                   | 261 +++++++++----
 jetbrains.svg                                 |  71 ++--
 src/Elmish.WPF/BindingData.fs                 |   4 +-
 src/Elmish.WPF/Elmish.WPF.fsproj              |  32 +-
 src/Samples/Capabilities/App.xaml.cs          |  16 -
 src/Samples/Capabilities/MainWindow.xaml.cs   |   9 -
 .../Selection/BindableSelectedValue.cs        |  31 --
 .../Selection/SelectionScreen.xaml.cs         |  17 -
 .../Capabilities.Core.fsproj                  |  14 +-
 .../Capabilities.Core/Program.fs              |   0
 .../Capabilities.Core/Selection.fs            |   0
 .../Capabilities.Core/Utilities.fs            |   0
 .../{ => Dynamic}/Capabilities/App.xaml       |   2 +-
 src/Samples/Dynamic/Capabilities/App.xaml.cs  |  19 +
 .../Capabilities/Capabilities.csproj          |   4 +-
 .../Capabilities/MainWindow.xaml              |   8 +-
 .../Dynamic/Capabilities/MainWindow.xaml.cs   |  11 +
 .../Selection/BindableSelectedValue.cs        |  40 ++
 .../Selection/SelectionScreen.xaml            |  33 +-
 .../Selection/SelectionScreen.xaml.cs         |  19 +
 .../EventBindingsAndBehaviors.Core.fsproj     |  10 +-
 .../EventBindingsAndBehaviors.Core/Program.fs |   0
 .../EventBindingsAndBehaviors/App.xaml        |   7 +
 .../EventBindingsAndBehaviors/App.xaml.cs     |  18 +
 .../EventBindingsAndBehaviors.csproj          |   4 +-
 .../FocusWhenVisibleBehavior.cs               |  24 ++
 .../EventBindingsAndBehaviors/MainWindow.xaml |  34 +-
 .../MainWindow.xaml.cs                        |  11 +
 .../FileDialogs.Core/FileDialogs.Core.fsproj  |  10 +-
 .../{ => Dynamic}/FileDialogs.Core/Program.fs |   0
 src/Samples/Dynamic/FileDialogs/App.xaml      |   7 +
 src/Samples/Dynamic/FileDialogs/App.xaml.cs   |  18 +
 .../FileDialogs/FileDialogs.csproj            |   2 +-
 .../{ => Dynamic}/FileDialogs/MainWindow.xaml |   5 +-
 .../Dynamic/FileDialogs/MainWindow.xaml.cs    |  11 +
 .../FileDialogsCmdMsg.Core.fsproj             |  10 +-
 .../FileDialogsCmdMsg.Core/Program.fs         |   0
 .../Dynamic/FileDialogsCmdMsg/App.xaml        |   7 +
 .../Dynamic/FileDialogsCmdMsg/App.xaml.cs     |  18 +
 .../FileDialogsCmdMsg.csproj                  |   2 +-
 .../FileDialogsCmdMsg/MainWindow.xaml         |   5 +-
 .../FileDialogsCmdMsg/MainWindow.xaml.cs      |  11 +
 .../Multiselect.Core/Multiselect.Core.fsproj  |  10 +-
 .../{ => Dynamic}/Multiselect.Core/Program.fs |   0
 .../{ => Dynamic}/Multiselect/App.xaml        |   2 +-
 src/Samples/Dynamic/Multiselect/App.xaml.cs   |  18 +
 .../{ => Dynamic}/Multiselect/MainWindow.xaml |  13 +-
 .../Dynamic/Multiselect/MainWindow.xaml.cs    |  11 +
 .../Multiselect/Multiselect.csproj            |   2 +-
 .../{ => Dynamic}/NewWindow.Core/App.fs       |   0
 .../{ => Dynamic}/NewWindow.Core/AutoOpen.fs  |   0
 .../NewWindow.Core/NewWindow.Core.fsproj      |  29 ++
 .../{ => Dynamic}/NewWindow.Core/Program.fs   |   0
 .../{ => Dynamic}/NewWindow.Core/Window1.fs   |   0
 .../{ => Dynamic}/NewWindow.Core/Window2.fs   |   0
 src/Samples/Dynamic/NewWindow/App.xaml        |   8 +
 src/Samples/Dynamic/NewWindow/App.xaml.cs     |  18 +
 .../{ => Dynamic}/NewWindow/MainWindow.xaml   |   5 +-
 .../Dynamic/NewWindow/MainWindow.xaml.cs      |  15 +
 .../{ => Dynamic}/NewWindow/NewWindow.csproj  |   4 +-
 .../{ => Dynamic}/NewWindow/Window1.xaml      |   0
 src/Samples/Dynamic/NewWindow/Window1.xaml.cs |  11 +
 .../{ => Dynamic}/NewWindow/Window2.xaml      |   6 +-
 src/Samples/Dynamic/NewWindow/Window2.xaml.cs |  11 +
 .../OneWaySeq.Core/OneWaySeq.Core.fsproj      |  10 +-
 .../{ => Dynamic}/OneWaySeq.Core/Program.fs   |   0
 src/Samples/Dynamic/OneWaySeq/App.xaml        |   7 +
 src/Samples/Dynamic/OneWaySeq/App.xaml.cs     |  18 +
 .../{ => Dynamic}/OneWaySeq/MainWindow.xaml   |  11 +-
 .../Dynamic/OneWaySeq/MainWindow.xaml.cs      |  11 +
 .../{ => Dynamic}/OneWaySeq/OneWaySeq.csproj  |   2 +-
 .../SingleCounter.Core/Program.fs             |   0
 .../SingleCounter.Core.fsproj                 |  10 +-
 src/Samples/Dynamic/SingleCounter/App.xaml    |   7 +
 src/Samples/Dynamic/SingleCounter/App.xaml.cs |  18 +
 .../SingleCounter/MainWindow.xaml             |   5 +-
 .../Dynamic/SingleCounter/MainWindow.xaml.cs  |  11 +
 .../SingleCounter/SingleCounter.csproj        |   2 +-
 .../{ => Dynamic}/Sticky.Core/Program.fs      |   0
 .../Sticky.Core/Sticky.Core.fsproj            |  10 +-
 src/Samples/{ => Dynamic}/Sticky/App.xaml     |   0
 src/Samples/Dynamic/Sticky/App.xaml.cs        |  18 +
 .../{ => Dynamic}/Sticky/MainWindow.xaml      |   7 +-
 src/Samples/Dynamic/Sticky/MainWindow.xaml.cs |  11 +
 .../{ => Dynamic}/Sticky/Sticky.csproj        |   2 +-
 .../{ => Dynamic}/SubModel.Core/Program.fs    |   0
 .../SubModel.Core/SubModel.Core.fsproj        |  10 +-
 src/Samples/Dynamic/SubModel/App.xaml         |   7 +
 src/Samples/Dynamic/SubModel/App.xaml.cs      |  18 +
 src/Samples/{ => Dynamic}/SubModel/Clock.xaml |  10 +-
 src/Samples/Dynamic/SubModel/Clock.xaml.cs    |  11 +
 .../{ => Dynamic}/SubModel/Counter.xaml       |   5 +-
 src/Samples/Dynamic/SubModel/Counter.xaml.cs  |  11 +
 .../SubModel/CounterWithClock.xaml            |  10 +-
 .../Dynamic/SubModel/CounterWithClock.xaml.cs |  11 +
 .../{ => Dynamic}/SubModel/MainWindow.xaml    |  14 +-
 .../Dynamic/SubModel/MainWindow.xaml.cs       |  11 +
 .../{ => Dynamic}/SubModel/SubModel.csproj    |   2 +-
 .../{ => Dynamic}/SubModelOpt.Core/Program.fs |   0
 .../SubModelOpt.Core/SubModelOpt.Core.fsproj  |  10 +-
 src/Samples/Dynamic/SubModelOpt/App.xaml      |   7 +
 src/Samples/Dynamic/SubModelOpt/App.xaml.cs   |  18 +
 .../{ => Dynamic}/SubModelOpt/Form1.xaml      |   5 +-
 src/Samples/Dynamic/SubModelOpt/Form1.xaml.cs |  11 +
 .../{ => Dynamic}/SubModelOpt/Form2.xaml      |   2 +-
 src/Samples/Dynamic/SubModelOpt/Form2.xaml.cs |  11 +
 .../{ => Dynamic}/SubModelOpt/MainWindow.xaml |  30 +-
 .../Dynamic/SubModelOpt/MainWindow.xaml.cs    |  15 +
 .../SubModelOpt/SubModelOpt.csproj            |   2 +-
 .../SubModelSelectedItem.Core/Program.fs      |   0
 .../SubModelSelectedItem.Core.fsproj          |  10 +-
 .../Dynamic/SubModelSelectedItem/App.xaml     |   7 +
 .../Dynamic/SubModelSelectedItem/App.xaml.cs  |  18 +
 .../SubModelSelectedItem/MainWindow.xaml      |   5 +-
 .../SubModelSelectedItem/MainWindow.xaml.cs   |  11 +
 .../SubModelSelectedItem.csproj               |   2 +-
 .../{ => Dynamic}/SubModelSeq.Core/Program.fs |   0
 .../SubModelSeq.Core/SubModelSeq.Core.fsproj  |  10 +-
 src/Samples/Dynamic/SubModelSeq/App.xaml      |   7 +
 src/Samples/Dynamic/SubModelSeq/App.xaml.cs   |  18 +
 .../{ => Dynamic}/SubModelSeq/Counter.xaml    |   5 +-
 .../Dynamic/SubModelSeq/Counter.xaml.cs       |  11 +
 .../{ => Dynamic}/SubModelSeq/MainWindow.xaml |  12 +-
 .../Dynamic/SubModelSeq/MainWindow.xaml.cs    |  11 +
 .../SubModelSeq/SubModelSeq.csproj            |   2 +-
 .../{ => Dynamic}/Threading.Core/Program.fs   |   0
 .../Threading.Core/Threading.Core.fsproj      |  10 +-
 src/Samples/{ => Dynamic}/Threading/App.xaml  |   2 +-
 src/Samples/Dynamic/Threading/App.xaml.cs     |  31 ++
 .../{ => Dynamic}/Threading/MainWindow.xaml   |   9 +-
 .../Dynamic/Threading/MainWindow.xaml.cs      |  23 ++
 .../{ => Dynamic}/Threading/Threading.csproj  |   4 +-
 .../UiBoundCmdParam.Core/Program.fs           |   0
 .../UiBoundCmdParam.Core.fsproj               |  10 +-
 src/Samples/Dynamic/UiBoundCmdParam/App.xaml  |   7 +
 .../Dynamic/UiBoundCmdParam/App.xaml.cs       |  18 +
 .../UiBoundCmdParam/MainWindow.xaml           |   5 +-
 .../UiBoundCmdParam/MainWindow.xaml.cs        |  11 +
 .../UiBoundCmdParam/UiBoundCmdParam.csproj    |   2 +-
 .../{ => Dynamic}/Validation.Core/Program.fs  |   0
 .../Validation.Core/Validation.Core.fsproj    |  10 +-
 src/Samples/Dynamic/Validation/App.xaml       |   7 +
 src/Samples/Dynamic/Validation/App.xaml.cs    |  18 +
 .../{ => Dynamic}/Validation/MainWindow.xaml  |  24 +-
 .../Dynamic/Validation/MainWindow.xaml.cs     |  11 +
 .../Validation/Validation.csproj              |   2 +-
 .../EventBindingsAndBehaviors/App.xaml        |   7 -
 .../EventBindingsAndBehaviors/App.xaml.cs     |  20 -
 .../FocusWhenVisibleBehavior.cs               |  29 --
 .../MainWindow.xaml.cs                        |  12 -
 src/Samples/FileDialogs/App.xaml              |   7 -
 src/Samples/FileDialogs/App.xaml.cs           |  20 -
 src/Samples/FileDialogs/MainWindow.xaml.cs    |  12 -
 src/Samples/FileDialogsCmdMsg/App.xaml        |   7 -
 src/Samples/FileDialogsCmdMsg/App.xaml.cs     |  20 -
 .../FileDialogsCmdMsg/MainWindow.xaml.cs      |  12 -
 src/Samples/Multiselect/App.xaml.cs           |  15 -
 src/Samples/Multiselect/MainWindow.xaml.cs    |   9 -
 .../NewWindow.Core/NewWindow.Core.fsproj      |  29 --
 src/Samples/NewWindow/App.xaml                |   8 -
 src/Samples/NewWindow/App.xaml.cs             |  20 -
 src/Samples/NewWindow/MainWindow.xaml.cs      |  17 -
 src/Samples/NewWindow/Window1.xaml.cs         |  12 -
 src/Samples/NewWindow/Window2.xaml.cs         |  12 -
 src/Samples/OneWaySeq/App.xaml                |   7 -
 src/Samples/OneWaySeq/App.xaml.cs             |  20 -
 src/Samples/OneWaySeq/MainWindow.xaml.cs      |  12 -
 src/Samples/README.md                         |  93 +++++
 src/Samples/SingleCounter/App.xaml            |   7 -
 src/Samples/SingleCounter/App.xaml.cs         |  20 -
 src/Samples/SingleCounter/MainWindow.xaml.cs  |  12 -
 src/Samples/Sticky/App.xaml.cs                |  20 -
 src/Samples/Sticky/MainWindow.xaml.cs         |  11 -
 src/Samples/SubModel/App.xaml                 |   7 -
 src/Samples/SubModel/App.xaml.cs              |  20 -
 src/Samples/SubModel/Clock.xaml.cs            |  12 -
 src/Samples/SubModel/Counter.xaml.cs          |  12 -
 src/Samples/SubModel/CounterWithClock.xaml.cs |  12 -
 src/Samples/SubModel/MainWindow.xaml.cs       |  12 -
 src/Samples/SubModelOpt/App.xaml              |   7 -
 src/Samples/SubModelOpt/App.xaml.cs           |  20 -
 src/Samples/SubModelOpt/Form1.xaml.cs         |  12 -
 src/Samples/SubModelOpt/Form2.xaml.cs         |  12 -
 src/Samples/SubModelOpt/MainWindow.xaml.cs    |  17 -
 src/Samples/SubModelSelectedItem/App.xaml     |   7 -
 src/Samples/SubModelSelectedItem/App.xaml.cs  |  20 -
 .../SubModelSelectedItem/MainWindow.xaml.cs   |  12 -
 src/Samples/SubModelSeq/App.xaml              |   7 -
 src/Samples/SubModelSeq/App.xaml.cs           |  20 -
 src/Samples/SubModelSeq/Counter.xaml.cs       |   9 -
 src/Samples/SubModelSeq/MainWindow.xaml.cs    |  12 -
 src/Samples/SubModelStatic/App.xaml           |   7 -
 src/Samples/SubModelStatic/App.xaml.cs        |  20 -
 src/Samples/SubModelStatic/Clock.xaml.cs      |  12 -
 src/Samples/SubModelStatic/Counter.xaml.cs    |  12 -
 .../SubModelStatic/CounterWithClock.xaml.cs   |  12 -
 src/Samples/SubModelStatic/MainWindow.xaml.cs |  12 -
 src/Samples/Threading/App.xaml.cs             |  28 --
 src/Samples/Threading/MainWindow.xaml.cs      |  23 --
 .../SubModelStatic.Core/Program.fs            |   0
 .../SubModelStatic.Core.fsproj                |  10 +-
 src/Samples/Typed/SubModelStatic/App.xaml     |   7 +
 src/Samples/Typed/SubModelStatic/App.xaml.cs  |  18 +
 .../{ => Typed}/SubModelStatic/Clock.xaml     |  10 +-
 .../Typed/SubModelStatic/Clock.xaml.cs        |  11 +
 .../{ => Typed}/SubModelStatic/Counter.xaml   |  29 +-
 .../Typed/SubModelStatic/Counter.xaml.cs      |  11 +
 .../SubModelStatic/CounterWithClock.xaml      |   2 +-
 .../SubModelStatic/CounterWithClock.xaml.cs   |  11 +
 .../SubModelStatic/MainWindow.xaml            |   8 +-
 .../Typed/SubModelStatic/MainWindow.xaml.cs   |  11 +
 .../SubModelStatic/SubModelStatic.csproj      |   2 +-
 src/Samples/UiBoundCmdParam/App.xaml          |   7 -
 src/Samples/UiBoundCmdParam/App.xaml.cs       |  20 -
 .../UiBoundCmdParam/MainWindow.xaml.cs        |  12 -
 src/Samples/Validation/App.xaml               |   7 -
 src/Samples/Validation/App.xaml.cs            |  20 -
 src/Samples/Validation/MainWindow.xaml.cs     |  12 -
 .../Elmish.WPF.Benchmarks.fsproj              |   6 +-
 .../Elmish.WPF.Benchmarks/Program.fs          |   0
 {src => tests}/Elmish.WPF.Tests/AutoOpen.fs   |   0
 .../Elmish.WPF.Tests/BindingTests.fs          |   0
 .../Elmish.WPF.Tests/BindingVmHelpersTests.fs |   0
 .../Elmish.WPF.Tests/DynamicViewModelTests.fs |   0
 .../Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj  |  28 +-
 {src => tests}/Elmish.WPF.Tests/MergeTests.fs |   0
 .../Elmish.WPF.Tests/StaticViewModelTests.fs  |   2 -
 {src => tests}/Elmish.WPF.Tests/UtilsTests.fs |   0
 233 files changed, 2082 insertions(+), 1540 deletions(-)
 create mode 100644 .claude/settings.local.json
 delete mode 100644 src/Samples/Capabilities/App.xaml.cs
 delete mode 100644 src/Samples/Capabilities/MainWindow.xaml.cs
 delete mode 100644 src/Samples/Capabilities/Selection/BindableSelectedValue.cs
 delete mode 100644 src/Samples/Capabilities/Selection/SelectionScreen.xaml.cs
 rename src/Samples/{ => Dynamic}/Capabilities.Core/Capabilities.Core.fsproj (64%)
 rename src/Samples/{ => Dynamic}/Capabilities.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/Capabilities.Core/Selection.fs (100%)
 rename src/Samples/{ => Dynamic}/Capabilities.Core/Utilities.fs (100%)
 rename src/Samples/{ => Dynamic}/Capabilities/App.xaml (89%)
 create mode 100644 src/Samples/Dynamic/Capabilities/App.xaml.cs
 rename src/Samples/{ => Dynamic}/Capabilities/Capabilities.csproj (93%)
 rename src/Samples/{ => Dynamic}/Capabilities/MainWindow.xaml (91%)
 create mode 100644 src/Samples/Dynamic/Capabilities/MainWindow.xaml.cs
 create mode 100644 src/Samples/Dynamic/Capabilities/Selection/BindableSelectedValue.cs
 rename src/Samples/{ => Dynamic}/Capabilities/Selection/SelectionScreen.xaml (68%)
 create mode 100644 src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml.cs
 rename src/Samples/{ => Dynamic}/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/EventBindingsAndBehaviors.Core/Program.fs (100%)
 create mode 100644 src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml
 create mode 100644 src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml.cs
 rename src/Samples/{ => Dynamic}/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj (88%)
 create mode 100644 src/Samples/Dynamic/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
 rename src/Samples/{ => Dynamic}/EventBindingsAndBehaviors/MainWindow.xaml (83%)
 create mode 100644 src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/FileDialogs.Core/FileDialogs.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/FileDialogs.Core/Program.fs (100%)
 create mode 100644 src/Samples/Dynamic/FileDialogs/App.xaml
 create mode 100644 src/Samples/Dynamic/FileDialogs/App.xaml.cs
 rename src/Samples/{ => Dynamic}/FileDialogs/FileDialogs.csproj (96%)
 rename src/Samples/{ => Dynamic}/FileDialogs/MainWindow.xaml (91%)
 create mode 100644 src/Samples/Dynamic/FileDialogs/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/FileDialogsCmdMsg.Core/Program.fs (100%)
 create mode 100644 src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml
 create mode 100644 src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml.cs
 rename src/Samples/{ => Dynamic}/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj (93%)
 rename src/Samples/{ => Dynamic}/FileDialogsCmdMsg/MainWindow.xaml (91%)
 create mode 100644 src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/Multiselect.Core/Multiselect.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/Multiselect.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/Multiselect/App.xaml (95%)
 create mode 100644 src/Samples/Dynamic/Multiselect/App.xaml.cs
 rename src/Samples/{ => Dynamic}/Multiselect/MainWindow.xaml (83%)
 create mode 100644 src/Samples/Dynamic/Multiselect/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/Multiselect/Multiselect.csproj (96%)
 rename src/Samples/{ => Dynamic}/NewWindow.Core/App.fs (100%)
 rename src/Samples/{ => Dynamic}/NewWindow.Core/AutoOpen.fs (100%)
 create mode 100644 src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj
 rename src/Samples/{ => Dynamic}/NewWindow.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/NewWindow.Core/Window1.fs (100%)
 rename src/Samples/{ => Dynamic}/NewWindow.Core/Window2.fs (100%)
 create mode 100644 src/Samples/Dynamic/NewWindow/App.xaml
 create mode 100644 src/Samples/Dynamic/NewWindow/App.xaml.cs
 rename src/Samples/{ => Dynamic}/NewWindow/MainWindow.xaml (86%)
 create mode 100644 src/Samples/Dynamic/NewWindow/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/NewWindow/NewWindow.csproj (94%)
 rename src/Samples/{ => Dynamic}/NewWindow/Window1.xaml (100%)
 create mode 100644 src/Samples/Dynamic/NewWindow/Window1.xaml.cs
 rename src/Samples/{ => Dynamic}/NewWindow/Window2.xaml (94%)
 create mode 100644 src/Samples/Dynamic/NewWindow/Window2.xaml.cs
 rename src/Samples/{ => Dynamic}/OneWaySeq.Core/OneWaySeq.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/OneWaySeq.Core/Program.fs (100%)
 create mode 100644 src/Samples/Dynamic/OneWaySeq/App.xaml
 create mode 100644 src/Samples/Dynamic/OneWaySeq/App.xaml.cs
 rename src/Samples/{ => Dynamic}/OneWaySeq/MainWindow.xaml (79%)
 create mode 100644 src/Samples/Dynamic/OneWaySeq/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/OneWaySeq/OneWaySeq.csproj (97%)
 rename src/Samples/{ => Dynamic}/SingleCounter.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/SingleCounter.Core/SingleCounter.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/SingleCounter/App.xaml
 create mode 100644 src/Samples/Dynamic/SingleCounter/App.xaml.cs
 rename src/Samples/{ => Dynamic}/SingleCounter/MainWindow.xaml (92%)
 create mode 100644 src/Samples/Dynamic/SingleCounter/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/SingleCounter/SingleCounter.csproj (95%)
 rename src/Samples/{ => Dynamic}/Sticky.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/Sticky.Core/Sticky.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/Sticky/App.xaml (100%)
 create mode 100644 src/Samples/Dynamic/Sticky/App.xaml.cs
 rename src/Samples/{ => Dynamic}/Sticky/MainWindow.xaml (92%)
 create mode 100644 src/Samples/Dynamic/Sticky/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/Sticky/Sticky.csproj (98%)
 rename src/Samples/{ => Dynamic}/SubModel.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/SubModel.Core/SubModel.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/SubModel/App.xaml
 create mode 100644 src/Samples/Dynamic/SubModel/App.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModel/Clock.xaml (72%)
 create mode 100644 src/Samples/Dynamic/SubModel/Clock.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModel/Counter.xaml (92%)
 create mode 100644 src/Samples/Dynamic/SubModel/Counter.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModel/CounterWithClock.xaml (59%)
 create mode 100644 src/Samples/Dynamic/SubModel/CounterWithClock.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModel/MainWindow.xaml (68%)
 create mode 100644 src/Samples/Dynamic/SubModel/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModel/SubModel.csproj (97%)
 rename src/Samples/{ => Dynamic}/SubModelOpt.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/SubModelOpt.Core/SubModelOpt.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/SubModelOpt/App.xaml
 create mode 100644 src/Samples/Dynamic/SubModelOpt/App.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelOpt/Form1.xaml (88%)
 create mode 100644 src/Samples/Dynamic/SubModelOpt/Form1.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelOpt/Form2.xaml (98%)
 create mode 100644 src/Samples/Dynamic/SubModelOpt/Form2.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelOpt/MainWindow.xaml (68%)
 create mode 100644 src/Samples/Dynamic/SubModelOpt/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelOpt/SubModelOpt.csproj (96%)
 rename src/Samples/{ => Dynamic}/SubModelSelectedItem.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/SubModelSelectedItem/App.xaml
 create mode 100644 src/Samples/Dynamic/SubModelSelectedItem/App.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelSelectedItem/MainWindow.xaml (94%)
 create mode 100644 src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelSelectedItem/SubModelSelectedItem.csproj (91%)
 rename src/Samples/{ => Dynamic}/SubModelSeq.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/SubModelSeq.Core/SubModelSeq.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/SubModelSeq/App.xaml
 create mode 100644 src/Samples/Dynamic/SubModelSeq/App.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelSeq/Counter.xaml (92%)
 create mode 100644 src/Samples/Dynamic/SubModelSeq/Counter.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelSeq/MainWindow.xaml (91%)
 create mode 100644 src/Samples/Dynamic/SubModelSeq/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/SubModelSeq/SubModelSeq.csproj (96%)
 rename src/Samples/{ => Dynamic}/Threading.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/Threading.Core/Threading.Core.fsproj (72%)
 rename src/Samples/{ => Dynamic}/Threading/App.xaml (89%)
 create mode 100644 src/Samples/Dynamic/Threading/App.xaml.cs
 rename src/Samples/{ => Dynamic}/Threading/MainWindow.xaml (87%)
 create mode 100644 src/Samples/Dynamic/Threading/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/Threading/Threading.csproj (94%)
 rename src/Samples/{ => Dynamic}/UiBoundCmdParam.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/UiBoundCmdParam/App.xaml
 create mode 100644 src/Samples/Dynamic/UiBoundCmdParam/App.xaml.cs
 rename src/Samples/{ => Dynamic}/UiBoundCmdParam/MainWindow.xaml (93%)
 create mode 100644 src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/UiBoundCmdParam/UiBoundCmdParam.csproj (94%)
 rename src/Samples/{ => Dynamic}/Validation.Core/Program.fs (100%)
 rename src/Samples/{ => Dynamic}/Validation.Core/Validation.Core.fsproj (72%)
 create mode 100644 src/Samples/Dynamic/Validation/App.xaml
 create mode 100644 src/Samples/Dynamic/Validation/App.xaml.cs
 rename src/Samples/{ => Dynamic}/Validation/MainWindow.xaml (73%)
 create mode 100644 src/Samples/Dynamic/Validation/MainWindow.xaml.cs
 rename src/Samples/{ => Dynamic}/Validation/Validation.csproj (96%)
 delete mode 100644 src/Samples/EventBindingsAndBehaviors/App.xaml
 delete mode 100644 src/Samples/EventBindingsAndBehaviors/App.xaml.cs
 delete mode 100644 src/Samples/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
 delete mode 100644 src/Samples/EventBindingsAndBehaviors/MainWindow.xaml.cs
 delete mode 100644 src/Samples/FileDialogs/App.xaml
 delete mode 100644 src/Samples/FileDialogs/App.xaml.cs
 delete mode 100644 src/Samples/FileDialogs/MainWindow.xaml.cs
 delete mode 100644 src/Samples/FileDialogsCmdMsg/App.xaml
 delete mode 100644 src/Samples/FileDialogsCmdMsg/App.xaml.cs
 delete mode 100644 src/Samples/FileDialogsCmdMsg/MainWindow.xaml.cs
 delete mode 100644 src/Samples/Multiselect/App.xaml.cs
 delete mode 100644 src/Samples/Multiselect/MainWindow.xaml.cs
 delete mode 100644 src/Samples/NewWindow.Core/NewWindow.Core.fsproj
 delete mode 100644 src/Samples/NewWindow/App.xaml
 delete mode 100644 src/Samples/NewWindow/App.xaml.cs
 delete mode 100644 src/Samples/NewWindow/MainWindow.xaml.cs
 delete mode 100644 src/Samples/NewWindow/Window1.xaml.cs
 delete mode 100644 src/Samples/NewWindow/Window2.xaml.cs
 delete mode 100644 src/Samples/OneWaySeq/App.xaml
 delete mode 100644 src/Samples/OneWaySeq/App.xaml.cs
 delete mode 100644 src/Samples/OneWaySeq/MainWindow.xaml.cs
 create mode 100644 src/Samples/README.md
 delete mode 100644 src/Samples/SingleCounter/App.xaml
 delete mode 100644 src/Samples/SingleCounter/App.xaml.cs
 delete mode 100644 src/Samples/SingleCounter/MainWindow.xaml.cs
 delete mode 100644 src/Samples/Sticky/App.xaml.cs
 delete mode 100644 src/Samples/Sticky/MainWindow.xaml.cs
 delete mode 100644 src/Samples/SubModel/App.xaml
 delete mode 100644 src/Samples/SubModel/App.xaml.cs
 delete mode 100644 src/Samples/SubModel/Clock.xaml.cs
 delete mode 100644 src/Samples/SubModel/Counter.xaml.cs
 delete mode 100644 src/Samples/SubModel/CounterWithClock.xaml.cs
 delete mode 100644 src/Samples/SubModel/MainWindow.xaml.cs
 delete mode 100644 src/Samples/SubModelOpt/App.xaml
 delete mode 100644 src/Samples/SubModelOpt/App.xaml.cs
 delete mode 100644 src/Samples/SubModelOpt/Form1.xaml.cs
 delete mode 100644 src/Samples/SubModelOpt/Form2.xaml.cs
 delete mode 100644 src/Samples/SubModelOpt/MainWindow.xaml.cs
 delete mode 100644 src/Samples/SubModelSelectedItem/App.xaml
 delete mode 100644 src/Samples/SubModelSelectedItem/App.xaml.cs
 delete mode 100644 src/Samples/SubModelSelectedItem/MainWindow.xaml.cs
 delete mode 100644 src/Samples/SubModelSeq/App.xaml
 delete mode 100644 src/Samples/SubModelSeq/App.xaml.cs
 delete mode 100644 src/Samples/SubModelSeq/Counter.xaml.cs
 delete mode 100644 src/Samples/SubModelSeq/MainWindow.xaml.cs
 delete mode 100644 src/Samples/SubModelStatic/App.xaml
 delete mode 100644 src/Samples/SubModelStatic/App.xaml.cs
 delete mode 100644 src/Samples/SubModelStatic/Clock.xaml.cs
 delete mode 100644 src/Samples/SubModelStatic/Counter.xaml.cs
 delete mode 100644 src/Samples/SubModelStatic/CounterWithClock.xaml.cs
 delete mode 100644 src/Samples/SubModelStatic/MainWindow.xaml.cs
 delete mode 100644 src/Samples/Threading/App.xaml.cs
 delete mode 100644 src/Samples/Threading/MainWindow.xaml.cs
 rename src/Samples/{ => Typed}/SubModelStatic.Core/Program.fs (100%)
 rename src/Samples/{ => Typed}/SubModelStatic.Core/SubModelStatic.Core.fsproj (72%)
 create mode 100644 src/Samples/Typed/SubModelStatic/App.xaml
 create mode 100644 src/Samples/Typed/SubModelStatic/App.xaml.cs
 rename src/Samples/{ => Typed}/SubModelStatic/Clock.xaml (73%)
 create mode 100644 src/Samples/Typed/SubModelStatic/Clock.xaml.cs
 rename src/Samples/{ => Typed}/SubModelStatic/Counter.xaml (91%)
 create mode 100644 src/Samples/Typed/SubModelStatic/Counter.xaml.cs
 rename src/Samples/{ => Typed}/SubModelStatic/CounterWithClock.xaml (98%)
 create mode 100644 src/Samples/Typed/SubModelStatic/CounterWithClock.xaml.cs
 rename src/Samples/{ => Typed}/SubModelStatic/MainWindow.xaml (86%)
 create mode 100644 src/Samples/Typed/SubModelStatic/MainWindow.xaml.cs
 rename src/Samples/{ => Typed}/SubModelStatic/SubModelStatic.csproj (94%)
 delete mode 100644 src/Samples/UiBoundCmdParam/App.xaml
 delete mode 100644 src/Samples/UiBoundCmdParam/App.xaml.cs
 delete mode 100644 src/Samples/UiBoundCmdParam/MainWindow.xaml.cs
 delete mode 100644 src/Samples/Validation/App.xaml
 delete mode 100644 src/Samples/Validation/App.xaml.cs
 delete mode 100644 src/Samples/Validation/MainWindow.xaml.cs
 rename {src => tests}/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj (76%)
 rename {src => tests}/Elmish.WPF.Benchmarks/Program.fs (100%)
 rename {src => tests}/Elmish.WPF.Tests/AutoOpen.fs (100%)
 rename {src => tests}/Elmish.WPF.Tests/BindingTests.fs (100%)
 rename {src => tests}/Elmish.WPF.Tests/BindingVmHelpersTests.fs (100%)
 rename {src => tests}/Elmish.WPF.Tests/DynamicViewModelTests.fs (100%)
 rename {src => tests}/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj (64%)
 rename {src => tests}/Elmish.WPF.Tests/MergeTests.fs (100%)
 rename {src => tests}/Elmish.WPF.Tests/StaticViewModelTests.fs (99%)
 rename {src => tests}/Elmish.WPF.Tests/UtilsTests.fs (100%)

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 00000000..6d280cc4
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(mv:*)",
+      "Bash(mkdir:*)",
+      "Bash(cp:*)"
+    ],
+    "deny": []
+  }
+}
\ No newline at end of file
diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 94d7e7b5..51df4b22 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -1,50 +1,58 @@
 <Solution>
-  <Folder Name="/Samples/">
-    <Project Path="src/Samples/Capabilities.Core/Capabilities.Core.fsproj" />
-    <Project Path="src/Samples/Capabilities/Capabilities.csproj" />
-    <Project Path="src/Samples/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj" />
-    <Project Path="src/Samples/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj" />
-    <Project Path="src/Samples/FileDialogs.Core/FileDialogs.Core.fsproj" />
-    <Project Path="src/Samples/FileDialogs/FileDialogs.csproj" />
-    <Project Path="src/Samples/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj" />
-    <Project Path="src/Samples/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
-    <Project Path="src/Samples/Multiselect.Core/Multiselect.Core.fsproj" />
-    <Project Path="src/Samples/Multiselect/Multiselect.csproj" />
-    <Project Path="src/Samples/NewWindow.Core/NewWindow.Core.fsproj" />
-    <Project Path="src/Samples/NewWindow/NewWindow.csproj" />
-    <Project Path="src/Samples/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
-    <Project Path="src/Samples/OneWaySeq/OneWaySeq.csproj" />
-    <Project Path="src/Samples/SingleCounter.Core/SingleCounter.Core.fsproj" />
-    <Project Path="src/Samples/SingleCounter/SingleCounter.csproj" />
-    <Project Path="src/Samples/Sticky.Core/Sticky.Core.fsproj" />
-    <Project Path="src/Samples/Sticky/Sticky.csproj" />
-    <Project Path="src/Samples/SubModel.Core/SubModel.Core.fsproj" />
-    <Project Path="src/Samples/SubModel/SubModel.csproj" />
-    <Project Path="src/Samples/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
-    <Project Path="src/Samples/SubModelOpt/SubModelOpt.csproj" />
-    <Project Path="src/Samples/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj" />
-    <Project Path="src/Samples/SubModelSelectedItem/SubModelSelectedItem.csproj" />
-    <Project Path="src/Samples/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
-    <Project Path="src/Samples/SubModelSeq/SubModelSeq.csproj" />
-    <Project Path="src/Samples/SubModelStatic.Core/SubModelStatic.Core.fsproj" />
-    <Project Path="src/Samples/SubModelStatic/SubModelStatic.csproj" />
-    <Project Path="src/Samples/Threading.Core/Threading.Core.fsproj" />
-    <Project Path="src/Samples/Threading/Threading.csproj" />
-    <Project Path="src/Samples/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj" />
-    <Project Path="src/Samples/UiBoundCmdParam/UiBoundCmdParam.csproj" />
-    <Project Path="src/Samples/Validation.Core/Validation.Core.fsproj" />
-    <Project Path="src/Samples/Validation/Validation.csproj" />
-  </Folder>
   <Folder Name="/Solution Items/">
-    <File Path="README.md" />
-    <File Path="REFERENCE.md" />
-    <File Path="RELEASE_NOTES.md" />
-    <File Path="TUTORIAL.md" />
-    <File Path=".editorconfig" />
-    <File Path=".gitignore" />
-    <File Path="LICENSE.md" />
+    <File Path="README.md"/>
+    <File Path="REFERENCE.md"/>
+    <File Path="RELEASE_NOTES.md"/>
+    <File Path="TUTORIAL.md"/>
+    <File Path=".editorconfig"/>
+    <File Path=".gitignore"/>
+    <File Path="LICENSE.md"/>
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj"/>
+    <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj"/>
+  </Folder>
+  <Folder Name="/src/Samples/"/>
+  <Folder Name="/src/Samples/Dynamic/">
+    <Project Path="src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Capabilities/Capabilities.csproj"/>
+    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogs/FileDialogs.csproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj"/>
+    <Project Path="src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Multiselect/Multiselect.csproj"/>
+    <Project Path="src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/NewWindow/NewWindow.csproj"/>
+    <Project Path="src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj"/>
+    <Project Path="src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SingleCounter/SingleCounter.csproj"/>
+    <Project Path="src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Sticky/Sticky.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModel/SubModel.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj"/>
+    <Project Path="src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Threading/Threading.csproj"/>
+    <Project Path="src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj"/>
+    <Project Path="src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Validation/Validation.csproj"/>
+  </Folder>
+  <Folder Name="/src/Samples/Typed/">
+    <Project Path="src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/SubModelStatic/SubModelStatic.csproj"/>
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj"/>
+    <Project Path="tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj"/>
   </Folder>
-  <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
-  <Project Path="src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj" />
-  <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj" />
 </Solution>
\ No newline at end of file
diff --git a/README.md b/README.md
index e3497c09..04041f2a 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,13 @@ WPF done the Elmish Way
 
 [![NuGet version](https://img.shields.io/nuget/v/Elmish.WPF.svg)](https://www.nuget.org/packages/Elmish.WPF) [![NuGet downloads](https://img.shields.io/nuget/dt/Elmish.WPF.svg)](https://www.nuget.org/packages/Elmish.WPF) [![Build status](https://github.com/elmish/Elmish.WPF/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/elmish/Elmish.WPF/actions/workflows/continuous_integration.yml)
 
-**The good parts of MVVM (the data bindings) with the simplicity and robustness of an MVU architecture for the rest of your app. Never write an overly-complex ViewModel class again!**
+**The good parts of MVVM (the data bindings) with the simplicity and robustness of an MVU architecture for the rest of
+your app. Never write an overly-complex ViewModel class again!**
 
 ### Elevator pitch
 
-Elmish.WPF is a **production-ready** library that allows you to write WPF apps with the robust, simple, well-known, and battle-tested MVU architecture, while still allowing you to use all your XAML knowledge and tooling to create UIs.
+Elmish.WPF is a **production-ready** library that allows you to write WPF apps with the robust, simple, well-known, and
+battle-tested MVU architecture, while still allowing you to use all your XAML knowledge and tooling to create UIs.
 
 Some benefits of MVU you’ll get with Elmish.WPF include:
 
@@ -22,7 +24,10 @@ Some benefits of MVU you’ll get with Elmish.WPF include:
 * Simple optimization
 * 78% more rockets 🚀
 
-Even with static views, your central model/update code can follow an idiomatic Elmish/MVU architecture. You could, if you wanted, use the same model/update code to implement an app using a dynamic UI library such as [Fabulous](https://github.com/fsprojects/Fabulous) or [Fable.React](https://github.com/fable-compiler/fable-react), by just rewriting the “U” part of MVU.
+Even with static views, your central model/update code can follow an idiomatic Elmish/MVU architecture. You could, if
+you wanted, use the same model/update code to implement an app using a dynamic UI library such
+as [Fabulous](https://github.com/fsprojects/Fabulous) or [Fable.React](https://github.com/fable-compiler/fable-react),
+by just rewriting the “U” part of MVU.
 
 **Static XAML views is a feature, not a limitation. See the FAQ for several unique benefits to this approach!**
 
@@ -34,28 +39,40 @@ Big thanks to [@MrMattSim](https://github.com/MrMattSim) for the wonderful logo!
 
 [![JetBrains logo](jetbrains.svg)](https://www.jetbrains.com/?from=Elmish.WPF)
 
-Thanks to JetBrains for sponsoring Elmish.WPF with [OSS licenses](https://www.jetbrains.com/community/opensource/#support)!
+Thanks to JetBrains for sponsoring Elmish.WPF
+with [OSS licenses](https://www.jetbrains.com/community/opensource/#support)!
 
 Recommended resources
 ---------------------
 
-* The [Elmish.WPF tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) explains how to use Elmish.WPF, starting with general Elmish/MVU concepts and ending with complex optimizations.
-* The [Elmish.WPF binding reference](https://github.com/elmish/Elmish.WPF/blob/master/REFERENCE.md) explains Elmish.WPF's bindings and library functions for modifying bindings.
+* The [Elmish.WPF tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) explains how to use
+  Elmish.WPF, starting with general Elmish/MVU concepts and ending with complex optimizations.
+* The [Elmish.WPF binding reference](https://github.com/elmish/Elmish.WPF/blob/master/REFERENCE.md) explains
+  Elmish.WPF's bindings and library functions for modifying bindings.
 * The [Elmish docs site](https://elmish.github.io/elmish) also explains the general MVU architecture and principles.
-* The [Elmish.WPF samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) provide many concrete usage examples.
+* The [Elmish.WPF samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) provide many concrete usage
+  examples.
 * Blog posts:
-   * [Getting Elmish in .NET with Elmish.WPF](https://medium.com/swlh/getting-elmish-in-net-with-elmish-wpf-cd44e3eddc27) ("getting started" guide by Matt Eland)
-* Elm resources may also provide some guidance, but note that not everything is relevant. A significant difference between “normal” Elm architecture and Elmish.WPF is that in Elmish.WPF, the views are statically defined using XAML, and the “view” function does not render views, but set up bindings. See the [tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) for details.
-  * [Official Elm guide](https://guide.elm-lang.org)
-  * Two talks: [Summarising Elm scaling strategy](https://dev.to/elmupdate/summarising-elm-scaling-strategy-1bjn)
-  * Reddit: [Resources regarding scaling Elm apps](https://www.reddit.com/r/elm/comments/65s0g4/resources_regarding_scaling_elm_apps/)
-  * Reddit: [How to structure Elm with multiple models](https://www.reddit.com/r/elm/comments/5jd2xn/how_to_structure_elm_with_multiple_models/dbuu0m4/)
-  * Reddit: [Elm Architecture with a Redux-like store pattern](https://www.reddit.com/r/elm/comments/5xdl9z/elm_architecture_with_a_reduxlike_store_pattern/)
+    * [Getting Elmish in .NET with Elmish.WPF](https://medium.com/swlh/getting-elmish-in-net-with-elmish-wpf-cd44e3eddc27) ("
+      getting started" guide by Matt Eland)
+* Elm resources may also provide some guidance, but note that not everything is relevant. A significant difference
+  between “normal” Elm architecture and Elmish.WPF is that in Elmish.WPF, the views are statically defined using XAML,
+  and the “view” function does not render views, but set up bindings. See
+  the [tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) for details.
+    * [Official Elm guide](https://guide.elm-lang.org)
+    * Two talks: [Summarising Elm scaling strategy](https://dev.to/elmupdate/summarising-elm-scaling-strategy-1bjn)
+    *
+    Reddit: [Resources regarding scaling Elm apps](https://www.reddit.com/r/elm/comments/65s0g4/resources_regarding_scaling_elm_apps/)
+    *
+    Reddit: [How to structure Elm with multiple models](https://www.reddit.com/r/elm/comments/5jd2xn/how_to_structure_elm_with_multiple_models/dbuu0m4/)
+    *
+    Reddit: [Elm Architecture with a Redux-like store pattern](https://www.reddit.com/r/elm/comments/5xdl9z/elm_architecture_with_a_reduxlike_store_pattern/)
 
 Getting started with Elmish.WPF
 -------------------------------
 
-See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) sample for a very simple app. The central points are (assuming up-to-date VS2019):
+See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) sample for a very simple app. The
+central points are (assuming up-to-date VS2019):
 
 1. Create an F# Class Library. If targeting .NET 5 or .NET Core, the project file should look like this:
 
@@ -111,7 +128,10 @@ See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Sam
 
 6. Define the “view” function using the `Bindings` module. This is the central public API of Elmish.WPF.
 
-   Normally in Elm/Elmish this function is called `view` and would take a model and a dispatch function (to dispatch new messages to the update loop) and return the UI (e.g. a HTML DOM to be rendered), but in Elmish.WPF this function is in general only run once and simply sets up bindings that XAML-defined views can use. Therefore, let’s call it `bindings` instead of `view`.
+   Normally in Elm/Elmish this function is called `view` and would take a model and a dispatch function (to dispatch new
+   messages to the update loop) and return the UI (e.g. a HTML DOM to be rendered), but in Elmish.WPF this function is
+   in general only run once and simply sets up bindings that XAML-defined views can use. Therefore, let’s call it
+   `bindings` instead of `view`.
 
    ```F#
    open Elmish.WPF
@@ -127,10 +147,10 @@ See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Sam
      ]
    ```
 
-   The strings identify the binding names to be used in the XAML views. The Binding module has many functions to create various types of bindings.
+   The strings identify the binding names to be used in the XAML views. The Binding module has many functions to create
+   various types of bindings.
 
-
-   Alternatively, use statically-typed view models in order to get better IDE support in the XAML.
+Alternatively, use statically-typed view models in order to get better IDE support in the XAML.
 
    ```f#
    open Elmish.WPF
@@ -146,7 +166,8 @@ See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Sam
        and set(v) = base.Set(v) (Binding.OneWayToSourceT.id >> Binding.mapMsg Counter.Msg.SetStepSize)
    ```
 
-7. Create a function that accepts the app’s main window (to be created) and configures and starts the Elmish loop for the window with your `init`, `update` and `bindings`:
+7. Create a function that accepts the app’s main window (to be created) and configures and starts the Elmish loop for
+   the window with your `init`, `update` and `bindings`:
 
    ```F#
    open Elmish.WPF
@@ -166,13 +187,18 @@ See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Sam
      |> Program.runElmishLoop window
    ```
 
-   In the code above, `Program.runElmishLoop` will set the window’s `DataContext` to the specified bindings and start the Elmish dispatch loop for the window.
+   In the code above, `Program.runElmishLoop` will set the window’s `DataContext` to the specified bindings and start
+   the Elmish dispatch loop for the window.
 
-8. Create a WPF app project (using the Visual Studio template called `WPF App (.NET)`). This will be your entry point and contain the XAML views. Add a reference to the F# project, and make the following changes in the `csproj` file:
+8. Create a WPF app project (using the Visual Studio template called `WPF App (.NET)`). This will be your entry point
+   and contain the XAML views. Add a reference to the F# project, and make the following changes in the `csproj` file:
 
-   * Currently, the core Elmish logs are only output to the console. If you want a console window for displaying Elmish logs, change `<OutputType>WinExe</OutputType>` to `<OutputType>Exe</OutputType>` and add `<DisableWinExeOutputInference>true</DisableWinExeOutputInference>`.
-   * If the project file starts with the now legacy `<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">`, change it to `<Project Sdk="Microsoft.NET.Sdk">`
-   * Change the target framework to match the one used in the F# project (e.g. `net5.0-windows`).
+    * Currently, the core Elmish logs are only output to the console. If you want a console window for displaying Elmish
+      logs, change `<OutputType>WinExe</OutputType>` to `<OutputType>Exe</OutputType>` and add
+      `<DisableWinExeOutputInference>true</DisableWinExeOutputInference>`.
+    * If the project file starts with the now legacy `<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">`, change it to
+      `<Project Sdk="Microsoft.NET.Sdk">`
+    * Change the target framework to match the one used in the F# project (e.g. `net5.0-windows`).
 
    Make the following changes to `App.xaml.cs` to initialize Elmish when the app starts:
 
@@ -214,9 +240,12 @@ See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Sam
 
 Further resources:
 
-* The [Elmish.WPF tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) provides information on general MVU/Elmish concepts and how they apply to Elmish.WPF, as well as the various Elmish.WPF bindings.
-* The [samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) are complete, working mini-apps demonstrating selected aspects of Elmish.WPF.
-* If you'd like to contribute, please read and follow the [Contributor guidelines](https://github.com/elmish/Elmish.WPF/blob/master/.github/CONTRIBUTING.md).
+* The [Elmish.WPF tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) provides information on
+  general MVU/Elmish concepts and how they apply to Elmish.WPF, as well as the various Elmish.WPF bindings.
+* The [samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) are complete, working mini-apps
+  demonstrating selected aspects of Elmish.WPF.
+* If you'd like to contribute, please read and follow
+  the [Contributor guidelines](https://github.com/elmish/Elmish.WPF/blob/master/.github/CONTRIBUTING.md).
 
 FAQ
 ---
@@ -225,47 +254,75 @@ FAQ
 
 Not at all! 🙂
 
-It’s true that static views aren’t as composable as dynamic views. It’s also true that at the time of writing, there are no solid, production-ready dynamic UI libraries for WPF (though there are no lack of half-finished attempts or proof-of-concepts: [Elmish.WPF.Dynamic](https://github.com/cmeeren/Elmish.WPF.Dynamic), [Fabulous.WPF](https://github.com/TimLariviere/Fabulous.WPF), [Skylight](https://github.com/gerardtoconnor/Skylight), [Uil](https://github.com/elmish/Uil)). Heck, it’s even true that Elmish.WPF was originally created with static views due to the difficulty of creating a dynamic UI library, as described in [issue #1](https://github.com/elmish/Elmish.WPF/issues/1).
+It’s true that static views aren’t as composable as dynamic views. It’s also true that at the time of writing, there are
+no solid, production-ready dynamic UI libraries for WPF (though there are no lack of half-finished attempts or
+proof-of-concepts: [Elmish.WPF.Dynamic](https://github.com/cmeeren/Elmish.WPF.Dynamic), [Fabulous.WPF](https://github.com/TimLariviere/Fabulous.WPF), [Skylight](https://github.com/gerardtoconnor/Skylight), [Uil](https://github.com/elmish/Uil)).
+Heck, it’s even true that Elmish.WPF was originally created with static views due to the difficulty of creating a
+dynamic UI library, as described in [issue #1](https://github.com/elmish/Elmish.WPF/issues/1).
 
 However, Elmish.WPF’s static-view-based solution has several unique benefits:
 
-- You can use your existing XAML and MVVM knowledge (that is, the best part of MVVM – the UI bindings – without having to deal with `NavigationService`s, `ViewModelLocator`s, state synchronization, `INotifyPropertyChanged`, etc.)
-- Huge mindshare – there are tons of relevant XAML and MVVM resources on the net which can help with the UI and data binding part if you get stuck
-- Automatic support for all 3rd party WPF UI libraries like [MaterialDesignInXamlToolkit](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit), since it just uses XAML and bindings (support for 3rd party libraries is commonly a major pain point for dynamic UI solutions)
+- You can use your existing XAML and MVVM knowledge (that is, the best part of MVVM – the UI bindings – without having
+  to deal with `NavigationService`s, `ViewModelLocator`s, state synchronization, `INotifyPropertyChanged`, etc.)
+- Huge mindshare – there are tons of relevant XAML and MVVM resources on the net which can help with the UI and data
+  binding part if you get stuck
+- Automatic support for all 3rd party WPF UI libraries
+  like [MaterialDesignInXamlToolkit](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit), since it just
+  uses XAML and bindings (support for 3rd party libraries is commonly a major pain point for dynamic UI solutions)
 - You can use the XAML designer (including design-time data binding)
-- Automatically puts all the power of WPF at your fingertips, whereas dynamic UI solutions have [inherent limitations](https://github.com/cmeeren/Elmish.WPF.Dynamic/tree/e9f04b6e330754f045df093368fa4917c892399d#current-limitations) that are not easy to work around
+- Automatically puts all the power of WPF at your fingertips, whereas dynamic UI solutions
+  have [inherent limitations](https://github.com/cmeeren/Elmish.WPF.Dynamic/tree/e9f04b6e330754f045df093368fa4917c892399d#current-limitations)
+  that are not easy to work around
 
 In short, for WPF apps, a solution based on static XAML views is currently the way to go.
 
 #### Do I have to use the project structure outlined above?
 
-Not at all. The above example, as well as the samples, keep all non-UI code in a single project for simplicity, and all the XAML in a C# project for better tooling.
+Not at all. The above example, as well as the samples, keep all non-UI code in a single project for simplicity, and all
+the XAML in a C# project for better tooling.
 
-An alternative with a clearer separation of UI and core logic can be implemented by splitting the F# project into two projects:
+An alternative with a clearer separation of UI and core logic can be implemented by splitting the F# project into two
+projects:
 
 * A core library containing the model definitions and `update` functions.
-  * This library can include a reference to Elmish (e.g. for the `Cmd` module helpers), but not to Elmish.WPF, which depends on WPF and has a UI-centered API (specifying bindings). This will ensure your core logic (such as the `update` function) is free from any UI concerns, and allow you to re-use the core library should you want to port your app to another Elmish-based solution (e.g. Fable.React).
+    * This library can include a reference to Elmish (e.g. for the `Cmd` module helpers), but not to Elmish.WPF, which
+      depends on WPF and has a UI-centered API (specifying bindings). This will ensure your core logic (such as the
+      `update` function) is free from any UI concerns, and allow you to re-use the core library should you want to port
+      your app to another Elmish-based solution (e.g. Fable.React).
 * An Elmish.WPF project that contains the `bindings` (or `view`) function and the call to `Program.runElmishLoop`.
-  * This project would reference the core library and `Elmish.WPF`.
+    * This project would reference the core library and `Elmish.WPF`.
 
-Another alternative is to turn the sample code on its head and have the F# project be a console app containing your entry point (with a call to `Program.runWindow`) and referencing the C#/XAML project (instead of the other way around, as demonstrated above).
+Another alternative is to turn the sample code on its head and have the F# project be a console app containing your
+entry point (with a call to `Program.runWindow`) and referencing the C#/XAML project (instead of the other way around,
+as demonstrated above).
 
 In general, you have a large amount of freedom in how you structure your solution and what kind of entry point you use.
 
 #### How can I test commands? What is the CmdMsg pattern?
 
-Since the commands (`Cmd<Msg>`) returned by `init` and `update` are lists of functions, they are not particularly testable. A general pattern to get around this is to replace the commands with pure data that are transformed to the actual commands elsewhere:
+Since the commands (`Cmd<Msg>`) returned by `init` and `update` are lists of functions, they are not particularly
+testable. A general pattern to get around this is to replace the commands with pure data that are transformed to the
+actual commands elsewhere:
 
 * Create a `CmdMsg` union type with cases for each command you want to execute in the app.
-* Make `init` and `update` return `model * CmdMsg list` instead of `model * Cmd<Msg>`. Since `init` and `update` now return data, they are much easier to test.
+* Make `init` and `update` return `model * CmdMsg list` instead of `model * Cmd<Msg>`. Since `init` and `update` now
+  return data, they are much easier to test.
 * Create a trivial/too-boring-to-test `cmdMsgToCmd` function that transforms a `CmdMsg` to the corresponding `Cmd`.
-* Finally, create “normal” versions of `init` and `update` that you can use when creating `Program`. Elmish.WPF provides `Program.mkProgramWpfWithCmdMsg` that does this for you (but there’s no magic going on – it’s really easy to do yourself).
+* Finally, create “normal” versions of `init` and `update` that you can use when creating `Program`. Elmish.WPF provides
+  `Program.mkProgramWpfWithCmdMsg` that does this for you (but there’s no magic going on – it’s really easy to do
+  yourself).
 
-The [FileDialogsCmdMsg sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) demonstrates this approach. For more information, see the [Fabulous documentation](https://fsprojects.github.io/Fabulous/Fabulous.XamarinForms/update.html#replacing-commands-with-command-messages-for-better-testability). For reference, here is [the discussion that led to this pattern](https://github.com/fsprojects/Fabulous/pull/320#issuecomment-491522737).
+The [FileDialogsCmdMsg sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) demonstrates this approach.
+For more information, see
+the [Fabulous documentation](https://fsprojects.github.io/Fabulous/Fabulous.XamarinForms/update.html#replacing-commands-with-command-messages-for-better-testability).
+For reference, here
+is [the discussion that led to this pattern](https://github.com/fsprojects/Fabulous/pull/320#issuecomment-491522737).
 
 #### Can I use design-time view models?
 
-Yes. Assuming you have a C# XAML and entry point project referencing the F# project, simply use `ViewModel.designInstance` (e.g. in the F# project) to create a view model instance that your XAML can use at design-time:
+Yes. Assuming you have a C# XAML and entry point project referencing the F# project, simply use
+`ViewModel.designInstance` (e.g. in the F# project) to create a view model instance that your XAML can use at
+design-time:
 
 ```F#
 module MyAssembly.DesignViewModels
@@ -286,14 +343,15 @@ Then use the following attributes wherever you need a design-time VM:
 
 When targeting legacy .NET Framework, “Project code” must be enabled in the XAML designer for this to work.
 
-If you are using static view models, make sure that the View Model type is in a namespace and add a default constructor that passes a model into `ViewModelArgs.simple`:
+If you are using static view models, make sure that the View Model type is in a namespace and add a default constructor
+that passes a model into `ViewModelArgs.simple`:
 
 ```F#
 namespace ViewModels
 
 type [<AllowNullLiteral>] AppViewModel (args) =
   inherit ViewModelBase<AppModel, AppMsg>(args)
-  
+
   new() = AppViewModel(App.init () |> ViewModelArgs.simple)
 ```
 
@@ -311,7 +369,11 @@ Then use the following attributes just like you would in a normal C# MVVM projec
 
 ##### .NET Core 3 workaround
 
-When targeting .NET Core 3, a bug in the XAML designer causes design-time data to not be displayed through `DataContext` bindings. See [this issue](https://developercommunity.visualstudio.com/content/problem/1133390/design-time-data-in-datacontext-binding-not-displa.html) for details. One workaround is to add a `d:DataContext` binding alongside your normal `DataContext` binding. Another workaround is to change
+When targeting .NET Core 3, a bug in the XAML designer causes design-time data to not be displayed through `DataContext`
+bindings.
+See [this issue](https://developercommunity.visualstudio.com/content/problem/1133390/design-time-data-in-datacontext-binding-not-displa.html)
+for details. One workaround is to add a `d:DataContext` binding alongside your normal `DataContext` binding. Another
+workaround is to change
 
 ```xaml
 <local:MyControl DataContext="{Binding Child}" />
@@ -326,21 +388,28 @@ to
                           RelativeSource={RelativeSource AncestorType=T}}" />
 ```
 
-where `T` is the type of the parent object that contains `local:MyControl` (or a more distant ancestor, though there are issues with using `Window` as the type).
+where `T` is the type of the parent object that contains `local:MyControl` (or a more distant ancestor, though there are
+issues with using `Window` as the type).
 
 #### Can I open new windows/dialogs?
 
-Sure! Just use `Binding.subModelWin`. It works like `Binding.subModel`, but has a `WindowState` wrapper around the returned model to control whether the window is closed, hidden, or visible. You can use both modal and non-modal windows/dialogs, and everything is a part of the Elmish core loop. Check out the [NewWindow sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples).
+Sure! Just use `Binding.subModelWin`. It works like `Binding.subModel`, but has a `WindowState` wrapper around the
+returned model to control whether the window is closed, hidden, or visible. You can use both modal and non-modal
+windows/dialogs, and everything is a part of the Elmish core loop. Check out
+the [NewWindow sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples).
 
-Note that if you use `App.xaml` startup, you may want to set `ShutdownMode="OnMainWindowClose"` in `App.xaml` if that’s the desired behavior.
+Note that if you use `App.xaml` startup, you may want to set `ShutdownMode="OnMainWindowClose"` in `App.xaml` if that’s
+the desired behavior.
 
 #### Can I bind to events and use behaviors?
 
-Sure! Check out the [EventBindingsAndBehaviors sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples). Note that you have to install the NuGet package `Microsoft.Xaml.Behaviors.Wpf`.
+Sure! Check out the [EventBindingsAndBehaviors sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples).
+Note that you have to install the NuGet package `Microsoft.Xaml.Behaviors.Wpf`.
 
 #### How can I control logging?
 
-Elmish.WPF uses `Microsoft.Extensions.Logging`. To see Elmish.WPF output in your favorite logging framework, use `WpfProgram.withLogger` to pass an `ILoggerFactory`:
+Elmish.WPF uses `Microsoft.Extensions.Logging`. To see Elmish.WPF output in your favorite logging framework, use
+`WpfProgram.withLogger` to pass an `ILoggerFactory`:
 
 ```f#
 WpfProgram.mkSimple init update bindings
@@ -348,15 +417,22 @@ WpfProgram.mkSimple init update bindings
 |> WpfProgram.runWindow window
 ```
 
-For example, in Serilog, you need to install Serilog.Extensions.Logging and instantiate `SerilogLoggerFactory`. The samples demonstrate this.
+For example, in Serilog, you need to install Serilog.Extensions.Logging and instantiate `SerilogLoggerFactory`. The
+samples demonstrate this.
 
 Elmish.WPF logs to these categories:
 
 * `Elmish.WPF.Update`: Logs exceptions (Error level) and messages/models (Trace/Verbose level) during `update`.
-* `Elmish.WPF.Bindings`: Logs events related to bindings. Some logging is done at the Error level (e.g. developer errors such as duplicated binding names, using non-existent bindings in XAML, etc.), but otherwise it’s generally just Trace/Verbose for when you really want to see everything that’s happening (triggering `PropertyChanged`, WPF getting/setting bindings, etc.)
-* `Elmish.WPF.Performance`: Logs the performance of the functions you pass when creating bindings (`get`, `set`, `map`, `equals`, etc.) at the Trace/Verbose level. Use `WpfProgram.withPerformanceLogThreshold` to set the minimum duration to log.
-
-The specific method of controlling what Elmish.WPF logs depends on your logging framework. For Serilog you can use `.MinimumLevel.Override(...)` to specify the minimum log level per category, like this:
+* `Elmish.WPF.Bindings`: Logs events related to bindings. Some logging is done at the Error level (e.g. developer errors
+  such as duplicated binding names, using non-existent bindings in XAML, etc.), but otherwise it’s generally just
+  Trace/Verbose for when you really want to see everything that’s happening (triggering `PropertyChanged`, WPF
+  getting/setting bindings, etc.)
+* `Elmish.WPF.Performance`: Logs the performance of the functions you pass when creating bindings (`get`, `set`, `map`,
+  `equals`, etc.) at the Trace/Verbose level. Use `WpfProgram.withPerformanceLogThreshold` to set the minimum duration
+  to log.
+
+The specific method of controlling what Elmish.WPF logs depends on your logging framework. For Serilog you can use
+`.MinimumLevel.Override(...)` to specify the minimum log level per category, like this:
 
 ```f#
 myLoggerConfiguration
diff --git a/REFERENCE.md b/REFERENCE.md
index 5a0dae42..88248ac1 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -5,39 +5,38 @@ Table of contents
 -----------------
 
 * [The Elmish.WPF bindings](#the-elmishwpf-bindings)
-  + [One-way bindings](#one-way-bindings)
-    - [Binding to option-wrapped values](#binding-to-option-wrapped-values)
-  + [Two-way bindings](#two-way-bindings)
-    - [Binding to option-wrapped values](#binding-to-option-wrapped-values-1)
-    - [Using validation with two-way bindings](#using-validation-with-two-way-bindings)
-  + [Command bindings](#command-bindings)
-    - [Conditional commands (where you control `CanExecute`)](#conditional-commands-where-you-control-canexecute)
-    - [Using the `CommandParameter`](#using-the-commandparameter)
-  + [Sub-model bindings](#sub-model-bindings)
-    - [Level 1: No separate message type or customization of model for sub-bindings](#level-1-no-separate-message-type-or-customization-of-model-for-sub-bindings)
-    - [Level 2: Separate message type but no customization of model for sub-bindings](#level-2-separate-message-type-but-no-customization-of-model-for-sub-bindings)
-    - [Level 3: Separate message type and arbitrary customization of model for sub-bindings](#level-3-separate-message-type-and-arbitrary-customization-of-model-for-sub-bindings)
-    - [Optional and “sticky” sub-model bindings](#optional-and-sticky-sub-model-bindings)
-  + [Sub-model window bindings](#sub-model-window-bindings)
-  + [Sub-model sequence bindings](#sub-model-sequence-bindings)
-  + [Other bindings](#other-bindings)
-    - [`subModelSelectedItem`](#submodelselecteditem)
-    - [`oneWaySeq`](#onewayseq)
-  + [Lazy bindings](#lazy-bindings)
+    + [One-way bindings](#one-way-bindings)
+        - [Binding to option-wrapped values](#binding-to-option-wrapped-values)
+    + [Two-way bindings](#two-way-bindings)
+        - [Binding to option-wrapped values](#binding-to-option-wrapped-values-1)
+        - [Using validation with two-way bindings](#using-validation-with-two-way-bindings)
+    + [Command bindings](#command-bindings)
+        - [Conditional commands (where you control `CanExecute`)](#conditional-commands-where-you-control-canexecute)
+        - [Using the `CommandParameter`](#using-the-commandparameter)
+    + [Sub-model bindings](#sub-model-bindings)
+        - [Level 1: No separate message type or customization of model for sub-bindings](#level-1-no-separate-message-type-or-customization-of-model-for-sub-bindings)
+        - [Level 2: Separate message type but no customization of model for sub-bindings](#level-2-separate-message-type-but-no-customization-of-model-for-sub-bindings)
+        - [Level 3: Separate message type and arbitrary customization of model for sub-bindings](#level-3-separate-message-type-and-arbitrary-customization-of-model-for-sub-bindings)
+        - [Optional and “sticky” sub-model bindings](#optional-and-sticky-sub-model-bindings)
+    + [Sub-model window bindings](#sub-model-window-bindings)
+    + [Sub-model sequence bindings](#sub-model-sequence-bindings)
+    + [Other bindings](#other-bindings)
+        - [`subModelSelectedItem`](#submodelselecteditem)
+        - [`oneWaySeq`](#onewayseq)
+    + [Lazy bindings](#lazy-bindings)
 * [Modifying bindings](#modifying-bindings)
-  + [Lazy updating](#lazy-updating)
-  + [Caching](#caching)
-  + [Mapping bindings](#mapping-bindings)
-    - [Example use of `mapModel` and `mapMsg`](#example-use-of-mapModel-and-mapMsg)
-    - [Theory behind `mapModel` and `mapMsg`](#theory-behind-mapModel-and-mapMsg)
+    + [Lazy updating](#lazy-updating)
+    + [Caching](#caching)
+    + [Mapping bindings](#mapping-bindings)
+        - [Example use of `mapModel` and `mapMsg`](#example-use-of-mapModel-and-mapMsg)
+        - [Theory behind `mapModel` and `mapMsg`](#theory-behind-mapModel-and-mapMsg)
 * [Statically-typed view models](#statically-typed-view-models)
-  + [Inherit from `ViewModelBase<'model, 'msg>`](#inherit-from-viewmodelbasemodel-msg)
-  + [Typed Bindings](#typed-bindings)
-    - [Typed One-way Bindings](#typed-one-way-bindings)
-    - [Typed SubModel Bindings](#typed-submodel-bindings)
-    - [Typed WpfProgram Bindings](#typed-wpfprogram-bindings)
-    - [Mixing and matching bindings](#mixing-and-matching-bindings)
-
+    + [Inherit from `ViewModelBase<'model, 'msg>`](#inherit-from-viewmodelbasemodel-msg)
+    + [Typed Bindings](#typed-bindings)
+        - [Typed One-way Bindings](#typed-one-way-bindings)
+        - [Typed SubModel Bindings](#typed-submodel-bindings)
+        - [Typed WpfProgram Bindings](#typed-wpfprogram-bindings)
+        - [Mixing and matching bindings](#mixing-and-matching-bindings)
 
 The Elmish.WPF bindings
 ----------------------------
@@ -45,19 +44,25 @@ The Elmish.WPF bindings
 The Elmish.WPF bindings can be categorized into the following types:
 
 - **One-way bindings**, for when you want to bind to a simple value.
-- **Two-way bindings**, for when you want to bind to a simple value as well as update this value by dispatching a message. Used for inputs, checkboxes, sliders, etc. Can optionally support validation (e.g. provide an error message using `INotifyDataErrorInfo` that can be displayed when an input is not valid).
+- **Two-way bindings**, for when you want to bind to a simple value as well as update this value by dispatching a
+  message. Used for inputs, checkboxes, sliders, etc. Can optionally support validation (e.g. provide an error message
+  using `INotifyDataErrorInfo` that can be displayed when an input is not valid).
 - **Command bindings**, for when you want a message to be dispatched when something happens (e.g. a button is clicked).
 - **Sub-model bindings**, for when you want to bind to a complex object that has its own bindings.
 - **Sub-model window bindings**, for when you want to control the opening/closing/hiding of new windows.
-- **Sub-model sequence bindings**, for when you want to bind to a collection of complex objects, each of which has its own bindings.
+- **Sub-model sequence bindings**, for when you want to bind to a collection of complex objects, each of which has its
+  own bindings.
 - **Other bindings** not fitting into the categories above
-- **Lazy bindings**, optimizations of various other bindings that allow skipping potentially expensive computations if the input is unchanged
+- **Lazy bindings**, optimizations of various other bindings that allow skipping potentially expensive computations if
+  the input is unchanged
 
-Additionally, there is a section explaining how most dispatching bindings allow you to wrap the dispatcher to support debouncing/throttling etc.
+Additionally, there is a section explaining how most dispatching bindings allow you to wrap the dispatcher to support
+debouncing/throttling etc.
 
 ### One-way bindings
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter) and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
+and [F# core](src/Samples/SingleCounter.Core))*
 
 One-way bindings are used when you want to bind to a simple value.
 
@@ -77,13 +82,22 @@ A one-way binding simply accepts a function `get: 'model -> 'a` that retrieves t
 
 #### Binding to option-wrapped values
 
-In F#, it’s common to model missing values using the `Option` type. However, WPF uses `null` and doesn’t know how to handle the F# `Option` type. You could simply convert from `Option` to `null` (or `Nullable<_>`) in the `get` function using `Option.toObj` (or `Option.toNullable`), but this is such a common scenario that Elmish.WPF has a variant of the one-way binding called `oneWayOpt` with this behavior built-in. The `oneWayOpt` binding accepts a function `get: 'model -> 'a option`. If it returns `None`, the UI will receive `null`. If it returns `Some`, the UI will receive the inner value.
+In F#, it’s common to model missing values using the `Option` type. However, WPF uses `null` and doesn’t know how to
+handle the F# `Option` type. You could simply convert from `Option` to `null` (or `Nullable<_>`) in the `get` function
+using `Option.toObj` (or `Option.toNullable`), but this is such a common scenario that Elmish.WPF has a variant of the
+one-way binding called `oneWayOpt` with this behavior built-in. The `oneWayOpt` binding accepts a function
+`get: 'model -> 'a option`. If it returns `None`, the UI will receive `null`. If it returns `Some`, the UI will receive
+the inner value.
 
 ### Two-way bindings
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter) and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
+and [F# core](src/Samples/SingleCounter.Core))*
 
-Two-way bindings are commonly used for any kind of input (textboxes, checkboxes, sliders, etc.). The two-way bindings accept two functions: A function `get: 'model -> 'a` just like the one-way binding, and a function `set: 'a -> 'model -> 'msg` that accepts the UI value to be set and the current model, and returns the message to be dispatched.
+Two-way bindings are commonly used for any kind of input (textboxes, checkboxes, sliders, etc.). The two-way bindings
+accept two functions: A function `get: 'model -> 'a` just like the one-way binding, and a function
+`set: 'a -> 'model -> 'msg` that accepts the UI value to be set and the current model, and returns the message to be
+dispatched.
 
 In the counter example above, the two-way binding to the slider value may look like this:
 
@@ -105,11 +119,17 @@ The corresponding XAML may look like this:
   IsSnapToTickEnabled="True" />
 ```
 
-The WPF slider’s value is a `float`, but in the model we use an `int`. Therefore the binding’s `get` function must convert the model’s integer to a float, and conversely, the binding’s “setter” must convert the UI value from a float to an int.
+The WPF slider’s value is a `float`, but in the model we use an `int`. Therefore the binding’s `get` function must
+convert the model’s integer to a float, and conversely, the binding’s “setter” must convert the UI value from a float to
+an int.
 
-You might think that the `get` function doesn’t have to cast to `float`. However, `'a` is the same in both `get` and `set`, and if you return `int` in `get`, then Elmish.WPF expects the value coming from the UI (which is `obj`) to also be `int`, and will try to unbox it to `int` when being set. Since it actually is a `float`, this will fail.
+You might think that the `get` function doesn’t have to cast to `float`. However, `'a` is the same in both `get` and
+`set`, and if you return `int` in `get`, then Elmish.WPF expects the value coming from the UI (which is `obj`) to also
+be `int`, and will try to unbox it to `int` when being set. Since it actually is a `float`, this will fail.
 
-It’s common for the `set` function to rely only on the value to be set, not on the model. Therefore, the two-way binding also has an overload where the `set` function accepts only the value, not the model. This allows a more shorthand notation:
+It’s common for the `set` function to rely only on the value to be set, not on the model. Therefore, the two-way binding
+also has an overload where the `set` function accepts only the value, not the model. This allows a more shorthand
+notation:
 
 ```f#
 "StepSize" |> Binding.twoWay(
@@ -120,39 +140,54 @@ It’s common for the `set` function to rely only on the value to be set, not on
 
 #### Binding to option-wrapped values
 
-Just like one-way bindings, there is a variant of the two-way binding for `option`-wrapped values. The `option` wrapping is used in both `get` and `set`. Elmish.WPF will convert both ways between a possibly `null` raw value and an `option`-wrapped value.
+Just like one-way bindings, there is a variant of the two-way binding for `option`-wrapped values. The `option` wrapping
+is used in both `get` and `set`. Elmish.WPF will convert both ways between a possibly `null` raw value and an `option`
+-wrapped value.
 
 #### Using validation with two-way bindings
 
 *Relevant sample: Validation - ([XAML views](src/Samples/Validation) and [F# core](src/Samples/Validation.Core))*
 
-You might want to display validation errors when the input is invalid. The best way to do this in WPF is through `INotifyDataErrorInfo`. Elmish.WPF supports this directly through the `twoWayValidate` bindings. In addition to `get` and `set`, this binding also accepts a third parameter that returns the error string to be displayed. This can be returned as `string option` (where `None` indicates no error), or `Result<_, string>` (where `Ok` indicates no error; this variant might allow you to easily reuse existing validation functions you have).
+You might want to display validation errors when the input is invalid. The best way to do this in WPF is through
+`INotifyDataErrorInfo`. Elmish.WPF supports this directly through the `twoWayValidate` bindings. In addition to `get`
+and `set`, this binding also accepts a third parameter that returns the error string to be displayed. This can be
+returned as `string option` (where `None` indicates no error), or `Result<_, string>` (where `Ok` indicates no error;
+this variant might allow you to easily reuse existing validation functions you have).
 
-Keep in mind that by default, WPF controls do not display errors. To display errors, either use 3rd party controls/styles (such as [MaterialDesignInXamlToolkit](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit)) or add your own styles (the `Validation` sample in this repo demonstrates this).
+Keep in mind that by default, WPF controls do not display errors. To display errors, either use 3rd party
+controls/styles (such
+as [MaterialDesignInXamlToolkit](https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit)) or add your own
+styles (the `Validation` sample in this repo demonstrates this).
 
 There are also variants of the two-way validating bindings for option-wrapped values.
 
 ### Command bindings
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter) and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
+and [F# core](src/Samples/SingleCounter.Core))*
 
 Command bindings are used whenever you use `Command`/`CommandParameter` in XAML, such as for button clicks.
 
-For example, for the counter app we have been looking at, the XAML binding to execute a command when the “Increment” button is clicked might look like this:
+For example, for the counter app we have been looking at, the XAML binding to execute a command when the “Increment”
+button is clicked might look like this:
 
 ```xaml
 <Button Command="{Binding Increment}" Content="+" />
 ```
 
-The corresponding Elmish.WPF binding that dispatches `Msg.Increment` when the command is executed generally looks like this:
+The corresponding Elmish.WPF binding that dispatches `Msg.Increment` when the command is executed generally looks like
+this:
 
 ```f#
 "Increment" |> Binding.cmd (fun m -> Increment)
 ```
 
-The binding accepts a single function `exec: 'model -> 'msg` that accepts the current model and returns the message to be dispatched. Elmish.WPF will convert the message to an `ICommand` that dispatches the message when the command is invoked.
+The binding accepts a single function `exec: 'model -> 'msg` that accepts the current model and returns the message to
+be dispatched. Elmish.WPF will convert the message to an `ICommand` that dispatches the message when the command is
+invoked.
 
-For convenience, if you don’t need the model, there is also an overload that directly accepts the message (instead of a model-accepting function). The above can therefore be written like this:
+For convenience, if you don’t need the model, there is also an overload that directly accepts the message (instead of a
+model-accepting function). The above can therefore be written like this:
 
 ```f#
 "Increment" |> Binding.cmd Increment
@@ -160,11 +195,14 @@ For convenience, if you don’t need the model, there is also an overload that d
 
 #### Conditional commands (where you control `CanExecute`)
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter) and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
+and [F# core](src/Samples/SingleCounter.Core))*
 
-A command may not always be executable. As you might know, WPF’s `ICommand` interface contains a `CanExecute` method that, if `false`, will cause WPF to disable the bound control (e.g. the button).
+A command may not always be executable. As you might know, WPF’s `ICommand` interface contains a `CanExecute` method
+that, if `false`, will cause WPF to disable the bound control (e.g. the button).
 
-In the counter example, we might want to prohibit negative numbers, disabling the `Decrement` button when the `model.Count = 0`. This can be written using `cmdIf`:
+In the counter example, we might want to prohibit negative numbers, disabling the `Decrement` button when the
+`model.Count = 0`. This can be written using `cmdIf`:
 
 ```f#
 "Decrement" |> Binding.cmdIf (
@@ -177,13 +215,17 @@ There are several ways to indicate that a command can‘t execute. The `cmdIf` b
 
 - `exec: 'model -> 'msg option`, where the command is disabled if `exec` returns `None`
 - `exec: 'model -> Result<'msg, _>`, where the command is disabled if `exec` returns `Error`
-- `exec: 'model  -> 'msg * canExec: 'model -> bool` (as the example above shows), where the command is disabled if `canExec` returns `false` (and as with `cmd`, there is also an overload where `exec` is simply the message to dispatch)
+- `exec: 'model  -> 'msg * canExec: 'model -> bool` (as the example above shows), where the command is disabled if
+  `canExec` returns `false` (and as with `cmd`, there is also an overload where `exec` is simply the message to
+  dispatch)
 
 #### Using the `CommandParameter`
 
-*Relevant sample: UiBoundCmdParam - ([XAML views](src/Samples/UiBoundCmdParam) and [F# core](src/Samples/UiBoundCmdParam.Core))*
+*Relevant sample: UiBoundCmdParam - ([XAML views](src/Samples/UiBoundCmdParam)
+and [F# core](src/Samples/UiBoundCmdParam.Core))*
 
-There may be times you need to use the XAML `CommandParameter` property. You then need to use Elmish.WPF’s `cmdParam` binding, which works exactly like `cmd` but where `exec` function accepts the command parameter as its first parameter.
+There may be times you need to use the XAML `CommandParameter` property. You then need to use Elmish.WPF’s `cmdParam`
+binding, which works exactly like `cmd` but where `exec` function accepts the command parameter as its first parameter.
 
 There is also `cmdParamIf` which combines `cmdParam` and `cmdIf`, allowing you to override the command’s `CanExecute`.
 
@@ -191,11 +233,16 @@ There is also `cmdParamIf` which combines `cmdParam` and `cmdIf`, allowing you t
 
 *Relevant sample: SubModel - ([XAML views](src/Samples/SubModel) and [F# core](src/Samples/SubModel.Core))*
 
-Sub-model bindings are used when you want to bind to a complex object that has its own bindings. In MVVM, this happens when one of your view-model properties is another view model with its own properties the UI can bind to.
+Sub-model bindings are used when you want to bind to a complex object that has its own bindings. In MVVM, this happens
+when one of your view-model properties is another view model with its own properties the UI can bind to.
 
-Perhaps the most compelling use-case for sub-models is when binding the `ItemsSource` of a `ListView` or similar. Each item in the collection you bind to is a view-model with its own properties that is used when rendering each item. However, the same principles apply when there’s only a single sub-model. Collections are treated later; this section focuses on a single sub-model.
+Perhaps the most compelling use-case for sub-models is when binding the `ItemsSource` of a `ListView` or similar. Each
+item in the collection you bind to is a view-model with its own properties that is used when rendering each item.
+However, the same principles apply when there’s only a single sub-model. Collections are treated later; this section
+focuses on a single sub-model.
 
-The `subModel` binding has three overloads, increasing in complexity depending on how much you need to customize the sub-bindings.
+The `subModel` binding has three overloads, increasing in complexity depending on how much you need to customize the
+sub-bindings.
 
 #### Level 1: No separate message type or customization of model for sub-bindings
 
@@ -204,7 +251,8 @@ This is sufficient for many purposes. The overload accepts two parameters:
 - `getSubModel: 'model -> 'subModel` to obtain the sub-model
 - `bindings: unit -> Binding<'model * 'subModel, 'msg> list`, the bindings for the sub-model
 
-In other words, inside the sub-bindings, the model parameter (in each binding) is a tuple with the parent model and the sub-model.
+In other words, inside the sub-bindings, the model parameter (in each binding) is a tuple with the parent model and the
+sub-model.
 
 For example, let’s say that we have an app where a counter is a part of the app. We might do this:
 
@@ -218,9 +266,14 @@ For example, let’s say that we have an app where a counter is a part of the ap
 )
 ```
 
-As you can see, inside the sub-bindings (which could be extracted to their own `bindings` function), the model parameter is a tuple containing the parent state as well as the sub-model state. This is a good default because it’s the most general signature, allowing you access to everything from the parent as well as the sub-model you are binding to. (This is particularly important for sub-model sequence bindings, which are described later.)
+As you can see, inside the sub-bindings (which could be extracted to their own `bindings` function), the model parameter
+is a tuple containing the parent state as well as the sub-model state. This is a good default because it’s the most
+general signature, allowing you access to everything from the parent as well as the sub-model you are binding to. (This
+is particularly important for sub-model sequence bindings, which are described later.)
 
-Note also that the sub-bindings still use the top-level message type. There is no separate child message type for the sub-model; `IncrementCounter` is a case of the parent message type. This is also a good default for the reasons described in the earlier “child components and scaling” section.
+Note also that the sub-bindings still use the top-level message type. There is no separate child message type for the
+sub-model; `IncrementCounter` is a case of the parent message type. This is also a good default for the reasons
+described in the earlier “child components and scaling” section.
 
 #### Level 2: Separate message type but no customization of model for sub-bindings
 
@@ -230,7 +283,8 @@ This overload is just like the first one except it has an additional parameter t
 - `toMsg: 'subMsg -> 'msg` to wrap the child message in a parent message
 - `bindings: unit -> Binding<'model * 'subModel, 'subMsg> list`, the bindings for the sub-model
 
-This is useful if you want to use a separate message type in the sub-model bindings. For the `toMsg` parameter, you would typically pass a parent message case that wraps the child message type. For example:
+This is useful if you want to use a separate message type in the sub-model bindings. For the `toMsg` parameter, you
+would typically pass a parent message case that wraps the child message type. For example:
 
 ```f#
 "Counter" |> Binding.subModel(
@@ -243,9 +297,11 @@ This is useful if you want to use a separate message type in the sub-model bindi
 )
 ```
 
-Here,  `Increment` is a case of the child message type, and `CounterMsg` is a parent message case that wraps the counter message type.
+Here,  `Increment` is a case of the child message type, and `CounterMsg` is a parent message case that wraps the counter
+message type.
 
-If you had passed `id` as the `toMsg` parameter, you would have the same behavior as the previous simpler overload with no `toMsg`.
+If you had passed `id` as the `toMsg` parameter, you would have the same behavior as the previous simpler overload with
+no `toMsg`.
 
 #### Level 3: Separate message type and arbitrary customization of model for sub-bindings
 
@@ -256,7 +312,8 @@ This is the most complex one, and is required for the following cases:
 
 The reasons it’s required for these cases are described further below.
 
-It’s also nice to have if you simply want to “clean up” or otherwise customize the model used in the bindings (e.g. if you don’t need the parent model, only the child model).
+It’s also nice to have if you simply want to “clean up” or otherwise customize the model used in the bindings (e.g. if
+you don’t need the parent model, only the child model).
 
 Compared to the “level 2” overload, it has one additional parameter, `toBindingModel`. All the parameters are:
 
@@ -279,11 +336,16 @@ Continuing with the counter example above, it could look like this:
 )
 ```
 
-As you see, we transform the default `(parent, counter)` tuple into just the `counter`, so that the model used in the sub-bindings is only the `'subModel`. Otherwise the example is the same. If you had passed `id` to `toBindingModel` and `toMsg`, you would end up with the same behavior as the simplest variant without `toBindingModel` and `toMsg`.
+As you see, we transform the default `(parent, counter)` tuple into just the `counter`, so that the model used in the
+sub-bindings is only the `'subModel`. Otherwise the example is the same. If you had passed `id` to `toBindingModel` and
+`toMsg`, you would end up with the same behavior as the simplest variant without `toBindingModel` and `toMsg`.
 
-The model transformation allowed by this overload is required for a proper, separate “child component” with its own model/message/bindings, because the child component’s bindings would of course not know anything about any parent model. I.e., as demonstrated above, you need the model to be just `'subModel` and not `'model * 'subModel`
+The model transformation allowed by this overload is required for a proper, separate “child component” with its own
+model/message/bindings, because the child component’s bindings would of course not know anything about any parent model.
+I.e., as demonstrated above, you need the model to be just `'subModel` and not `'model * 'subModel`
 
-The model transformation is also required for recursive bindings. Imagine that a counter can contain another counter (in a `ChildCounter` property). You would define the (recursive) counter bindings as:
+The model transformation is also required for recursive bindings. Imagine that a counter can contain another counter (in
+a `ChildCounter` property). You would define the (recursive) counter bindings as:
 
 ```f#
 let rec counterBindings () : Binding<CounterModel, CounterMsg> list = [
@@ -297,25 +359,33 @@ let rec counterBindings () : Binding<CounterModel, CounterMsg> list = [
   ])
 ```
 
-If you could not transform `(parent, counter)` “back” to `counter`, you could not reuse the same bindings, and hence not create recursive bindings.
+If you could not transform `(parent, counter)` “back” to `counter`, you could not reuse the same bindings, and hence not
+create recursive bindings.
 
 Recursive bindings are demonstrated in the `SubModelSeq` sample.
 
-You now have the power to create child components. Use it with great care; as mentioned in the earlier “child components and scaling” section, such separation will often do more harm than good.
+You now have the power to create child components. Use it with great care; as mentioned in the earlier “child components
+and scaling” section, such separation will often do more harm than good.
 
 #### Optional and “sticky” sub-model bindings
 
 *Relevant sample: SubModelOpt - ([XAML views](src/Samples/SubModelOpt) and [F# core](src/Samples/SubModelOpt.Core))*
 
-You can also use the `subModelOpt` binding. The signature is the same as the variants described above, except that `getSubModel` returns `'subModel option`. The UI will receive `null` when the sub-model is `None`.
+You can also use the `subModelOpt` binding. The signature is the same as the variants described above, except that
+`getSubModel` returns `'subModel option`. The UI will receive `null` when the sub-model is `None`.
 
-Additionally, these bindings have an optional `sticky: bool` parameter. If `true`, Elmish.WPF will “remember” and return the most recent non-null sub-model when the `getSubModel` returns `None`. This can be useful for example when you want to animate away the UI for the sub-component when it’s set to `None`. If you do not use `sticky`, the UI will be cleared at the start of the animation, which may look weird.
+Additionally, these bindings have an optional `sticky: bool` parameter. If `true`, Elmish.WPF will “remember” and return
+the most recent non-null sub-model when the `getSubModel` returns `None`. This can be useful for example when you want
+to animate away the UI for the sub-component when it’s set to `None`. If you do not use `sticky`, the UI will be cleared
+at the start of the animation, which may look weird.
 
 ### Sub-model window bindings
 
 *Relevant sample: NewWindow - ([XAML views](src/Samples/NewWindow) and [F# core](src/Samples/NewWindow.Core))*
 
-The `subModelWin` binding is a variant of `subModelOpt` that allows you to control the opening/closing/hiding of new windows. It has the same overloads as `subModel` and `subModelOpt`, with two key differences: First, the sub-model is wrapped in a custom type called `WindowState` that is defined like this:
+The `subModelWin` binding is a variant of `subModelOpt` that allows you to control the opening/closing/hiding of new
+windows. It has the same overloads as `subModel` and `subModelOpt`, with two key differences: First, the sub-model is
+wrapped in a custom type called `WindowState` that is defined like this:
 
 ```f#
 [<RequireQualifiedAccess>]
@@ -325,7 +395,9 @@ type WindowState<'model> =
   | Visible of 'model
 ```
 
-By wrapping the sub-model in `WindowState.Hidden` or `WindowState.Visible` or returning `WindowState.Closed`, you control the opening, closing, showing, and hiding of a window whose `DataContext` will be automatically set to the wrapped model. Check out the `NewWindow` sample to see it in action.
+By wrapping the sub-model in `WindowState.Hidden` or `WindowState.Visible` or returning `WindowState.Closed`, you
+control the opening, closing, showing, and hiding of a window whose `DataContext` will be automatically set to the
+wrapped model. Check out the `NewWindow` sample to see it in action.
 
 Secondly, all overloads have the following parameter:
 
@@ -333,11 +405,17 @@ Secondly, all overloads have the following parameter:
 getWindow: 'model -> Dispatch<'msg> -> #Window
 ```
 
-This is what’s actually called to create the window. You have access to the current model as well as the `dispatch` in case you need to set up message-dispatching event subscriptions for the window.
+This is what’s actually called to create the window. You have access to the current model as well as the `dispatch` in
+case you need to set up message-dispatching event subscriptions for the window.
 
-Additionally, all `subModelWin` overloads have two optional parameters. The first is `?onCloseRequested: 'msg`. Returning `WindowState.Closed` is the only way to close the window. In order to support closing using external mechanisms (the Close/X button, Alt+F4, or System Menu -> Close), this parameter allows you to specify a message that will be dispatched for these events. You can then react to this message by updating your state so that the binding returns `WindowState.Closed`
+Additionally, all `subModelWin` overloads have two optional parameters. The first is `?onCloseRequested: 'msg`.
+Returning `WindowState.Closed` is the only way to close the window. In order to support closing using external
+mechanisms (the Close/X button, Alt+F4, or System Menu -> Close), this parameter allows you to specify a message that
+will be dispatched for these events. You can then react to this message by updating your state so that the binding
+returns `WindowState.Closed`
 
-The second optional parameter is `?isModal: bool`. This specifies whether the window will be shown modally (using `window.ShowDialog`, blocking the rest of the UI) or non-modally (using `window.Show`).
+The second optional parameter is `?isModal: bool`. This specifies whether the window will be shown modally (using
+`window.ShowDialog`, blocking the rest of the UI) or non-modally (using `window.Show`).
 
 Again, check out the `NewWindow` sample to see `subModelWin` in action.
 
@@ -345,11 +423,19 @@ Again, check out the `NewWindow` sample to see `subModelWin` in action.
 
 *Relevant sample: SubModelSeq - ([XAML views](src/Samples/SubModelSeq) and [F# core](src/Samples/SubModelSeq.Core))*
 
-If you understand `subModel`, then `subModelSeq` isn’t much more complex. It has similar overloads, but instead of returning a single sub-model, you return `#seq<'subModel>`. Furthermore, all overloads have an additional parameter `getId` (which for the “level 1” and “level 2” overloads has signature `'subModel -> 'id`) that gets a unique identifier for each model. This identifier must be unique among all sub-models in the collection, and is used to know which items to add, remove, re-order, and update.
+If you understand `subModel`, then `subModelSeq` isn’t much more complex. It has similar overloads, but instead of
+returning a single sub-model, you return `#seq<'subModel>`. Furthermore, all overloads have an additional parameter
+`getId` (which for the “level 1” and “level 2” overloads has signature `'subModel -> 'id`) that gets a unique identifier
+for each model. This identifier must be unique among all sub-models in the collection, and is used to know which items
+to add, remove, re-order, and update.
 
-The `toMsg` parameter in the “level 2” and “level 3” overloads has the signature `'id * 'subMsg -> 'msg` (compared with just `'subMsg -> 'msg` for `subModel`). For this parameter you would typically use a parent message case that wraps both the child ID and the child message. You need the ID to know which sub-model it came from, and thus which sub-model to pass the message along to.
+The `toMsg` parameter in the “level 2” and “level 3” overloads has the signature `'id * 'subMsg -> 'msg` (compared with
+just `'subMsg -> 'msg` for `subModel`). For this parameter you would typically use a parent message case that wraps both
+the child ID and the child message. You need the ID to know which sub-model it came from, and thus which sub-model to
+pass the message along to.
 
-Finally, in the “level 3” overload that allows you to transform the model used for the bindings, the `getId` parameter has signature `'bindingModel -> 'id` (instead of `'subModel -> 'id` for the two simpler overloads).
+Finally, in the “level 3” overload that allows you to transform the model used for the bindings, the `getId` parameter
+has signature `'bindingModel -> 'id` (instead of `'subModel -> 'id` for the two simpler overloads).
 
 ### Other bindings
 
@@ -357,32 +443,49 @@ There are two special bindings not yet covered.
 
 #### `subModelSelectedItem`
 
-*Relevant sample: SubModelSelectedItem - ([XAML views](src/Samples/SubModelSelectedItem) and [F# core](src/Samples/SubModelSelectedItem.Core))*
+*Relevant sample: SubModelSelectedItem - ([XAML views](src/Samples/SubModelSelectedItem)
+and [F# core](src/Samples/SubModelSelectedItem.Core))*
 
-The section on model normalization made it clear that it’s better to use IDs than complex objects in messages. This means that for bindings to the selected value of a `ListBox` or similar, you’ll likely have better luck using `SelectedValue` and `SelectedValuePath` rather than `SelectedItem`.
+The section on model normalization made it clear that it’s better to use IDs than complex objects in messages. This
+means that for bindings to the selected value of a `ListBox` or similar, you’ll likely have better luck using
+`SelectedValue` and `SelectedValuePath` rather than `SelectedItem`.
 
-Unfortunately some selection-enabled WPF controls only have `SelectedItem` and do not support `SelectedValue` and `SelectedValuePath`. Using `SelectedItem` is particularly cumbersome in Elmish.WPF since the value is not your sub-model, but an instance of the Elmish.WPF view-model. To help with this, Elmish.WPF provides the `subModelSelectedItem` binding.
+Unfortunately some selection-enabled WPF controls only have `SelectedItem` and do not support `SelectedValue` and
+`SelectedValuePath`. Using `SelectedItem` is particularly cumbersome in Elmish.WPF since the value is not your
+sub-model, but an instance of the Elmish.WPF view-model. To help with this, Elmish.WPF provides the
+`subModelSelectedItem` binding.
 
-This binding works together with a `subModelSeq` binding in the same binding list, and allows you to use the `subModelSeq` binding’s IDs in your model while still using `SelectedItem` from XAML. For example, if you use `subModelSeq` to display a list of books identified by a `BookId`, the `subModelSelectedItem` binding allows you to use `SelectedBook: BookId` in your model.
+This binding works together with a `subModelSeq` binding in the same binding list, and allows you to use the
+`subModelSeq` binding’s IDs in your model while still using `SelectedItem` from XAML. For example, if you use
+`subModelSeq` to display a list of books identified by a `BookId`, the `subModelSelectedItem` binding allows you to use
+`SelectedBook: BookId` in your model.
 
 The `subModelSelectedItem` binding has the following parameters:
 
 - `subModelSeqBindingName: string`, where you identify the binding name for the corresponding `subModelSeq` binding
-- `get: 'model -> 'id option`, where you return the ID of the sub-model in the `subModelSeq` binding that should be selected
-- `set: 'id option -> 'msg`, where you return the message to dispatch when the selected item changes (typically this will be a message case wrapping the ID).
+- `get: 'model -> 'id option`, where you return the ID of the sub-model in the `subModelSeq` binding that should be
+  selected
+- `set: 'id option -> 'msg`, where you return the message to dispatch when the selected item changes (typically this
+  will be a message case wrapping the ID).
 
-You bind the `SelectedItem` of a control to the `subModelSelectedItem` binding. Then, Elmish.WPF will take care of the following:
+You bind the `SelectedItem` of a control to the `subModelSelectedItem` binding. Then, Elmish.WPF will take care of the
+following:
 
-- When the UI retrieves the selected item, Elmish.WPF gets the ID using `get`, looks up the correct view-model in the `subModelSeq` binding identified by `subModelSeqBindingName`, and returns that view-model to the UI.
-- When the UI sets the selected item (which it sets to an Elmish.WPF view-model), Elmish.WPF calls `set` with the ID of the sub-model corresponding to that view-model.
+- When the UI retrieves the selected item, Elmish.WPF gets the ID using `get`, looks up the correct view-model in the
+  `subModelSeq` binding identified by `subModelSeqBindingName`, and returns that view-model to the UI.
+- When the UI sets the selected item (which it sets to an Elmish.WPF view-model), Elmish.WPF calls `set` with the ID of
+  the sub-model corresponding to that view-model.
 
 #### `oneWaySeq`
 
 *Relevant sample: OneWaySeq - ([XAML views](src/Samples/OneWaySeq) and [F# core](src/Samples/OneWaySeq.Core))*
 
-In some cases, you might want to have a one-way binding not to a single, simple value, but to a potentially large collection of simple values. If you use `oneWay` for this, the entire list will be replaced and re-rendered each time the model updates.
+In some cases, you might want to have a one-way binding not to a single, simple value, but to a potentially large
+collection of simple values. If you use `oneWay` for this, the entire list will be replaced and re-rendered each time
+the model updates.
 
-In the special case that you want to bind to a collection of **simple** (can be bound to directly) and **distinct** values, you can use `oneWaySeq`. This will ensure that only changed items are replaced/moved.
+In the special case that you want to bind to a collection of **simple** (can be bound to directly) and **distinct**
+values, you can use `oneWaySeq`. This will ensure that only changed items are replaced/moved.
 
 The `oneWaySeq` binding has the following parameters:
 
@@ -390,45 +493,69 @@ The `oneWaySeq` binding has the following parameters:
 - `itemEquals: 'a -> 'a -> bool`, to determine whether an item has changed
 - `getId: 'a -> 'id`, to track which items are added, removed, re-ordered, and changed
 
-If the values are not simple (e.g. not strings or numbers), then you can instead use `subModelSeq` to set up separate bindings for each item. And if the values are not distinct (i.e., can not be uniquely identified in the collection), then Elmish.WPF won’t be able to track which items are moved, and you can’t use this optimization.
+If the values are not simple (e.g. not strings or numbers), then you can instead use `subModelSeq` to set up separate
+bindings for each item. And if the values are not distinct (i.e., can not be uniquely identified in the collection),
+then Elmish.WPF won’t be able to track which items are moved, and you can’t use this optimization.
 
-Note that you can always use `subModelSeq` instead of `oneWaySeq` (the opposite is not true.) The `oneWaySeq` binding is slightly simpler than `subModelSeq` if the elements are simple values that can be bound to directly.
+Note that you can always use `subModelSeq` instead of `oneWaySeq` (the opposite is not true.) The `oneWaySeq` binding is
+slightly simpler than `subModelSeq` if the elements are simple values that can be bound to directly.
 
 ### Lazy bindings
 
-You may find yourself doing potentially expensive work in one-way bindings. To facilitate simple optimization in these cases, Elmish.WPF provides the bindings `oneWayLazy`, `oneWayOptLazy`, and `oneWaySeqLazy`, which add [lazy updating](#lazy-updating) and [caching](#caching). These have two extra parameters: `equals` and `map`.
+You may find yourself doing potentially expensive work in one-way bindings. To facilitate simple optimization in these
+cases, Elmish.WPF provides the bindings `oneWayLazy`, `oneWayOptLazy`, and `oneWaySeqLazy`, which
+add [lazy updating](#lazy-updating) and [caching](#caching). These have two extra parameters: `equals` and `map`.
 
-As with the non-lazy bindings, the initial `get` function is called. For the lazy bindings, this should be cheap; it should basically just return what you need from from the model (e.g. a single item or a tuple or record with multiple items). Lazy updating is evaluated based on the value from `get`. Only if the binding updates is the output of `get` passed to `map`, which may be expensive.
+As with the non-lazy bindings, the initial `get` function is called. For the lazy bindings, this should be cheap; it
+should basically just return what you need from from the model (e.g. a single item or a tuple or record with multiple
+items). Lazy updating is evaluated based on the value from `get`. Only if the binding updates is the output of `get`
+passed to `map`, which may be expensive.
 
 Modifying bindings
 ------------------
 
 ### Lazy updating
 
-For performance optimization, `Binding.addLazy` allows you to add an `equals` parameter to update the viewmodel only when necessary.
+For performance optimization, `Binding.addLazy` allows you to add an `equals` parameter to update the viewmodel only
+when necessary.
 
-`equals` is used to compare the current model with the previous. If equals returns true, the rest of the update process is skipped entirely. If equals returns false, the binding is updated normally.
+`equals` is used to compare the current model with the previous. If equals returns true, the rest of the update process
+is skipped entirely. If equals returns false, the binding is updated normally.
 
 Elmish.WPF provides two helpers you can often use as the `equals` parameter: `refEq` and `elmEq`.
 
-- `refEq` is a good choice if `get` returns a single item (not an inline-created tuple, record, or other wrapper) from your model. It is simply an alias for `LanguagePrimitives.PhysicalEquality` (which is essentially `Object.ReferenceEquals` with better typing). Since the Elmish model is generally immutable, a reference equality check for the output of `get` is a very efficient way to short-circuit the update process. It may cause false negatives if two values are structurally equal but not referentially equal, but this should not be a common case, and structural equality may be prohibitively expensive if comparing e.g. large lists, defeating the purpose.
-- `elmEq` is a good choice if `get` returns multiple items from the model wrapped inline in a tuple or record. It will compare each member of the `get` return value separately (i.e. each record field, or each tuple item). Reference-typed members will be compared using reference equality, and string members and value-typed members will be compared using structural equality.
+- `refEq` is a good choice if `get` returns a single item (not an inline-created tuple, record, or other wrapper) from
+  your model. It is simply an alias for `LanguagePrimitives.PhysicalEquality` (which is essentially
+  `Object.ReferenceEquals` with better typing). Since the Elmish model is generally immutable, a reference equality
+  check for the output of `get` is a very efficient way to short-circuit the update process. It may cause false
+  negatives if two values are structurally equal but not referentially equal, but this should not be a common case, and
+  structural equality may be prohibitively expensive if comparing e.g. large lists, defeating the purpose.
+- `elmEq` is a good choice if `get` returns multiple items from the model wrapped inline in a tuple or record. It will
+  compare each member of the `get` return value separately (i.e. each record field, or each tuple item). Reference-typed
+  members will be compared using reference equality, and string members and value-typed members will be compared using
+  structural equality.
 
-You may pass any function you want for `equals`; it does not have to be one of the above. For example, if you want structural comparison (note the caveat above however), you can pass `(=)`.
+You may pass any function you want for `equals`; it does not have to be one of the above. For example, if you want
+structural comparison (note the caveat above however), you can pass `(=)`.
 
 ### Caching
 
 For performance optimization, `Binding.addCaching` caches viewmodel values.
 
-Cached bindings store values retrieved using `get`, so if the view tries to get a value that has not yet been updated, the binding will return the previous value rather than calling `get` again. Non-cached bindings call `get` every time.
+Cached bindings store values retrieved using `get`, so if the view tries to get a value that has not yet been updated,
+the binding will return the previous value rather than calling `get` again. Non-cached bindings call `get` every time.
 
 ### Mapping bindings
 
-Sometimes duplicate mapping code exists across several bindings. The duplicate mappings could be from the parent model to a common child model or it could be the wrapping of a child message in a parent message, which might depend on the parent model. The duplicate mapping code can be extracted and written once using the mapping functions `mapModel`, `mapMsg`, and `mapMsgWithModel`.
+Sometimes duplicate mapping code exists across several bindings. The duplicate mappings could be from the parent model
+to a common child model or it could be the wrapping of a child message in a parent message, which might depend on the
+parent model. The duplicate mapping code can be extracted and written once using the mapping functions `mapModel`,
+`mapMsg`, and `mapMsgWithModel`.
 
 #### Example use of `mapModel` and `mapMsg`
 
 Here is a simple example that uses these model and message types.
+
 ```F#
 type ChildModel =
   { GrandChild1: GrandChild1
@@ -455,6 +582,7 @@ let parentBindings () : Binding<ParentModel, ParentMsg> list = [
 ```
 
 The functions `mapModel` and `mapMsg` can remove this duplication.
+
 ```F#
 let childBindings () : Binding<ChildModel, ChildMsg> list = [
   "GrandChild1" |> Binding.twoWay((fun child -> child.GrandChild1), SetGrandChild1)
@@ -469,11 +597,16 @@ let parentBindings () : Binding<ParentModel, ParentMsg> list =
 
 #### Benefit for design-time view models
 
-With such duplicate mapping code extracted, it is easier to create a design-time view model for the XAML code containing the bindings to `GrandChild1` and `GrandChild2`.  Specifically, instead of creating the design-time view model from the `parentBindings` bindings, it can now be created from the `childBindings` bindings.  The `SubModelSeq` sample uses this benefit to create a design-time view model for `Counter.xaml`.
+With such duplicate mapping code extracted, it is easier to create a design-time view model for the XAML code containing
+the bindings to `GrandChild1` and `GrandChild2`. Specifically, instead of creating the design-time view model from the
+`parentBindings` bindings, it can now be created from the `childBindings` bindings. The `SubModelSeq` sample uses this
+benefit to create a design-time view model for `Counter.xaml`.
 
 #### Theory behind `mapModel` and `mapMsg`
 
-A binding in Elmish.WPF is represented by an instance of type `Binding<'model, 'msg>`. It is a profunctor, which means that
+A binding in Elmish.WPF is represented by an instance of type `Binding<'model, 'msg>`. It is a profunctor, which means
+that
+
 - it is a contravariant functor in `'model` with `mapModel` as the corresponding mapping function for this functor and
 - it is a covariant functor in `'msg` with `mapMsg` as the corresponding mapping function for this functor.
 
@@ -482,7 +615,10 @@ Statically-Typed View Models
 
 ### Inherit from `ViewModelBase<'model, 'msg>`
 
-If you want full design-time support for your view models, consider defining your view models as a class rather than as a list of bindings. This will give you lots of quality-of-life improvements when working in the XAML, such as type checking for errors, auto-completion, and static types to mention in `DataTemplate.DataType` and similar properties for template matching.
+If you want full design-time support for your view models, consider defining your view models as a class rather than as
+a list of bindings. This will give you lots of quality-of-life improvements when working in the XAML, such as type
+checking for errors, auto-completion, and static types to mention in `DataTemplate.DataType` and similar properties for
+template matching.
 
 ```F#
 type [<AllowNullLiteral>] CounterViewModel (args) =
@@ -501,7 +637,9 @@ type [<AllowNullLiteral>] CounterViewModel (args) =
 
 ### Typed Bindings
 
-When creating a list of bindings, the output type of each property must be boxed (to `obj`) in order to insert them into the same list. With individually declared bindings on a class member, this restriction is lifted. Therefore we have a set of bindings (denoted with the `T` suffix on the function or the containing module) that do not box the output type.
+When creating a list of bindings, the output type of each property must be boxed (to `obj`) in order to insert them into
+the same list. With individually declared bindings on a class member, this restriction is lifted. Therefore we have a
+set of bindings (denoted with the `T` suffix on the function or the containing module) that do not box the output type.
 
 #### Typed One-way Bindings
 
@@ -513,7 +651,9 @@ These bindings work very similarly to their non-`T` counterparts, except they ma
 
 #### Typed SubModel Bindings
 
-You can create strongly-typed SubModels in much the same way as you can create normal SubModels - simply replace the `Binding<'model, 'msg> list` with the constructor for a type that implements `ViewModelBase<'model, 'msg>(args)` and takes in that `args` parameter, and use one of the following functions to create the binding:
+You can create strongly-typed SubModels in much the same way as you can create normal SubModels - simply replace the
+`Binding<'model, 'msg> list` with the constructor for a type that implements `ViewModelBase<'model, 'msg>(args)` and
+takes in that `args` parameter, and use one of the following functions to create the binding:
 
 - `Binding.SubModelT.req`
 - `Binding.SubModelSeqUnkeyedT.id`
@@ -522,7 +662,8 @@ You can create strongly-typed SubModels in much the same way as you can create n
 
 #### Typed WpfProgram Bindings
 
-Something very similar to the above transformation can also be accomplished at the top level by using one of the following `T` functions to create the program:
+Something very similar to the above transformation can also be accomplished at the top level by using one of the
+following `T` functions to create the program:
 
 - `WpfProgram.mkSimpleT`
 - `WpfProgram.mkProgramT`
@@ -530,6 +671,10 @@ Something very similar to the above transformation can also be accomplished at t
 
 #### Mixing and matching bindings
 
-When migrating to a statically-typed view model, you can use all of the existing bindings as-is, with the exception of two-way bindings (must be split up into `OneWay` and `OneWayToSource` bindings). These will type as `obj` until you upgrade them to the equivalent `T` bindings.
+When migrating to a statically-typed view model, you can use all of the existing bindings as-is, with the exception of
+two-way bindings (must be split up into `OneWay` and `OneWayToSource` bindings). These will type as `obj` until you
+upgrade them to the equivalent `T` bindings.
 
-When intruducing a statically-typed view model as a submodel to a binding defined by the boxed binding list, simply use one of the new [Typed SubModel Bindings](#typed-submodel-bindings) and then call `Binding.boxT` to map the output type. (e.g., `"TypedSubModel" |> Binding.SubModelT.req TypedSubModel >> Binding.boxT`).
+When intruducing a statically-typed view model as a submodel to a binding defined by the boxed binding list, simply use
+one of the new [Typed SubModel Bindings](#typed-submodel-bindings) and then call `Binding.boxT` to map the output
+type. (e.g., `"TypedSubModel" |> Binding.SubModelT.req TypedSubModel >> Binding.boxT`).
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index aa03d24d..3338ef30 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,86 +1,124 @@
 #### 4.0.0-beta-56
+
 * Add NotifyPropertyChanged for the HasErrors property.
 
 #### 4.0.0-beta-55
+
 * Add TwoWayT bindings for workflows that reuse bindings.
 * Add OneWayToSeqT bindings.
 * Add vopt and opt bindings for OneWayT, OneWayToSourceT, and TwoWayT bindings.
 * Add .NET 8 target and remove .NET Core 3.1 support
 
 #### 4.0.0-beta-54
+
 * Added the Readme file to the generated nuspec file so that it shows up on nuget.org.
 * Added some debug logs to the performance logger at the top level.
 * Brought up new functions to parity with the performance logger.
 
 #### 4.0.0-beta-53
-* Corrected the threaded dispatch case when an immediate UI update was needed. Done by adding an unschedule `Dispatcher` job at the same priority as the other scheduler jobs, which will force it to run in the correct order before any of the execute update jobs arrive to the queue, thus preventing any of the old scheduler jobs from getting executed _after_ this immediate UI update.
-* Added debug logging with counters to represent the increasing sequence of `setUiState` being called and scheduled on other threads (to ensure proper ordering).
+
+* Corrected the threaded dispatch case when an immediate UI update was needed. Done by adding an unschedule `Dispatcher`
+  job at the same priority as the other scheduler jobs, which will force it to run in the correct order before any of
+  the execute update jobs arrive to the queue, thus preventing any of the old scheduler jobs from getting executed
+  _after_ this immediate UI update.
+* Added debug logging with counters to represent the increasing sequence of `setUiState` being called and scheduled on
+  other threads (to ensure proper ordering).
 
 #### 4.0.0-beta-52
+
 * Fixed a bug in the threaded dispatch case that could result in an out-of-date model being updated.
 * Skip intermediate updates to view model when they queue up in the threaded case.
 * Reverted the following change from beta-51 because Set caching is problematic:
-  * Notify Property Changed directly on Set rather than waiting around for the next update. Set value is now cached until the next time update/dispatch is called.
+    * Notify Property Changed directly on Set rather than waiting around for the next update. Set value is now cached
+      until the next time update/dispatch is called.
 
 #### 4.0.0-beta-51
+
 * Allow skipping intermediate updates when they pile up on UI Thread.
-* Notify Property Changed directly on Set rather than waiting around for the next update. Set value is now cached until the next time update/dispatch is called.
+* Notify Property Changed directly on Set rather than waiting around for the next update. Set value is now cached until
+  the next time update/dispatch is called.
 
 #### 4.0.0-beta-50
+
 * Upgraded to Elmish v4
-  * **BREAKING:** Changed syntax of `WpfProgram.withSubscription` to now take named list of `Subscribe<'msg> = Dispatch<'msg> -> IDisposable` (note the `IDisposable` return). This function now gets called every time `'model` updates (previously it was only called on startup). This allows starting and stopping of subscriptions from this function by the given string list identifier.
-  * **BREAKING:** Changed `Sub<'msg>` to `Effect<'msg>` everywhere (`Effect<'msg> = Dispatch<'msg> -> unit`, see difference with `Subscribe<'msg>` above). Also renames helper functions. This does _not_ break `Cmd<'msg>`s that didn't name the `Sub<'msg>` type (or helpers).
-  * Added `WpfProgram.withTermination` to allow conditional exit of the elmish loop on a specific `'msg`, as well as specify a side effect on exit.
+    * **BREAKING:** Changed syntax of `WpfProgram.withSubscription` to now take named list of
+      `Subscribe<'msg> = Dispatch<'msg> -> IDisposable` (note the `IDisposable` return). This function now gets called
+      every time `'model` updates (previously it was only called on startup). This allows starting and stopping of
+      subscriptions from this function by the given string list identifier.
+    * **BREAKING:** Changed `Sub<'msg>` to `Effect<'msg>` everywhere (`Effect<'msg> = Dispatch<'msg> -> unit`, see
+      difference with `Subscribe<'msg>` above). Also renames helper functions. This does _not_ break `Cmd<'msg>`s that
+      didn't name the `Sub<'msg>` type (or helpers).
+    * Added `WpfProgram.withTermination` to allow conditional exit of the elmish loop on a specific `'msg`, as well as
+      specify a side effect on exit.
 * Added more documentation throughout the helpers.
 * Updated some of the sample projects for clarity.
 
 #### 4.0.0-beta-49
-* Added `Binding.SubModelT.seq` that allows a `seq` of static sub models that are all properly updated when there is a dispatch.
+
+* Added `Binding.SubModelT.seq` that allows a `seq` of static sub models that are all properly updated when there is a
+  dispatch.
 
 #### 4.0.0-beta-48
+
 * Added ability to run elmish update loop on a background thread rather than only on the main UI thread.
 * Added a `Threading` sample project demonstrating above feature.
 
 #### 4.0.0-beta-47
-* Improved `ViewModelBase` to infer view model property types from the Model getter rather than needing to be explicitly specified.
-* Added `'t` type parameter to `Binding<'model, 'msg, 't>` everywhere to support above feature. `Binding<'model, 'msg>` is defined as `Binding<'model, 'msg, obj>` for full backwards compatibility.
+
+* Improved `ViewModelBase` to infer view model property types from the Model getter rather than needing to be explicitly
+  specified.
+* Added `'t` type parameter to `Binding<'model, 'msg, 't>` everywhere to support above feature. `Binding<'model, 'msg>`
+  is defined as `Binding<'model, 'msg, obj>` for full backwards compatibility.
 * Added `Binding.boxT` and `Binding.unboxT` to support moving back and forth between the two.
-* Added `Binding.OneWayT`, `Binding.OneWayToSourceT` and `Binding.CmdT` modules for creating strongly typed primitives for the top feature.
+* Added `Binding.OneWayT`, `Binding.OneWayToSourceT` and `Binding.CmdT` modules for creating strongly typed primitives
+  for the top feature.
 * Added types internally to carry everything through (mostly provably) correctly.
-* Added `'viewModel` type parameter to `WpfProgram<'model, 'msg, 'viewModel>` to support using a static view model at the top level. `WpfProgram<'model, 'msg>` is defined as `WpfProgram<'model, 'msg, obj>` for full backwards compatibility. Also made `WpfProgram` core type more generic, replacing the list of bindings with equivalent but more flexible `CreateViewModel` and `UpdateViewModel` functions.
-* Added `WpfProgram.mkSimpleT`, `WpfProgram.mkProgramT` and `WpfProgram.mkProgramWithCmdMsgT` for making programs that use static view models as the top-level data context.
+* Added `'viewModel` type parameter to `WpfProgram<'model, 'msg, 'viewModel>` to support using a static view model at
+  the top level. `WpfProgram<'model, 'msg>` is defined as `WpfProgram<'model, 'msg, obj>` for full backwards
+  compatibility. Also made `WpfProgram` core type more generic, replacing the list of bindings with equivalent but more
+  flexible `CreateViewModel` and `UpdateViewModel` functions.
+* Added `WpfProgram.mkSimpleT`, `WpfProgram.mkProgramT` and `WpfProgram.mkProgramWithCmdMsgT` for making programs that
+  use static view models as the top-level data context.
 * Modified `SubModelStatic` sample project to use new static view model features.
 
 #### 4.0.0-beta-46
-* Added `ViewModelBase` which allows view models to be defined as static types with real properties rather than unnamed dynamic types with stringly named properties.
-* Added `Binding.SubModelT`, `Binding.SubModelSeqUnkeyedT`, `Binding.SubModelSeqKeyedT` and `Binding.SubModelWinT` modules for creating these static types as sub models.
+
+* Added `ViewModelBase` which allows view models to be defined as static types with real properties rather than unnamed
+  dynamic types with stringly named properties.
+* Added `Binding.SubModelT`, `Binding.SubModelSeqUnkeyedT`, `Binding.SubModelSeqKeyedT` and `Binding.SubModelWinT`
+  modules for creating these static types as sub models.
 * Replaced internal usage of refs in dynamic view model with get/set functions to allow for matting of the type.
 * Added some internal types to support `ViewModelBase`.
 * Improved documentation.
 * Added a `SubModelStatic` sample project using above feature.
 
 #### 4.0.0-beta-45
+
 * Improved performance of Lazy effect by reducing calls to later model mappings
 * Removed `SourceOrTarget` and `DuplicateIdException` from public API (added in `4.0.0-beta-42`)
 * Improved caching effect to not invalidating the cache too early (an issue introduced in version `3.5.3 `via PR 181)
 * Renamed `Binding.SetMsgWithModel` to `Binding.setMsgWithModel` (breaking public API added in `4.0.0-beta-42`)
-* Fixed bug with `mapMsgWithModel` and `setMsgWithModel` where the original model was sometimes given (an issue introduced in `4.0.0-beta-42`)
+* Fixed bug with `mapMsgWithModel` and `setMsgWithModel` where the original model was sometimes given (an issue
+  introduced in `4.0.0-beta-42`)
 * Replaced framework targets `net461` and `net5.0-windows` with `net480` and `net6.0-windows` respectively.
 * Updated minimum `FSharp.Core` version to `6.0.5`.
 * Updated minimum `Microsoft.Extensions.Logging.Abstractions` version to `6.0.1`.
 * Fixed broken log statement called when a `SubModelSelectedItem` binding can't find an item in a `SubModelSeq` binding.
 
 #### 4.0.0-beta-44
+
 * Fixed sticky effect that was broken in `4.0.0-beta-42`
 
 #### 4.0.0-beta-43
+
 * Added `WpfProgram.withElmishErrorHandler`
 * Improved debugging experience by overriding `GetDynamicMemberNames`
 * Relaxed version constrains on `FSharp.Core` and `Microsoft.Extensions.Logging.Abstractions`
 
 #### 4.0.0-beta-42
+
 * Improved API of `WindowState<_>`
-* Dropped support for .NET Core 3.0.  Still have support for .NET Core 3.1.
+* Dropped support for .NET Core 3.0. Still have support for .NET Core 3.1.
 * Added `setMsg` in the `Binding` module
 * Added `setMsgWithModel` in the `Binding` module
 * Removed `id` in the `Binding` module (that was added in 4.0.0-beta-3)
@@ -92,7 +130,8 @@
 * Added to the `SubModelSeq` method API an overload that only takes bindings
 * Added support for a `SubModelSeq` variant that does involve IDs
 * `SubModelSeq` variant that involves IDs will now merge elements without considering IDs if duplicate IDs are detected
-* Fixed bug (present in 3.5.8) where `ArgumentNullException` is thrown from `INotifyDataErrorInfo.GetErrors` when given `null`
+* Fixed bug (present in 3.5.8) where `ArgumentNullException` is thrown from `INotifyDataErrorInfo.GetErrors` when given
+  `null`
 * Now logging and returning `false` to WPF if selection in a `SubModelSelectedItem` binding fails
 * Added prebuilt bindings for `Selector.SelectedIndex`
 * Added `Binding.TwoWay.id` to API
@@ -100,28 +139,38 @@
 * Added one-way-to-source binding
 * Added function-based API for for one-way bindings
 * Added composable monomorphic dispatch wrapping
-* Switched the order of inputs in the function given to `Binding.mapMsgWithModel`.  This is breaking for public API introduced in 4.0.0-beta-1.
-* Added `alterMsgStream` to API.  This feature is a replacement for what was previously called `wrapDispatch`.
+* Switched the order of inputs in the function given to `Binding.mapMsgWithModel`. This is breaking for public API
+  introduced in 4.0.0-beta-1.
+* Added `alterMsgStream` to API. This feature is a replacement for what was previously called `wrapDispatch`.
 
 #### 4.0.0-beta-41
-* Fixed "backwards typing" (#373) and other bugs (like #371) introduced in 4.0.0-beta-40 with more careful use of the Dispatcher (#374)
+
+* Fixed "backwards typing" (#373) and other bugs (like #371) introduced in 4.0.0-beta-40 with more careful use of the
+  Dispatcher (#374)
 
 #### 4.0.0-beta-40
+
 * Removed recently added trace logging of INotifyDataErrorInfo.HasErrors (#354)
 * Fixed typos in documentation and logging (#357)
 * Fixed race condition with Dispatcher (#359)
 * Removed overload of `ViewModel<_,_>.ToString` because of slow performance (#370)
 
 #### 4.0.0-beta-3
+
 * Added support for composable binding stickiness `sticky`
 * Added support for composable binding validation `withValidation`
 * Added support for composable binding laziness via `lazy'`
 * Improved logging
 * Changed CurrentModel and UpdateModel on ViewModel<_,_> from public to internal
-* `runWindow` now shows the given window after settings its `DataContext`.  This removes the need to have `Visibility` values default to `Collapsed`.
-* Changed minimum Elmish version from 3.0.3 to 3.1.0 (which is currently the latest).  Commands created with `OfAsync` are now executed on a threadpool thread.  For example, it is now easier to show file dialogs without blocking the Elmish dispatch loop.  See [this diff](https://github.com/elmish/Elmish.WPF/commit/d1ec823ccd7f377a860b76bc2358706dc6a70c84).
+* `runWindow` now shows the given window after settings its `DataContext`. This removes the need to have `Visibility`
+  values default to `Collapsed`.
+* Changed minimum Elmish version from 3.0.3 to 3.1.0 (which is currently the latest). Commands created with `OfAsync`
+  are now executed on a threadpool thread. For example, it is now easier to show file dialogs without blocking the
+  Elmish dispatch loop.
+  See [this diff](https://github.com/elmish/Elmish.WPF/commit/d1ec823ccd7f377a860b76bc2358706dc6a70c84).
 
 #### 4.0.0-beta-2
+
 * Added logging when INotifyDataErrorInfo.HasErrors is called
 * Fixed bug in INotifyDataErrorInfo.HasErrors where `true` always returned after `true` first correctly returned
 
@@ -129,34 +178,46 @@
 
 * **Breaking:** Removed the obsolete binding functions in the `BindingFn` module
 * **Breaking:** Removed the obsolete function `Elmish.WPF.Cmd.showWindow`
-* **Breaking:** Removed all occurrences of the argument `wrapDispatch` from the methods used to create a binding. There is currently no migration path. Please create an issue if this is a negative impact for you.
+* **Breaking:** Removed all occurrences of the argument `wrapDispatch` from the methods used to create a binding. There
+  is currently no migration path. Please create an issue if this is a negative impact for you.
 * **Breaking:** App initialization is now done using the `WpfProgram` module instead of the `Program` module
-* **Breaking:** Removed `ElmConfig`. For controlling logging, see below. For specifying a binding performance log threshold (corresponding to the old `ElmConfig.MeasureLimitMs` field), use `WpfProgram.withBindingPerformanceLogThreshold`
-* **Breaking:** The method `Binding.oneWaySeq` is implemented by calling the method `Binding.oneWaySeqLazy` with `equals` = `refEq` and `map` = `id`. This is a breaking change when using a mutable data structure for the sequence. Compensate by directly calling `Binding.oneWaySeqLazy` with `equals` = `fun _ _ = false`.
-* **Breaking:** Some calls to `Binding` methods now include an equality constraint. This only is only breaking if the corresponding type included the `NoEquality` attribute.
+* **Breaking:** Removed `ElmConfig`. For controlling logging, see below. For specifying a binding performance log
+  threshold (corresponding to the old `ElmConfig.MeasureLimitMs` field), use
+  `WpfProgram.withBindingPerformanceLogThreshold`
+* **Breaking:** The method `Binding.oneWaySeq` is implemented by calling the method `Binding.oneWaySeqLazy` with
+  `equals` = `refEq` and `map` = `id`. This is a breaking change when using a mutable data structure for the sequence.
+  Compensate by directly calling `Binding.oneWaySeqLazy` with `equals` = `fun _ _ = false`.
+* **Breaking:** Some calls to `Binding` methods now include an equality constraint. This only is only breaking if the
+  corresponding type included the `NoEquality` attribute.
 * Added binding mapping functions
-  * Added `mapModel`, `mapMsg`, and `mapMsgWithModel` in both the `Binding` and `Bindings` modules
-  * These functions enable common model and message mapping logic to be extracted
-  * See the `SubModelSeq` sample for an excellent use of `mapModel` and `mapMsg`
+    * Added `mapModel`, `mapMsg`, and `mapMsgWithModel` in both the `Binding` and `Bindings` modules
+    * These functions enable common model and message mapping logic to be extracted
+    * See the `SubModelSeq` sample for an excellent use of `mapModel` and `mapMsg`
 * Improved logging:
-  * Now uses `Microsoft.Extensions.Logging` for wide compatibility and easy integration into common log frameworks
-  * Use `WpfProgram.WithLogger` to pass an `ILoggerFactory` for your chosen log framework
-  * Can control specific log categories
-  * See the samples for a demonstration using Serilog
+    * Now uses `Microsoft.Extensions.Logging` for wide compatibility and easy integration into common log frameworks
+    * Use `WpfProgram.WithLogger` to pass an `ILoggerFactory` for your chosen log framework
+    * Can control specific log categories
+    * See the samples for a demonstration using Serilog
 
 #### 3.5.8
+
 * Removed overload of `ViewModel<_,_>.ToString` because of slow performance (#370)
 
 #### 3.5.7
+
 * Excluded 4.* prereleases from possibilities for version of Elmish dependency
 * Added support for multiple validation errors
 * Added target `net5.0-windows`
-* `ViewModel<'model, 'msg>` now overrides `object.ToString()` and returns a string representation of the current `'model` instance.  This is only intended for debugging.  No guarantees are given about the exact structure of the returned string.
+* `ViewModel<'model, 'msg>` now overrides `object.ToString()` and returns a string representation of the current
+  `'model` instance. This is only intended for debugging. No guarantees are given about the exact structure of the
+  returned string.
 * Fixed incorrect spelling of a word in a log message
 
 #### 3.5.6
 
-* The amount of time used to update `OneWaySeq` and `SubModelSeq` bindings has been significantly decreased.  This includes all cases of a `SubModelSeq` binding and all cases of a `OneWaySeq` binding for which `equals` returns `false`.
+* The amount of time used to update `OneWaySeq` and `SubModelSeq` bindings has been significantly decreased. This
+  includes all cases of a `SubModelSeq` binding and all cases of a `OneWaySeq` binding for which `equals` returns
+  `false`.
 
 #### 3.5.5
 
@@ -192,7 +253,8 @@
 
 #### 3.3.0
 
-* Added optional dispatch wrapper to two-way bindings and command bindings, which allows dispatches to be throttled/debounced etc.
+* Added optional dispatch wrapper to two-way bindings and command bindings, which allows dispatches to be
+  throttled/debounced etc.
 
 #### 3.2.1
 
@@ -200,33 +262,50 @@
 
 #### 3.2.0
 
-* Added proper dialog/window support using `Binding.subModelWin`. See [the readme](https://github.com/elmish/Elmish.WPF/tree/feature-windows-binding#can-i-open-new-windowsdialogs) for more and the [NewWindow sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) for an example.
+* Added proper dialog/window support using `Binding.subModelWin`.
+  See [the readme](https://github.com/elmish/Elmish.WPF/tree/feature-windows-binding#can-i-open-new-windowsdialogs) for
+  more and the [NewWindow sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) for an example.
 * Deprecated `Cmd.showWindow` (use `Binding.subModelWin` instead)
 
 #### 3.1.0
 
-* Added `Program.withDebugTrace` which is similar to `withConsoleTrace` but writes using `System.Diagnostics.Debug.WriteLine` (e.g. to the VS output window)
+* Added `Program.withDebugTrace` which is similar to `withConsoleTrace` but writes using
+  `System.Diagnostics.Debug.WriteLine` (e.g. to the VS output window)
 
 #### 3.0.0
 
 * The most massive (and hopefully useful) update yet!
-* Breaking: Overload-based syntax for `Binding`. The old `Binding` module is deprecated and renamed to `BindingFn`.  The new `Binding` is a static class with static methods, providing many overloads for flexibility. To migrate, replace all occurrences of `Binding.` with `BindingFn.` and follow the deprecation warnings.
-* Breaking: The `Elmish.WPF.Internal` namespace has been removed and everything in it that should actually be internal has been marked `internal`. This includes `ViewModel`.
-* Breaking: `Elmish.WPF.Internal.BindingSpec<_,_>` has been moved/renamed to `Elmish.WPF.Binding<_,_>`. It should thus be more pleasant to use in type annotations.
-* Breaking: `Elmish.WPF.Utilities.ViewModel.designInstance` has been moved to `Elmish.WPF.ViewModel`. Furthermore, it returns `obj` since `ViewModel` is internal.
-* Breaking: Removed `twoWayIfValid`. It hasn’t worked for a while due to core Elmish internals, and was of suspect utility anyway.
+* Breaking: Overload-based syntax for `Binding`. The old `Binding` module is deprecated and renamed to `BindingFn`. The
+  new `Binding` is a static class with static methods, providing many overloads for flexibility. To migrate, replace all
+  occurrences of `Binding.` with `BindingFn.` and follow the deprecation warnings.
+* Breaking: The `Elmish.WPF.Internal` namespace has been removed and everything in it that should actually be internal
+  has been marked `internal`. This includes `ViewModel`.
+* Breaking: `Elmish.WPF.Internal.BindingSpec<_,_>` has been moved/renamed to `Elmish.WPF.Binding<_,_>`. It should thus
+  be more pleasant to use in type annotations.
+* Breaking: `Elmish.WPF.Utilities.ViewModel.designInstance` has been moved to `Elmish.WPF.ViewModel`. Furthermore, it
+  returns `obj` since `ViewModel` is internal.
+* Breaking: Removed `twoWayIfValid`. It hasn’t worked for a while due to core Elmish internals, and was of suspect
+  utility anyway.
 * New: Many more helpful `Binding` signatures available due to the new overload-based syntax.
-* New: More general `Binding.subModel` and `Binding.subModelSeq` overloads that allow a more idiomatic Elm architecture even with static views. For background information, see [#86](https://github.com/elmish/Elmish.WPF/issues/86) (the issue is otherwise outdated).
-* New: Sticky `subModelOpt` bindings that returns the last non-null model when model is `None` (useful when animating out stuff)
-* New: `elmEq` and `refEq` as useful equality defaults for lazy bindings. `elmEq` efficiently uses reflection to do a comparison for each member that is referential for reference types except strings, and structural for strings and value types.
+* New: More general `Binding.subModel` and `Binding.subModelSeq` overloads that allow a more idiomatic Elm architecture
+  even with static views. For background information, see [#86](https://github.com/elmish/Elmish.WPF/issues/86) (the
+  issue is otherwise outdated).
+* New: Sticky `subModelOpt` bindings that returns the last non-null model when model is `None` (useful when animating
+  out stuff)
+* New: `elmEq` and `refEq` as useful equality defaults for lazy bindings. `elmEq` efficiently uses reflection to do a
+  comparison for each member that is referential for reference types except strings, and structural for strings and
+  value types.
 * New: `Program.mkSimpleWpf` and `Program.mkProgramWpf` with more WPF-friendly signatures.
-* New: `Program.mkProgramWpfWithCmdMsg` for easily following the `CmdMsg` pattern to allow testable commands. See the FAQ in the readme for details.
+* New: `Program.mkProgramWpfWithCmdMsg` for easily following the `CmdMsg` pattern to allow testable commands. See the
+  FAQ in the readme for details.
 * New: `Cmd.showWindow` helper to open a new window.
 * New: Slow calls can be logged (configurable threshold).
-* New: Made available `Program.startElmishLoop` which is a low-level function that starts an Elmish loop given an Elmish `Program` and a WPF `FrameworkElement`. You probably won’t need it.
+* New: Made available `Program.startElmishLoop` which is a low-level function that starts an Elmish loop given an Elmish
+  `Program` and a WPF `FrameworkElement`. You probably won’t need it.
 * Improvement: Logs now indicate the binding path.
 * Improvement: Possibly better performance due to internals now using `ValueOption` instead of `Option`.
-* Improvement: Finally added (lots of) unit tests, so confidence of correct functionality is higher. (No critical bugs were found when creating the tests.)
+* Improvement: Finally added (lots of) unit tests, so confidence of correct functionality is higher. (No critical bugs
+  were found when creating the tests.)
 
 #### 2.0.0
 
@@ -261,11 +340,14 @@
 
 #### 2.0.0-beta-5
 
-* Fix `subModelSeq` items  being unselected during updates
+* Fix `subModelSeq` items being unselected during updates
 
 #### 2.0.0-beta-4
 
-* Breaking: Change order of `oneWayLazyWith` arguments to and rename it to `oneWayLazy`, removing the existing `oneWayLazy` function. The rationale is explained in [#60](https://github.com/elmish/Elmish.WPF/issues/60) . To migrate from 2.0.0-beta-3 to 2.0.0-beta-4: Add `(=)` as the `equals` parameter to `oneWayLazy` usages, and rename `oneWayLazyWith` usages to `oneWayLazy`.
+* Breaking: Change order of `oneWayLazyWith` arguments to and rename it to `oneWayLazy`, removing the existing
+  `oneWayLazy` function. The rationale is explained in [#60](https://github.com/elmish/Elmish.WPF/issues/60) . To
+  migrate from 2.0.0-beta-3 to 2.0.0-beta-4: Add `(=)` as the `equals` parameter to `oneWayLazy` usages, and rename
+  `oneWayLazyWith` usages to `oneWayLazy`.
 * Add `Binding.oneWaySeqLazy`
 
 #### 2.0.0-beta-3
@@ -279,14 +361,17 @@
 #### 2.0.0-beta-1
 
 * Complete rewrite, several breaking changes and new features
-* `twoWayValidation` is called `twoWayIfValid` (because that’s what it is, and it clearly separates it from the new `twoWayValidate`)
+* `twoWayValidation` is called `twoWayIfValid` (because that’s what it is, and it clearly separates it from the new
+  `twoWayValidate`)
 * `oneWayMap` is called `oneWayLazy` (its implementation has changed, and the use case has expanded, but is similar)
 * `cmd` and `cmdIf` have been renamed `paramCmd` and `paramCmdIf`, because the old names have new signatures/use-cases
-* `model` has been renamed `subModel` because it’s more clear, and consistent with the new `subModelOpt` and `subModelSeq`
+* `model` has been renamed `subModel` because it’s more clear, and consistent with the new `subModelOpt` and
+  `subModelSeq`
 * `Program.runDebugWindow` has been removed in favour of `Program.runWindowWithConfig`
 * Bundled Elmish has been removed, and Elmish 2.0 is used as an external dependency
 * Any `Application ` instance instantiated before calling `Program.run...` will now be used
-* Several new functions in the `Binding` module; dot into it in your IDE or see the repository for samples or source code
+* Several new functions in the `Binding` module; dot into it in your IDE or see the repository for samples or source
+  code
 
 #### 1.0.0-beta-7
 
diff --git a/TUTORIAL.md b/TUTORIAL.md
index 0d531b0e..f7e3a8d9 100644
--- a/TUTORIAL.md
+++ b/TUTORIAL.md
@@ -3,44 +3,61 @@ Elmish.WPF Tutorial
 
 <img src="https://raw.githubusercontent.com/elmish/Elmish.WPF/master/logo/elmish-wpf-logo-ghreadme.png" width="300" align="right" />
 
-The aim of this tutorial is to explain how to use Elmish.WPF, building in complexity from start (what is MVU?) to end (using complex bindings and applying optimizations).
+The aim of this tutorial is to explain how to use Elmish.WPF, building in complexity from start (what is MVU?) to end (
+using complex bindings and applying optimizations).
 
-This tutorial is not directly related to the many samples in the Elmish.WPF repository, but complements them well. The samples are complete, fully functional apps demonstrating selected aspects of Elmish.WPF. The samples *show*; the tutorial *explains*.
+This tutorial is not directly related to the many samples in the Elmish.WPF repository, but complements them well. The
+samples are complete, fully functional apps demonstrating selected aspects of Elmish.WPF. The samples *show*; the
+tutorial *explains*.
 
-This tutorial assumes working F# knowledge. If you’re new to F#, Scott Wlaschin’s blog [F# for fun and profit](https://fsharpforfunandprofit.com/) is a great place to start (and continue) learning the ins and outs of F# and functional programming. His book [Domain Modeling Made Functional](https://pragprog.com/book/swdddf/domain-modeling-made-functional) is also a great resource for learning F# (and in particular how it can be used for domain modeling). You can find many more excellent resources at [fsharp.org](https://fsharp.org).
+This tutorial assumes working F# knowledge. If you’re new to F#, Scott Wlaschin’s
+blog [F# for fun and profit](https://fsharpforfunandprofit.com/) is a great place to start (and continue) learning the
+ins and outs of F# and functional programming. His
+book [Domain Modeling Made Functional](https://pragprog.com/book/swdddf/domain-modeling-made-functional) is also a great
+resource for learning F# (and in particular how it can be used for domain modeling). You can find many more excellent
+resources at [fsharp.org](https://fsharp.org).
 
 This tutorial also assumes some knowledge of WPF and MVVM.
 
-Suggestions for improvements are welcome. For large changes, please open an issue. For small changes (e.g. typos), simply submit a PR.
+Suggestions for improvements are welcome. For large changes, please open an issue. For small changes (e.g. typos),
+simply submit a PR.
 
 Table of contents
 -----------------
 
 * [The MVU (Elm/Elmish) architecture](#the-mvu-elmelmish-architecture)
-  + [Model](#model)
-  + [Message](#message)
-  + [Update](#update)
-  + [View in standard MVU (not Elmish.WPF)](#view-in-standard-mvu-not-elmishwpf)
-  + [View in Elmish.WPF](#view-in-elmishwpf)
-  + [Commands (and subscriptions)](#commands-and-subscriptions)
+    + [Model](#model)
+    + [Message](#message)
+    + [Update](#update)
+    + [View in standard MVU (not Elmish.WPF)](#view-in-standard-mvu-not-elmishwpf)
+    + [View in Elmish.WPF](#view-in-elmishwpf)
+    + [Commands (and subscriptions)](#commands-and-subscriptions)
 * [Some MVU tips for beginners](#some-mvu-tips-for-beginners)
-  + [Normalize your model; use IDs instead of duplicating entities](#normalize-your-model-use-ids-instead-of-duplicating-entities)
-  + [Use commands for anything impure](#use-commands-for-anything-impure)
-  + [Child components and scaling](#child-components-and-scaling)
-  + [Optimize easily with memoization](#optimize-easily-with-memoization)
+    + [Normalize your model; use IDs instead of duplicating entities](#normalize-your-model-use-ids-instead-of-duplicating-entities)
+    + [Use commands for anything impure](#use-commands-for-anything-impure)
+    + [Child components and scaling](#child-components-and-scaling)
+    + [Optimize easily with memoization](#optimize-easily-with-memoization)
 * [Getting started with Elmish.WPF](#getting-started-with-elmishwpf)
 * [Additional resources](#additional-resources)
 
 The MVU (Elm/Elmish) architecture
 ---------------------------------
 
-MVU stands for Model-View-Update. It is a purely functional front-end architecture commonly used in Elm, a strongly typed pure functional language that compiles to JavaScript.
+MVU stands for Model-View-Update. It is a purely functional front-end architecture commonly used in Elm, a strongly
+typed pure functional language that compiles to JavaScript.
 
 ### Model
 
-The “model” part of the MVU name refers to an immutable data structure that contains all the state in your app. By “all the state” we mean all the state that influences any kind of domain/business logic, and all the state that is needed to render the UI. By storing all the state in a single “atom”, data synchronization problems between different parts of the app are a thing of the past. Note that the model is concerned with domain concepts, not UI concepts. Ideally (if not always in practice), you should be able to use the same model to target different UIs using the MVU pattern (a WPF app, a React web app using [Feliz](https://github.com/Zaid-Ajaj/Feliz/), a console app using [Terminal.Gui.Elmish](https://github.com/DieselMeister/Terminal.Gui.Elmish), etc.)
+The “model” part of the MVU name refers to an immutable data structure that contains all the state in your app. By “all
+the state” we mean all the state that influences any kind of domain/business logic, and all the state that is needed to
+render the UI. By storing all the state in a single “atom”, data synchronization problems between different parts of the
+app are a thing of the past. Note that the model is concerned with domain concepts, not UI concepts. Ideally (if not
+always in practice), you should be able to use the same model to target different UIs using the MVU pattern (a WPF app,
+a React web app using [Feliz](https://github.com/Zaid-Ajaj/Feliz/), a console app
+using [Terminal.Gui.Elmish](https://github.com/DieselMeister/Terminal.Gui.Elmish), etc.)
 
-For example, the type definition below may be the whole state for an app containing a single counter that you can increment/decrement by a customizable step size (the classic “hello world” of MVU apps):
+For example, the type definition below may be the whole state for an app containing a single counter that you can
+increment/decrement by a customizable step size (the classic “hello world” of MVU apps):
 
 ```f#
 type Model = {
@@ -62,9 +79,12 @@ let init () = {
 
 ### Message
 
-While not part of the MVU name, the message is a central component. It’s just a type that specifies everything that can happen in your app – all the reasons your state may change (all of the “events” in the app, if you will). It’s typically modelled by a discriminated union.
+While not part of the MVU name, the message is a central component. It’s just a type that specifies everything that can
+happen in your app – all the reasons your state may change (all of the “events” in the app, if you will). It’s typically
+modelled by a discriminated union.
 
-For example, the type definition below may describe all the possible things that can happen in the counter app described above:
+For example, the type definition below may describe all the possible things that can happen in the counter app described
+above:
 
 ```f#
 type Msg =
@@ -79,9 +99,12 @@ As with the model, the message type is concerned with the domain, and is ideally
 
 ### Update
 
-The “update” part of the MVU name refers to the function that is responsible for updating your model in response to incoming messages. It has the signature `'msg -> 'model -> 'model`. In other words, it is a pure function that accepts a message (something that happened) and the old state, and returns the new state.
+The “update” part of the MVU name refers to the function that is responsible for updating your model in response to
+incoming messages. It has the signature `'msg -> 'model -> 'model`. In other words, it is a pure function that accepts a
+message (something that happened) and the old state, and returns the new state.
 
-For example, for the counter app we have defined the model and message types for, the `update` function will look like this:
+For example, for the counter app we have defined the model and message types for, the `update` function will look like
+this:
 
 ```f#
 let update (msg: Msg) (model: Model) : Model =
@@ -95,11 +118,15 @@ let update (msg: Msg) (model: Model) : Model =
 
 This is where MVU frameworks will differ, since every UI technology is different.
 
-At its core, `view` is a function that accepts 1) a model and 2) a function to dispatch messages, and returns something that specifies how the UI will be rendered. This may in theory be the actual UI, though that would be very inefficient. Generally, `view` returns a “shadow DOM” (a cheap object graph reflecting the UI) that the framework will intelligently compare with the actual UI so that only the changed parts of the UI will be updated.
+At its core, `view` is a function that accepts 1) a model and 2) a function to dispatch messages, and returns something
+that specifies how the UI will be rendered. This may in theory be the actual UI, though that would be very inefficient.
+Generally, `view` returns a “shadow DOM” (a cheap object graph reflecting the UI) that the framework will intelligently
+compare with the actual UI so that only the changed parts of the UI will be updated.
 
 In other words: **In MVU, the UI is simply a function of the current model**.
 
-For example, the function below shows how the UI function might look like for the counter app above (using an imaginary UI library/syntax):
+For example, the function below shows how the UI function might look like for the counter app above (using an imaginary
+UI library/syntax):
 
 ```f#
 let view (model: Model) (dispatch: Msg -> unit) =
@@ -133,11 +160,15 @@ Therefore, you will normally see `dispatch` typed as `Dispatch<'msg>` instead of
 
 ### View in Elmish.WPF
 
-The `view` example above shows *dynamic views*, which is how “proper” MVU works. Creating views as a simple function of the model is a very powerful technique, is conceptually very simple, and allows for good composability.
+The `view` example above shows *dynamic views*, which is how “proper” MVU works. Creating views as a simple function of
+the model is a very powerful technique, is conceptually very simple, and allows for good composability.
 
-In Elmish.WPF, however, the views are defined externally in XAML. The UI is *static* and is not defined or changed by the `view` code; hence, Elmish.WPF is said to use *static views*.
+In Elmish.WPF, however, the views are defined externally in XAML. The UI is *static* and is not defined or changed by
+the `view` code; hence, Elmish.WPF is said to use *static views*.
 
-You set up bindings in the XAML views as you normally would if using MVVM. Then, in the `view` function, you use Elmish.WPF to declaratively create a “view model” of sorts that contain the data the view will bind to. Therefore the `view` function is normally called `bindings` in Elmish.WPF.
+You set up bindings in the XAML views as you normally would if using MVVM. Then, in the `view` function, you use
+Elmish.WPF to declaratively create a “view model” of sorts that contain the data the view will bind to. Therefore the
+`view` function is normally called `bindings` in Elmish.WPF.
 
 For example, the counter app may look like this:
 
@@ -167,23 +198,41 @@ type CounterViewModel(args) =
     and set(v) = base.Set(v) (Binding.OneWayToSourceT.id >> Binding.mapMsg Counter.Msg.SetStepSize)
 ```
 
-The actual bindings will be explained in detail later, but explained simply, the code above will create a view-model with:
+The actual bindings will be explained in detail later, but explained simply, the code above will create a view-model
+with:
 
 - an `int` get-only property `CounterValue` returning `model.Count`
-- two get-only properties `Increment` and `Decrement` that are `ICommand`s that can always execute and, when executed, dispatches the `Increment` and `Decrement` messages, respectively
-- a `float` get-set property `StepSize` returning `model.StepSize` and which, when set, dispatches the `SetStepSize` message with the number
-
-Another important difference between normal MVU `view` functions and Elmish.WPF’s `update`  function is that `view` is called every time the model has been updated, whereas `bindings` is only called once, when the “view model” is initialized. After that, it is the functions used in the bindings themselves that are called when the model is updated. Therefore, `bindings` do not accept a `model` or `dispatch` parameter. The `model` is instead passed separately in each binding, and the `dispatch` isn’t visible at all; you simply specify the message to be dispatched, and Elmish.WPF will take care of dispatching the message.
-
-In the statically-typed version, the bindings for individual properties work in exactly the same way as above, with a few exceptions. The `model` and `dispatch` parameters are passed in the default `CounterViewModel(args)` constructor through the `args` parameter, but this is immediately passed into the `inherit ViewModelBase<Model, Msg>(args)` line to surface up through the `base.Get()` and `base.Set(v)` helpers in exactly the same way as above. Also there is no `twoWay` with properties, as the getter and the setter of a property must be defined separately.
+- two get-only properties `Increment` and `Decrement` that are `ICommand`s that can always execute and, when executed,
+  dispatches the `Increment` and `Decrement` messages, respectively
+- a `float` get-set property `StepSize` returning `model.StepSize` and which, when set, dispatches the `SetStepSize`
+  message with the number
+
+Another important difference between normal MVU `view` functions and Elmish.WPF’s `update`  function is that `view` is
+called every time the model has been updated, whereas `bindings` is only called once, when the “view model” is
+initialized. After that, it is the functions used in the bindings themselves that are called when the model is updated.
+Therefore, `bindings` do not accept a `model` or `dispatch` parameter. The `model` is instead passed separately in each
+binding, and the `dispatch` isn’t visible at all; you simply specify the message to be dispatched, and Elmish.WPF will
+take care of dispatching the message.
+
+In the statically-typed version, the bindings for individual properties work in exactly the same way as above, with a
+few exceptions. The `model` and `dispatch` parameters are passed in the default `CounterViewModel(args)` constructor
+through the `args` parameter, but this is immediately passed into the `inherit ViewModelBase<Model, Msg>(args)` line to
+surface up through the `base.Get()` and `base.Set(v)` helpers in exactly the same way as above. Also there is no
+`twoWay` with properties, as the getter and the setter of a property must be defined separately.
 
 ### Commands (and subscriptions)
 
-This is yet another part of MVU that is not in the name. Not to be confused with WPF’s `ICommand`, the command in MVU is the only way you do side effects.
+This is yet another part of MVU that is not in the name. Not to be confused with WPF’s `ICommand`, the command in MVU is
+the only way you do side effects.
 
-Think about it: If the update function must be pure, how can we do side effects like making an HTTP call or reading from disk? Or alternatively, if we decided to make `update` impure (which is possible in F#, but not in Elm) and do some long-running IO there, wouldn’t that block the whole app (since the update loop can only process one message at a time for concurrency reasons)?
+Think about it: If the update function must be pure, how can we do side effects like making an HTTP call or reading from
+disk? Or alternatively, if we decided to make `update` impure (which is possible in F#, but not in Elm) and do some
+long-running IO there, wouldn’t that block the whole app (since the update loop can only process one message at a time
+for concurrency reasons)?
 
-The answer is that there are actually two variants of the `update` function: For very simple apps, as shown above, you can use the simple `update` version that just returns the new model. For more complex apps that need to use commands, the `update` function can return both the new model and a command in a tuple:
+The answer is that there are actually two variants of the `update` function: For very simple apps, as shown above, you
+can use the simple `update` version that just returns the new model. For more complex apps that need to use commands,
+the `update` function can return both the new model and a command in a tuple:
 
 ```f#
 update: 'msg -> 'model -> 'model * Cmd<'msg>
@@ -197,11 +246,16 @@ type Sub<'msg> = Dispatch<'msg> -> unit
 type Cmd<'msg> = Sub<'msg> list
 ```
 
-We have encountered `Dispatch<'msg>` previously. It is the type of the `dispatch` argument to the normal MVU `view` function. It is simply an alias for a function that accepts a message and sends it to the MVU framework so that it ends up being passed into `update`.
+We have encountered `Dispatch<'msg>` previously. It is the type of the `dispatch` argument to the normal MVU `view`
+function. It is simply an alias for a function that accepts a message and sends it to the MVU framework so that it ends
+up being passed into `update`.
 
-The next alias, `Sub<'msg>` (short for “subscription”) is simply a function that accepts a dispatcher and returns `unit`. This function can then dispatch whatever messages it wants whenever it wants, e.g. by setting up event subscriptions.
+The next alias, `Sub<'msg>` (short for “subscription”) is simply a function that accepts a dispatcher and returns
+`unit`. This function can then dispatch whatever messages it wants whenever it wants, e.g. by setting up event
+subscriptions.
 
-For example, here is such a function that, when called, will start dispatching a `SetTime` message every second. The whole `timerTick` function (without applying `dispatch`) has the signature `Sub<Msg>`:
+For example, here is such a function that, when called, will start dispatching a `SetTime` message every second. The
+whole `timerTick` function (without applying `dispatch`) has the signature `Sub<Msg>`:
 
 ```f#
 let timerTick (dispatch: Dispatch<Msg>) =
@@ -210,30 +264,49 @@ let timerTick (dispatch: Dispatch<Msg>) =
   timer.Start()
 ```
 
-This is the kind of function that you pass to `Program.withSubscription`, which allows you to start arbitrary non-UI message dispatchers when the app starts. For example, you can start timers (as shown above), subscribe to other non-UI events, start a `MailboxProcessor`, etc.
+This is the kind of function that you pass to `Program.withSubscription`, which allows you to start arbitrary non-UI
+message dispatchers when the app starts. For example, you can start timers (as shown above), subscribe to other non-UI
+events, start a `MailboxProcessor`, etc.
 
-The final alias, `Cmd<'msg>`, is just a list of `Sub<'msg>`, i.e. a list of `Dispatch<'msg> -> unit` functions. In other words, the `update` function can return a list of `Dispatch<'msg> -> unit` functions that the MVU framework will execute by providing a dispatch function. These functions, as you saw above, can then dispatch any message at any time. Therefore, if you need to do impure stuff such as calling a web API, you simply create a function accepting `dispatch`, perform the work within it, and then use the `dispatch` argument (provided by the MVU framework) to dispatch further messages (e.g. representing the result of the action) into the MVU event loop.
+The final alias, `Cmd<'msg>`, is just a list of `Sub<'msg>`, i.e. a list of `Dispatch<'msg> -> unit` functions. In other
+words, the `update` function can return a list of `Dispatch<'msg> -> unit` functions that the MVU framework will execute
+by providing a dispatch function. These functions, as you saw above, can then dispatch any message at any time.
+Therefore, if you need to do impure stuff such as calling a web API, you simply create a function accepting `dispatch`,
+perform the work within it, and then use the `dispatch` argument (provided by the MVU framework) to dispatch further
+messages (e.g. representing the result of the action) into the MVU event loop.
 
-In other words, the `Cmd<'msg>` returned by `update` will be invoked by the MVU framework. From the point of view of your model, everything happens asynchronously: the MVU update loop executes the command and continues without waiting for it to complete, and the command may dispatch future messages into the event loop at any time.
+In other words, the `Cmd<'msg>` returned by `update` will be invoked by the MVU framework. From the point of view of
+your model, everything happens asynchronously: the MVU update loop executes the command and continues without waiting
+for it to complete, and the command may dispatch future messages into the event loop at any time.
 
 For example:
 
 - The user clicks a button to log in, which dispatches a `SignInRequested` message
-- The `update` function returns a new model with an `IsBusy = true` value (which can be used to show an animation such as a spinner) as well as a command that asynchronously calls the API and, when the API responds, dispatches a message representing the response (e.g. `SignInSuccessful` or `SignInFailed`).
-- The MVU framework updates the view using the new model and invokes the command by executing each function in the list with a `dispatch` function.
-- The app continues to work as normal - the spinner spins because `IsBusy = true` and any other messages are processed as normal. Note that you are of course free to process messages differently based on the fact that `IsBusy = true`. For example, you may choose to ignore additional `SignInRequested` messages.
-- When the API call finally returns, and the function that called the API uses its `dispatch` argument to dispatch a suitable message (e.g. `SignInSuccessful` or `SignInFailed`).
-
-Elmish has several helpers in the `Cmd` module to easily create commands from normal functions, but if they don’t suit your use-case, you can always write a command directly as a list of `Dispatch<'msg> -> unit` functions.
+- The `update` function returns a new model with an `IsBusy = true` value (which can be used to show an animation such
+  as a spinner) as well as a command that asynchronously calls the API and, when the API responds, dispatches a message
+  representing the response (e.g. `SignInSuccessful` or `SignInFailed`).
+- The MVU framework updates the view using the new model and invokes the command by executing each function in the list
+  with a `dispatch` function.
+- The app continues to work as normal - the spinner spins because `IsBusy = true` and any other messages are processed
+  as normal. Note that you are of course free to process messages differently based on the fact that `IsBusy = true`.
+  For example, you may choose to ignore additional `SignInRequested` messages.
+- When the API call finally returns, and the function that called the API uses its `dispatch` argument to dispatch a
+  suitable message (e.g. `SignInSuccessful` or `SignInFailed`).
+
+Elmish has several helpers in the `Cmd` module to easily create commands from normal functions, but if they don’t suit
+your use-case, you can always write a command directly as a list of `Dispatch<'msg> -> unit` functions.
 
 Some MVU tips for beginners
 ---------------------------
 
 ### Normalize your model; use IDs instead of duplicating entities
 
-It is generally recommended that you aggressively normalize your model. This is because everything is (normally) immutable, so if a single entity occurs multiple places in your model and that entity should be updated, it must be updated every place it occurs. This increases the chance of introducing state synchronization bugs.
+It is generally recommended that you aggressively normalize your model. This is because everything is (normally)
+immutable, so if a single entity occurs multiple places in your model and that entity should be updated, it must be
+updated every place it occurs. This increases the chance of introducing state synchronization bugs.
 
-For example, say you have an app that can display a list of books, and you can click on a book in the list to open a detail view of that book. You might think to represent it with the following model:
+For example, say you have an app that can display a list of books, and you can click on a book in the list to open a
+detail view of that book. You might think to represent it with the following model:
 
 ```f#
 type Model = {
@@ -242,9 +315,11 @@ type Model = {
 }
 ```
 
-However, what if you now want to edit a book? The book may exist in two places – both in the list, and in the `DetailView` property.
+However, what if you now want to edit a book? The book may exist in two places – both in the list, and in the
+`DetailView` property.
 
-A better solution is to have the list be the only place to store the `Book` objects, and then simply refer to books by ID everywhere else:
+A better solution is to have the list be the only place to store the `Book` objects, and then simply refer to books by
+ID everywhere else:
 
 ```f#
 type Model = {
@@ -253,21 +328,31 @@ type Model = {
 }
 ```
 
-(You don’t have to use `list`; often it will make sense to have `Map<BookId, Book>` to easily and efficiently get a book by its ID.)
-
-This principle also extends to data in messages: If you have a choice between passing an entity ID and a complete entity object in a message, using an entity ID will usually be the better choice (even if it may not be immediately obvious).
+(You don’t have to use `list`; often it will make sense to have `Map<BookId, Book>` to easily and efficiently get a book
+by its ID.)
 
+This principle also extends to data in messages: If you have a choice between passing an entity ID and a complete entity
+object in a message, using an entity ID will usually be the better choice (even if it may not be immediately obvious).
 
 ### Use commands for anything impure
 
-Keep the XAML (and any code-behind) focused on the view, keep `bindings` focused on bindings, and keep your model and `update`  pure. If you need to do anything impure, that's what `Command` is for, whether it's writing to disk, connecting to a DB, calling a web API, talking to actors, or anything else. All impure operations can be implemented using commands.
-
-Note that there's nothing stopping you from having mutable state outside your model. For example, if you have persistent connections (e.g. SignalR) that you need to start and stop during the lifetime of your app, you can define them elsewhere and use them in commands from your `update`. If you need an unknown number of them, such as one connection per item in a list in your model, you can store them in a dictionary or similar, keyed by the item's ID. This allows you to create, dispose, and remove items according to the data in your model.
+Keep the XAML (and any code-behind) focused on the view, keep `bindings` focused on bindings, and keep your model and
+`update`  pure. If you need to do anything impure, that's what `Command` is for, whether it's writing to disk,
+connecting to a DB, calling a web API, talking to actors, or anything else. All impure operations can be implemented
+using commands.
 
+Note that there's nothing stopping you from having mutable state outside your model. For example, if you have persistent
+connections (e.g. SignalR) that you need to start and stop during the lifetime of your app, you can define them
+elsewhere and use them in commands from your `update`. If you need an unknown number of them, such as one connection per
+item in a list in your model, you can store them in a dictionary or similar, keyed by the item's ID. This allows you to
+create, dispose, and remove items according to the data in your model.
 
 ### Child components and scaling
 
-When starting out with MVU, it’s easy to fall into the trap of thinking ahead and wondering “how can I split my model/message/update/view into separate components?” For example, if you have two separate “pages” in your app, you might be inclined to think that each page should have its own separate model, message, update, and view. While this technique is needed with many other non-MVU architectures, it is often counterproductive in MVU.
+When starting out with MVU, it’s easy to fall into the trap of thinking ahead and wondering “how can I split my
+model/message/update/view into separate components?” For example, if you have two separate “pages” in your app, you
+might be inclined to think that each page should have its own separate model, message, update, and view. While this
+technique is needed with many other non-MVU architectures, it is often counterproductive in MVU.
 
 Before delving into the problems, let’s see how it’s done:
 
@@ -294,26 +379,50 @@ module Parent =
     | ChildMsg of childMsg -> { model with Child = Child.update childMsg model }
 ```
 
-As you can see, there’s some boilerplate involved in the parent component: You must have a model field for the child model, a wrapping message case for the child message, and an `update` branch that passes the child message on to the child model.
+As you can see, there’s some boilerplate involved in the parent component: You must have a model field for the child
+model, a wrapping message case for the child message, and an `update` branch that passes the child message on to the
+child model.
 
 Now for the problems.
 
-One important problem is that often, “child components” are not in fact separate from their parents, but need access to some of the parent state. Continuing the book example above, say that you want to split the app into a “list component” and a “detail component” with separate models. If you want to have auto-complete of author names when editing a book in the detail component, you need access to the list all books. The only way to accomplish that reliably is to have the complete book list in the child component, too. But that means that every time you update a book, you need to remember to update it in the child component, too. This incurs boilerplate for every piece of duplicated state (since you must have a child message case for updating each piece of duplicated state), and, again, easily causes state synchronization bugs.
+One important problem is that often, “child components” are not in fact separate from their parents, but need access to
+some of the parent state. Continuing the book example above, say that you want to split the app into a “list component”
+and a “detail component” with separate models. If you want to have auto-complete of author names when editing a book in
+the detail component, you need access to the list all books. The only way to accomplish that reliably is to have the
+complete book list in the child component, too. But that means that every time you update a book, you need to remember
+to update it in the child component, too. This incurs boilerplate for every piece of duplicated state (since you must
+have a child message case for updating each piece of duplicated state), and, again, easily causes state synchronization
+bugs.
 
-Another important problem, again following from the fact that the components are often not separate, is that a child component might need to communicate with its parent. For example, when saving a book, the parent component needs to get the updated book in a message, but the child component can only dispatch its child message type. There are ways to solve this (e.g. make the child `update` also return a separate “parent message” type, or have the parent intercept certain child messages), but all of them are usually unnecessary complications and not without drawbacks.
+Another important problem, again following from the fact that the components are often not separate, is that a child
+component might need to communicate with its parent. For example, when saving a book, the parent component needs to get
+the updated book in a message, but the child component can only dispatch its child message type. There are ways to solve
+this (e.g. make the child `update` also return a separate “parent message” type, or have the parent intercept certain
+child messages), but all of them are usually unnecessary complications and not without drawbacks.
 
-What should you do instead, then? The answer is, simply put, to scale the model/message/update/view **separately**, and **only when needed**. It is highly recommended that you read the following reddit thread replies by user `rtfeldman`:
+What should you do instead, then? The answer is, simply put, to scale the model/message/update/view **separately**, and
+**only when needed**. It is highly recommended that you read the following reddit thread replies by user `rtfeldman`:
 
 - [Elm Architecture with a Redux-like store pattern](https://www.reddit.com/r/elm/comments/5xdl9z/elm_architecture_with_a_reduxlike_store_pattern/dehrcx8/)
 - [How to structure Elm with multiple models?](https://www.reddit.com/r/elm/comments/5jd2xn/how_to_structure_elm_with_multiple_models/dbuu0m4/)
 
 ### Optimize easily with memoization
 
-First: Never optimize prematurely. Only optimize if you can actually measure that a certain piece of code is giving you problems.
+First: Never optimize prematurely. Only optimize if you can actually measure that a certain piece of code is giving you
+problems.
 
-That said: Since everything in MVU is just (pure) functions, functions, and more functions, *memoization* is a technique that will allow you to easily skip work if inputs are equal. Memoization is simply about storing the inputs and outputs, and if the function is called with a known value, the already computed result is returned. If not, the result is computed by calling the actual function, and the result is stored to be reused later.
+That said: Since everything in MVU is just (pure) functions, functions, and more functions, *memoization* is a technique
+that will allow you to easily skip work if inputs are equal. Memoization is simply about storing the inputs and outputs,
+and if the function is called with a known value, the already computed result is returned. If not, the result is
+computed by calling the actual function, and the result is stored to be reused later.
 
-In general, there are several ways to memoize: You can memoize all inputs/outputs (may be memory heavy), or just the latest; you can memoize based on structural comparison of inputs (may be expensive), or use referential equality. In MVU architectures, you often need to ensure that when you use parts of your model to compute a result, you only compute the result once until the input changes. Specifically, you might not care about remembering old values, because generally these will never be used. In that case, you can often get very far with this general memoization implementation that memoizes only the last computed value and stores it using the input reference (which works because everything is normally immutable):
+In general, there are several ways to memoize: You can memoize all inputs/outputs (may be memory heavy), or just the
+latest; you can memoize based on structural comparison of inputs (may be expensive), or use referential equality. In MVU
+architectures, you often need to ensure that when you use parts of your model to compute a result, you only compute the
+result once until the input changes. Specifically, you might not care about remembering old values, because generally
+these will never be used. In that case, you can often get very far with this general memoization implementation that
+memoizes only the last computed value and stores it using the input reference (which works because everything is
+normally immutable):
 
 ```f#
 let memoize (f: 'a -> 'b) : 'a -> 'b =
@@ -337,26 +446,34 @@ let myExpensiveFunMemoized = memoize myExpensiveFun
 
 Then you simply call `myExpensiveFunMemoized` instead of `myExpensiveFun` in the rest of your code.
 
-It is important that `myExpensiveFunMemoized` is defined without arguments to ensure that `memoize` is applied only once. If you had written
+It is important that `myExpensiveFunMemoized` is defined without arguments to ensure that `memoize` is applied only
+once. If you had written
 
 ```f#
 let myExpensiveFunMemoized x = memoize myExpensiveFun x
 ```
 
-then a new memoized version would be created each for each call, which defeats the purpose of memoizing it in the first place.
+then a new memoized version would be created each for each call, which defeats the purpose of memoizing it in the first
+place.
 
-Furthermore, the implementation above only memoizes functions with a single input. If you need more parameters, you need to create `memoize2`, `memoize3`, etc. (You could also pass a single tuple argument, but that will never be referentially equal, so you’d need to use structural comparison instead. That might be prohibitively expensive if the input is, say, a large collection of domain objects. Alternatively you might use functionality similar to Elmish.WPF’s `elmEq` helper, which is explained later.)
+Furthermore, the implementation above only memoizes functions with a single input. If you need more parameters, you need
+to create `memoize2`, `memoize3`, etc. (You could also pass a single tuple argument, but that will never be
+referentially equal, so you’d need to use structural comparison instead. That might be prohibitively expensive if the
+input is, say, a large collection of domain objects. Alternatively you might use functionality similar to Elmish.WPF’s
+`elmEq` helper, which is explained later.)
 
 Getting started with Elmish.WPF
 -------------------------------
 
-The [readme](https://github.com/elmish/Elmish.WPF/blob/master/README.md) has a “getting started” section that will have you up and running quickly with a simple skeleton solution.
+The [readme](https://github.com/elmish/Elmish.WPF/blob/master/README.md) has a “getting started” section that will have
+you up and running quickly with a simple skeleton solution.
 
 Additional resources
 --------------------
 
 The [Elmish.WPF readme](https://github.com/elmish/Elmish.WPF/blob/master/README.md) contains
-  - a “getting started” section that will get you quickly up and running
-  - a FAQ with miscellaneous useful information
+
+- a “getting started” section that will get you quickly up and running
+- a FAQ with miscellaneous useful information
 
 The [Elmish.WPF reference](https://github.com/elmish/Elmish.WPF/blob/master/REFERENCE.md)
diff --git a/jetbrains.svg b/jetbrains.svg
index 75d4d217..55bbf1a1 100644
--- a/jetbrains.svg
+++ b/jetbrains.svg
@@ -1,62 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
-	>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+     width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;"
+     xml:space="preserve"
+>
 <g>
 	<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
-		<stop  offset="0" style="stop-color:#FCEE39"/>
-		<stop  offset="1" style="stop-color:#F37B3D"/>
+		<stop offset="0" style="stop-color:#FCEE39"/>
+        <stop offset="1" style="stop-color:#F37B3D"/>
 	</linearGradient>
-	<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
+    <path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
 		c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
 		c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
-	<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
-		<stop  offset="0" style="stop-color:#EF5A6B"/>
-		<stop  offset="0.57" style="stop-color:#F26F4E"/>
-		<stop  offset="1" style="stop-color:#F37B3D"/>
+    <linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
+		<stop offset="0" style="stop-color:#EF5A6B"/>
+        <stop offset="0.57" style="stop-color:#F26F4E"/>
+        <stop offset="1" style="stop-color:#F37B3D"/>
 	</linearGradient>
-	<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
+    <path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
 		c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
 		c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
-	<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
-		<stop  offset="0" style="stop-color:#7C59A4"/>
-		<stop  offset="0.3852" style="stop-color:#AF4C92"/>
-		<stop  offset="0.7654" style="stop-color:#DC4183"/>
-		<stop  offset="0.957" style="stop-color:#ED3D7D"/>
+    <linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
+		<stop offset="0" style="stop-color:#7C59A4"/>
+        <stop offset="0.3852" style="stop-color:#AF4C92"/>
+        <stop offset="0.7654" style="stop-color:#DC4183"/>
+        <stop offset="0.957" style="stop-color:#ED3D7D"/>
 	</linearGradient>
-	<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
+    <path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
 		c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
 		c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
-	<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
-		<stop  offset="0" style="stop-color:#EF5A6B"/>
-		<stop  offset="0.364" style="stop-color:#EE4E72"/>
-		<stop  offset="1" style="stop-color:#ED3D7D"/>
+    <linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
+		<stop offset="0" style="stop-color:#EF5A6B"/>
+        <stop offset="0.364" style="stop-color:#EE4E72"/>
+        <stop offset="1" style="stop-color:#ED3D7D"/>
 	</linearGradient>
-	<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
+    <path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
 		l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
 		c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
-	<g id="XMLID_3008_">
+    <g id="XMLID_3008_">
 		<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
-		<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
-		<g id="XMLID_3009_">
+        <rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
+        <g id="XMLID_3009_">
 			<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
 				l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
-			<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
+            <path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
 				L45.3,43.8z"/>
-			<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
-			<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
+            <path id="XMLID_3026_" style="fill:#FFFFFF;"
+                  d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
+            <path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
 				c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
 				l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
-			<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
+            <path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
 				c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
 				l-1.5,0v2H50.6z"/>
-			<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
+            <path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
 				 M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
-			<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
-			<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
-				/>
-			<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
+            <path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
+            <path id="XMLID_3012_" style="fill:#FFFFFF;"
+                  d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
+            />
+            <path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
 				c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
 				c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
 				C76.1,62.5,74.7,62,73.7,61.1z"/>
diff --git a/src/Elmish.WPF/BindingData.fs b/src/Elmish.WPF/BindingData.fs
index a128e2e1..3d5b83f3 100644
--- a/src/Elmish.WPF/BindingData.fs
+++ b/src/Elmish.WPF/BindingData.fs
@@ -293,7 +293,7 @@ module BindingData =
     /// <param name="b">The binding to box.</param>
     /// <returns>A binding with boxed type parameter.</returns>
     let boxT b = MapT.recursiveCase box unbox b
-    
+
     /// <summary>
     /// Unboxes the type parameter of a binding.
     /// </summary>
@@ -481,7 +481,7 @@ module BindingData =
     /// <param name="f">Function that produces the message from the model.</param>
     /// <returns>A function that sets the binding's message based on the model.</returns>
     let setMsgWithModel f = mapMsgWithModel (fun _ m -> f m)
-    
+
     /// <summary>
     /// Sets the message of a binding to a constant value.
     /// </summary>
diff --git a/src/Elmish.WPF/Elmish.WPF.fsproj b/src/Elmish.WPF/Elmish.WPF.fsproj
index a9053e38..bb261d5b 100644
--- a/src/Elmish.WPF/Elmish.WPF.fsproj
+++ b/src/Elmish.WPF/Elmish.WPF.fsproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\README.md" Link="README.md" Pack="True" PackagePath="/" />
+    <None Include="..\..\README.md" Link="README.md" Pack="True" PackagePath="/"/>
     <None Include="elmish-wpf-logo-128x128.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
@@ -41,27 +41,27 @@
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>Elmish.WPF.Benchmarks</_Parameter1>
     </AssemblyAttribute>
-    <Compile Include="InternalUtils.fs" />
-    <Compile Include="Merge.fs" />
-    <Compile Include="Command.fs" />
-    <Compile Include="Utils.fs" />
-    <Compile Include="WindowState.fs" />
-    <Compile Include="ViewModelArgs.fs" />
-    <Compile Include="BindingData.fs" />
-    <Compile Include="BindingVmHelpers.fs" />
-    <Compile Include="ViewModels.fs" />
-    <Compile Include="Binding.fs" />
-    <Compile Include="ViewModelModule.fs" />
-    <Compile Include="WpfProgram.fs" />
+    <Compile Include="InternalUtils.fs"/>
+    <Compile Include="Merge.fs"/>
+    <Compile Include="Command.fs"/>
+    <Compile Include="Utils.fs"/>
+    <Compile Include="WindowState.fs"/>
+    <Compile Include="ViewModelArgs.fs"/>
+    <Compile Include="BindingData.fs"/>
+    <Compile Include="BindingVmHelpers.fs"/>
+    <Compile Include="ViewModels.fs"/>
+    <Compile Include="Binding.fs"/>
+    <Compile Include="ViewModelModule.fs"/>
+    <Compile Include="WpfProgram.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elmish" Version="[4.0.1, 4.99]" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[6.0.1, 99]" />
+    <PackageReference Include="Elmish" Version="[4.0.1, 4.99]"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[6.0.1, 99]"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="[6.0.5, 99]" />
+    <PackageReference Update="FSharp.Core" Version="[6.0.5, 99]"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Capabilities/App.xaml.cs b/src/Samples/Capabilities/App.xaml.cs
deleted file mode 100644
index 7fa36b5d..00000000
--- a/src/Samples/Capabilities/App.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Windows;
-using Elmish.WPF.Samples.Capabilities;
-
-namespace Capabilities {
-  public partial class App : Application {
-    public App() {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object _1, EventArgs _2) {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Samples/Capabilities/MainWindow.xaml.cs b/src/Samples/Capabilities/MainWindow.xaml.cs
deleted file mode 100644
index 323bb8a5..00000000
--- a/src/Samples/Capabilities/MainWindow.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Capabilities {
-  public partial class MainWindow : Window {
-    public MainWindow() {
-      InitializeComponent();
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Samples/Capabilities/Selection/BindableSelectedValue.cs b/src/Samples/Capabilities/Selection/BindableSelectedValue.cs
deleted file mode 100644
index 1b3c8167..00000000
--- a/src/Samples/Capabilities/Selection/BindableSelectedValue.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using Microsoft.Xaml.Behaviors;
-
-namespace Elmish.WPF.Samples.Capabilities {
-  class BindableSelectedValue : Behavior<TreeView> {
-
-    public object SelectedValue {
-      get => (object)GetValue(SelectedValueProperty);
-      set => SetValue(SelectedValueProperty, value);
-    }
-    public static readonly DependencyProperty SelectedValueProperty =
-      DependencyProperty.Register(nameof(SelectedValue), typeof(object), typeof(BindableSelectedValue), new UIPropertyMetadata(null, OnSelectedValueChanged));
-    private static void OnSelectedValueChanged(DependencyObject _, DependencyPropertyChangedEventArgs e) {
-      if (e.NewValue is TreeViewItem item) {
-        item.SetValue(TreeViewItem.IsSelectedProperty, true);
-      }
-    }
-
-    protected override void OnAttached() {
-      base.OnAttached();
-      this.AssociatedObject.SelectedItemChanged += OnTreeViewSelectedItemChanged;
-    }
-    protected override void OnDetaching() {
-      base.OnDetaching();
-      this.AssociatedObject.SelectedItemChanged -= OnTreeViewSelectedItemChanged;
-    }
-    private void OnTreeViewSelectedItemChanged(object _1, RoutedPropertyChangedEventArgs<object> _2) =>
-      this.SelectedValue = this.AssociatedObject.SelectedValue;
-  }
-}
\ No newline at end of file
diff --git a/src/Samples/Capabilities/Selection/SelectionScreen.xaml.cs b/src/Samples/Capabilities/Selection/SelectionScreen.xaml.cs
deleted file mode 100644
index 78f849d0..00000000
--- a/src/Samples/Capabilities/Selection/SelectionScreen.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Diagnostics;
-using System.Windows.Controls;
-using System.Windows.Navigation;
-
-namespace Elmish.WPF.Samples.Capabilities {
-  public partial class SelectionScreen : UserControl {
-    public SelectionScreen() {
-      InitializeComponent();
-    }
-
-    private void Hyperlink_RequestNavigate(object _, RequestNavigateEventArgs e) {
-      _ = Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
-      e.Handled = true;
-    }
-
-  }
-}
\ No newline at end of file
diff --git a/src/Samples/Capabilities.Core/Capabilities.Core.fsproj b/src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj
similarity index 64%
rename from src/Samples/Capabilities.Core/Capabilities.Core.fsproj
rename to src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj
index f2721dd4..20e3bd88 100644
--- a/src/Samples/Capabilities.Core/Capabilities.Core.fsproj
+++ b/src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj
@@ -9,19 +9,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Utilities.fs" />
-    <Compile Include="Selection.fs" />
-    <Compile Include="Program.fs" />
+    <Compile Include="Utilities.fs"/>
+    <Compile Include="Selection.fs"/>
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Samples/Capabilities.Core/Program.fs b/src/Samples/Dynamic/Capabilities.Core/Program.fs
similarity index 100%
rename from src/Samples/Capabilities.Core/Program.fs
rename to src/Samples/Dynamic/Capabilities.Core/Program.fs
diff --git a/src/Samples/Capabilities.Core/Selection.fs b/src/Samples/Dynamic/Capabilities.Core/Selection.fs
similarity index 100%
rename from src/Samples/Capabilities.Core/Selection.fs
rename to src/Samples/Dynamic/Capabilities.Core/Selection.fs
diff --git a/src/Samples/Capabilities.Core/Utilities.fs b/src/Samples/Dynamic/Capabilities.Core/Utilities.fs
similarity index 100%
rename from src/Samples/Capabilities.Core/Utilities.fs
rename to src/Samples/Dynamic/Capabilities.Core/Utilities.fs
diff --git a/src/Samples/Capabilities/App.xaml b/src/Samples/Dynamic/Capabilities/App.xaml
similarity index 89%
rename from src/Samples/Capabilities/App.xaml
rename to src/Samples/Dynamic/Capabilities/App.xaml
index 4d380840..3c80dd18 100644
--- a/src/Samples/Capabilities/App.xaml
+++ b/src/Samples/Dynamic/Capabilities/App.xaml
@@ -2,5 +2,5 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-  <Application.Resources/>
+  <Application.Resources />
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Capabilities/App.xaml.cs b/src/Samples/Dynamic/Capabilities/App.xaml.cs
new file mode 100644
index 00000000..8e3831b7
--- /dev/null
+++ b/src/Samples/Dynamic/Capabilities/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+using Elmish.WPF.Samples.Capabilities;
+
+namespace Capabilities;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object _1, EventArgs _2)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Capabilities/Capabilities.csproj b/src/Samples/Dynamic/Capabilities/Capabilities.csproj
similarity index 93%
rename from src/Samples/Capabilities/Capabilities.csproj
rename to src/Samples/Dynamic/Capabilities/Capabilities.csproj
index 15aace2d..0361b981 100644
--- a/src/Samples/Capabilities/Capabilities.csproj
+++ b/src/Samples/Dynamic/Capabilities/Capabilities.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Capabilities.Core\Capabilities.Core.fsproj" />
+    <ProjectReference Include="..\Capabilities.Core\Capabilities.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Samples/Capabilities/MainWindow.xaml b/src/Samples/Dynamic/Capabilities/MainWindow.xaml
similarity index 91%
rename from src/Samples/Capabilities/MainWindow.xaml
rename to src/Samples/Dynamic/Capabilities/MainWindow.xaml
index 34266bb9..422c12bf 100644
--- a/src/Samples/Capabilities/MainWindow.xaml
+++ b/src/Samples/Dynamic/Capabilities/MainWindow.xaml
@@ -8,15 +8,15 @@
         Title="Capabilities" Height="450" Width="800">
   <Grid>
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="100"/>
-      <ColumnDefinition Width="*"/>
+      <ColumnDefinition Width="100" />
+      <ColumnDefinition Width="*" />
     </Grid.ColumnDefinitions>
     <StackPanel Grid.Column="0" Orientation="Vertical" Margin="12">
-      <Button Command="{Binding ShowSelection}" Content="Selection"/>
+      <Button Command="{Binding ShowSelection}" Content="Selection" />
     </StackPanel>
     <Grid Grid.Column="1" Margin="12">
       <Grid Visibility="{Binding SelectionVisibility}">
-        <local:SelectionScreen DataContext="{Binding Selection}"/>
+        <local:SelectionScreen DataContext="{Binding Selection}" />
       </Grid>
     </Grid>
   </Grid>
diff --git a/src/Samples/Dynamic/Capabilities/MainWindow.xaml.cs b/src/Samples/Dynamic/Capabilities/MainWindow.xaml.cs
new file mode 100644
index 00000000..3bd5ff98
--- /dev/null
+++ b/src/Samples/Dynamic/Capabilities/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Capabilities;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Capabilities/Selection/BindableSelectedValue.cs b/src/Samples/Dynamic/Capabilities/Selection/BindableSelectedValue.cs
new file mode 100644
index 00000000..e3db3491
--- /dev/null
+++ b/src/Samples/Dynamic/Capabilities/Selection/BindableSelectedValue.cs
@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Xaml.Behaviors;
+
+namespace Elmish.WPF.Samples.Capabilities;
+
+internal class BindableSelectedValue : Behavior<TreeView>
+{
+    public static readonly DependencyProperty SelectedValueProperty =
+        DependencyProperty.Register(nameof(SelectedValue), typeof(object), typeof(BindableSelectedValue),
+            new UIPropertyMetadata(null, OnSelectedValueChanged));
+
+    public object SelectedValue
+    {
+        get => GetValue(SelectedValueProperty);
+        set => SetValue(SelectedValueProperty, value);
+    }
+
+    private static void OnSelectedValueChanged(DependencyObject _, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is TreeViewItem item) item.SetValue(TreeViewItem.IsSelectedProperty, true);
+    }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.SelectedItemChanged += OnTreeViewSelectedItemChanged;
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        AssociatedObject.SelectedItemChanged -= OnTreeViewSelectedItemChanged;
+    }
+
+    private void OnTreeViewSelectedItemChanged(object _1, RoutedPropertyChangedEventArgs<object> _2)
+    {
+        SelectedValue = AssociatedObject.SelectedValue;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Capabilities/Selection/SelectionScreen.xaml b/src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml
similarity index 68%
rename from src/Samples/Capabilities/Selection/SelectionScreen.xaml
rename to src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml
index e9ccffba..83275ffa 100644
--- a/src/Samples/Capabilities/Selection/SelectionScreen.xaml
+++ b/src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml
@@ -5,35 +5,36 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:root="clr-namespace:Elmish.WPF.Samples.Capabilities"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
   <StackPanel Orientation="Vertical">
     <StackPanel Orientation="Horizontal">
       <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal">
-          <TextBlock Text="Selected index: "/>
-          <TextBlock Text="{Binding SelectedIndex}"/>
+          <TextBlock Text="Selected index: " />
+          <TextBlock Text="{Binding SelectedIndex}" />
         </StackPanel>
         <StackPanel Orientation="Horizontal" Margin="6">
-          <Button Command="{Binding DeselectIndex}" Content="Deselect" Height="25" Width="75" Margin="6"/>
-          <ListBox ItemsSource="{Binding SelectedIndexData}" SelectedIndex="{Binding SelectedIndex}" Margin="6"/>
+          <Button Command="{Binding DeselectIndex}" Content="Deselect" Height="25" Width="75" Margin="6" />
+          <ListBox ItemsSource="{Binding SelectedIndexData}" SelectedIndex="{Binding SelectedIndex}" Margin="6" />
         </StackPanel>
       </StackPanel>
       <TextBlock>
         The simplest way to handle selection is via a TwoWay binding on
-        <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.primitives.selector.selectedindex#System_Windows_Controls_Primitives_Selector_SelectedIndex"
-                   RequestNavigate="Hyperlink_RequestNavigate">
+        <Hyperlink
+          NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.primitives.selector.selectedindex#System_Windows_Controls_Primitives_Selector_SelectedIndex"
+          RequestNavigate="Hyperlink_RequestNavigate">
           Selector.SelectedIndex
         </Hyperlink>
         . The selection is empty when the value is -1.
       </TextBlock>
     </StackPanel>
-    <Separator Margin="12"/>
+    <Separator Margin="12" />
     <StackPanel Orientation="Horizontal">
       <StackPanel Orientation="Vertical" Width="130">
         <StackPanel Orientation="Horizontal">
-          <TextBlock Text="Selected value: "/>
-          <TextBlock Text="{Binding SelectedValue}"/>
+          <TextBlock Text="Selected value: " />
+          <TextBlock Text="{Binding SelectedValue}" />
         </StackPanel>
         <TreeView ItemsSource="{Binding SelectedValueData}" SelectedValuePath="Data" Height="100" Margin="6">
           <i:Interaction.Behaviors>
@@ -41,7 +42,7 @@
           </i:Interaction.Behaviors>
           <TreeView.ItemTemplate>
             <HierarchicalDataTemplate ItemsSource="{Binding SelectedValueChildren}">
-              <TextBlock Text="{Binding Data}"/>
+              <TextBlock Text="{Binding Data}" />
             </HierarchicalDataTemplate>
           </TreeView.ItemTemplate>
         </TreeView>
@@ -53,13 +54,15 @@
           TreeView
         </Hyperlink>
         class does not have a SelectedIndex property, but it does have
-        <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview.selectedvalue#System_Windows_Controls_TreeView_SelectedValue"
-                   RequestNavigate="Hyperlink_RequestNavigate">
+        <Hyperlink
+          NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview.selectedvalue#System_Windows_Controls_TreeView_SelectedValue"
+          RequestNavigate="Hyperlink_RequestNavigate">
           SelectedValue
         </Hyperlink>
         and
-        <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview.selectedvaluepath#System_Windows_Controls_TreeView_SelectedValuePath"
-                   RequestNavigate="Hyperlink_RequestNavigate">
+        <Hyperlink
+          NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview.selectedvaluepath#System_Windows_Controls_TreeView_SelectedValuePath"
+          RequestNavigate="Hyperlink_RequestNavigate">
           SelectedValuePath
         </Hyperlink>
         properties. They can be used to read (but not write) the current selection.
diff --git a/src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml.cs b/src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml.cs
new file mode 100644
index 00000000..6f62d4c5
--- /dev/null
+++ b/src/Samples/Dynamic/Capabilities/Selection/SelectionScreen.xaml.cs
@@ -0,0 +1,19 @@
+using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+
+namespace Elmish.WPF.Samples.Capabilities;
+
+public partial class SelectionScreen : UserControl
+{
+    public SelectionScreen()
+    {
+        InitializeComponent();
+    }
+
+    private void Hyperlink_RequestNavigate(object _, RequestNavigateEventArgs e)
+    {
+        _ = Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
+        e.Handled = true;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj b/src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
similarity index 72%
rename from src/Samples/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
rename to src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/EventBindingsAndBehaviors.Core/Program.fs b/src/Samples/Dynamic/EventBindingsAndBehaviors.Core/Program.fs
similarity index 100%
rename from src/Samples/EventBindingsAndBehaviors.Core/Program.fs
rename to src/Samples/Dynamic/EventBindingsAndBehaviors.Core/Program.fs
diff --git a/src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml b/src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml
new file mode 100644
index 00000000..3706663b
--- /dev/null
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.EventBindingsAndBehaviors.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml.cs b/src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml.cs
new file mode 100644
index 00000000..f7897e54
--- /dev/null
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.EventBindingsAndBehaviors;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj b/src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
similarity index 88%
rename from src/Samples/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
rename to src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
index 541615bf..ac2069f3 100644
--- a/src/Samples/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EventBindingsAndBehaviors.Core\EventBindingsAndBehaviors.Core.fsproj" />
+    <ProjectReference Include="..\EventBindingsAndBehaviors.Core\EventBindingsAndBehaviors.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs b/src/Samples/Dynamic/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
new file mode 100644
index 00000000..57b5713b
--- /dev/null
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
@@ -0,0 +1,24 @@
+using System.Windows;
+using Microsoft.Xaml.Behaviors;
+
+namespace Elmish.WPF.Samples.EventBindingsAndBehaviors;
+
+public class FocusWhenVisibleBehavior : Behavior<UIElement>
+{
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.IsVisibleChanged += UIElement_IsVisibleChanged;
+    }
+
+    private void UIElement_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is bool b && b) _ = AssociatedObject.Focus();
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        AssociatedObject.IsVisibleChanged -= UIElement_IsVisibleChanged;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/EventBindingsAndBehaviors/MainWindow.xaml b/src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml
similarity index 83%
rename from src/Samples/EventBindingsAndBehaviors/MainWindow.xaml
rename to src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml
index e206d1c7..bfc66e12 100644
--- a/src/Samples/EventBindingsAndBehaviors/MainWindow.xaml
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml
@@ -18,14 +18,14 @@
   <StackPanel Margin="15" HorizontalAlignment="Center">
     <TextBlock Text="Switch focus between these two inputs." Margin="0,0,0,10" TextAlignment="Center" />
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-      <StackPanel  Margin="0,0,25,0">
+      <StackPanel Margin="0,0,25,0">
         <TextBox Width="100" IsReadOnly="True" IsReadOnlyCaretVisible="True">
           <i:Interaction.Triggers>
             <i:EventTrigger EventName="GotFocus">
-              <i:InvokeCommandAction Command="{Binding GotFocus1}"/>
+              <i:InvokeCommandAction Command="{Binding GotFocus1}" />
             </i:EventTrigger>
             <i:EventTrigger EventName="LostFocus">
-              <i:InvokeCommandAction Command="{Binding LostFocus1}"/>
+              <i:InvokeCommandAction Command="{Binding LostFocus1}" />
             </i:EventTrigger>
           </i:Interaction.Triggers>
         </TextBox>
@@ -35,17 +35,18 @@
         <TextBox Width="100" IsReadOnly="True" IsReadOnlyCaretVisible="True">
           <i:Interaction.Triggers>
             <i:EventTrigger EventName="GotFocus">
-              <i:InvokeCommandAction Command="{Binding GotFocus2}"/>
+              <i:InvokeCommandAction Command="{Binding GotFocus2}" />
             </i:EventTrigger>
             <i:EventTrigger EventName="LostFocus">
-              <i:InvokeCommandAction Command="{Binding LostFocus2}"/>
+              <i:InvokeCommandAction Command="{Binding LostFocus2}" />
             </i:EventTrigger>
           </i:Interaction.Triggers>
         </TextBox>
         <TextBlock Text="{Binding Msg2}" Margin="0,0,25,0" TextAlignment="Center" />
       </StackPanel>
     </StackPanel>
-    <Button Command="{Binding ToggleVisibility}" Content="{Binding ButtonText}" Width="100" Height="25" Margin="0,20,0,0">
+    <Button Command="{Binding ToggleVisibility}" Content="{Binding ButtonText}" Width="100" Height="25"
+            Margin="0,20,0,0">
       <Button.ToolTip>
         <TextBlock>
           <Run Text="{Binding ButtonText}" />
@@ -54,18 +55,21 @@
       </Button.ToolTip>
     </Button>
     <TextBlock
-        Text="This input will receive focus automatically each time it appears."
-        TextWrapping="Wrap"
-        Margin="0,10,0,10"
-        TextAlignment="Center"  />
-    <TextBox Width="100" Margin="0,0,0,0" Visibility="{Binding TextBoxVisibility}" IsReadOnly="True" IsReadOnlyCaretVisible="True">
+      Text="This input will receive focus automatically each time it appears."
+      TextWrapping="Wrap"
+      Margin="0,10,0,10"
+      TextAlignment="Center" />
+    <TextBox Width="100" Margin="0,0,0,0" Visibility="{Binding TextBoxVisibility}" IsReadOnly="True"
+             IsReadOnlyCaretVisible="True">
       <i:Interaction.Behaviors>
         <local:FocusWhenVisibleBehavior />
       </i:Interaction.Behaviors>
     </TextBox>
-    <Separator Margin="0,16,0,16"/>
-    <TextBlock Text="MouseEventArgs given to command as parameter when the MoveMouse event is triggered inside the ellipse." TextWrapping="Wrap"/>
-    <TextBlock Text="{Binding MousePosition, StringFormat='Mouse Position is {0}'}" Margin="0,16,0,16"/>
+    <Separator Margin="0,16,0,16" />
+    <TextBlock
+      Text="MouseEventArgs given to command as parameter when the MoveMouse event is triggered inside the ellipse."
+      TextWrapping="Wrap" />
+    <TextBlock Text="{Binding MousePosition, StringFormat='Mouse Position is {0}'}" Margin="0,16,0,16" />
     <Ellipse Fill="LightGray" Stroke="Black" Height="100" Width="300">
       <i:Interaction.Triggers>
         <i:EventTrigger EventName="MouseMove">
@@ -74,4 +78,4 @@
       </i:Interaction.Triggers>
     </Ellipse>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml.cs b/src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml.cs
new file mode 100644
index 00000000..9fe1f98f
--- /dev/null
+++ b/src/Samples/Dynamic/EventBindingsAndBehaviors/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.EventBindingsAndBehaviors;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/FileDialogs.Core/FileDialogs.Core.fsproj b/src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj
similarity index 72%
rename from src/Samples/FileDialogs.Core/FileDialogs.Core.fsproj
rename to src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/FileDialogs.Core/FileDialogs.Core.fsproj
+++ b/src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/FileDialogs.Core/Program.fs b/src/Samples/Dynamic/FileDialogs.Core/Program.fs
similarity index 100%
rename from src/Samples/FileDialogs.Core/Program.fs
rename to src/Samples/Dynamic/FileDialogs.Core/Program.fs
diff --git a/src/Samples/Dynamic/FileDialogs/App.xaml b/src/Samples/Dynamic/FileDialogs/App.xaml
new file mode 100644
index 00000000..a5a63d49
--- /dev/null
+++ b/src/Samples/Dynamic/FileDialogs/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.FileDialogs.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/FileDialogs/App.xaml.cs b/src/Samples/Dynamic/FileDialogs/App.xaml.cs
new file mode 100644
index 00000000..5c9e8970
--- /dev/null
+++ b/src/Samples/Dynamic/FileDialogs/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogs;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/FileDialogs/FileDialogs.csproj b/src/Samples/Dynamic/FileDialogs/FileDialogs.csproj
similarity index 96%
rename from src/Samples/FileDialogs/FileDialogs.csproj
rename to src/Samples/Dynamic/FileDialogs/FileDialogs.csproj
index a57ed2e5..96a12355 100644
--- a/src/Samples/FileDialogs/FileDialogs.csproj
+++ b/src/Samples/Dynamic/FileDialogs/FileDialogs.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FileDialogs.Core\FileDialogs.Core.fsproj" />
+    <ProjectReference Include="..\FileDialogs.Core\FileDialogs.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/FileDialogs/MainWindow.xaml b/src/Samples/Dynamic/FileDialogs/MainWindow.xaml
similarity index 91%
rename from src/Samples/FileDialogs/MainWindow.xaml
rename to src/Samples/Dynamic/FileDialogs/MainWindow.xaml
index 26029864..fccff463 100644
--- a/src/Samples/FileDialogs/MainWindow.xaml
+++ b/src/Samples/Dynamic/FileDialogs/MainWindow.xaml
@@ -12,7 +12,8 @@
         d:DataContext="{x:Static vm:Program.designVm}">
   <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
     <StackPanel>
-      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" Width="200" Height="100" TextWrapping="Wrap" AcceptsReturn="True" Margin="0,5,10,5" />
+      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" Width="200" Height="100" TextWrapping="Wrap"
+               AcceptsReturn="True" Margin="0,5,10,5" />
       <TextBlock Text="{Binding StatusMsg}" TextWrapping="Wrap" />
       <TextBlock Text="Clock (to show that dialogs do not block the dispatch loop):" />
       <TextBlock Text="{Binding CurrentTime}" />
@@ -22,4 +23,4 @@
       <Button Command="{Binding Load}" Content="Load" Height="20" Margin="0,5,10,5" Width="50" />
     </StackPanel>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/FileDialogs/MainWindow.xaml.cs b/src/Samples/Dynamic/FileDialogs/MainWindow.xaml.cs
new file mode 100644
index 00000000..472824c5
--- /dev/null
+++ b/src/Samples/Dynamic/FileDialogs/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogs;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj b/src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
similarity index 72%
rename from src/Samples/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
rename to src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
+++ b/src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/FileDialogsCmdMsg.Core/Program.fs b/src/Samples/Dynamic/FileDialogsCmdMsg.Core/Program.fs
similarity index 100%
rename from src/Samples/FileDialogsCmdMsg.Core/Program.fs
rename to src/Samples/Dynamic/FileDialogsCmdMsg.Core/Program.fs
diff --git a/src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml b/src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml
new file mode 100644
index 00000000..c3a8191a
--- /dev/null
+++ b/src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.FileDialogsCmdMsg.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml.cs b/src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml.cs
new file mode 100644
index 00000000..5af8c368
--- /dev/null
+++ b/src/Samples/Dynamic/FileDialogsCmdMsg/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogsCmdMsg;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj b/src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
similarity index 93%
rename from src/Samples/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
rename to src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
index 63ea98ce..62fbf792 100644
--- a/src/Samples/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
+++ b/src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FileDialogsCmdMsg.Core\FileDialogsCmdMsg.Core.fsproj" />
+    <ProjectReference Include="..\FileDialogsCmdMsg.Core\FileDialogsCmdMsg.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/FileDialogsCmdMsg/MainWindow.xaml b/src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml
similarity index 91%
rename from src/Samples/FileDialogsCmdMsg/MainWindow.xaml
rename to src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml
index 642ff1e9..64cb682e 100644
--- a/src/Samples/FileDialogsCmdMsg/MainWindow.xaml
+++ b/src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml
@@ -12,7 +12,8 @@
         d:DataContext="{x:Static vm:Program.designVm}">
   <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
     <StackPanel>
-      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" Width="200" Height="100" TextWrapping="Wrap" AcceptsReturn="True" Margin="0,5,10,5" />
+      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" Width="200" Height="100" TextWrapping="Wrap"
+               AcceptsReturn="True" Margin="0,5,10,5" />
       <TextBlock Text="{Binding StatusMsg}" TextWrapping="Wrap" />
       <TextBlock Text="Clock (to show that dialogs do not block the dispatch loop):" />
       <TextBlock Text="{Binding CurrentTime}" />
@@ -22,4 +23,4 @@
       <Button Command="{Binding Load}" Content="Load" Height="20" Margin="0,5,10,5" Width="50" />
     </StackPanel>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml.cs b/src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml.cs
new file mode 100644
index 00000000..2186f6cd
--- /dev/null
+++ b/src/Samples/Dynamic/FileDialogsCmdMsg/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogsCmdMsg;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Multiselect.Core/Multiselect.Core.fsproj b/src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj
similarity index 72%
rename from src/Samples/Multiselect.Core/Multiselect.Core.fsproj
rename to src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/Multiselect.Core/Multiselect.Core.fsproj
+++ b/src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Multiselect.Core/Program.fs b/src/Samples/Dynamic/Multiselect.Core/Program.fs
similarity index 100%
rename from src/Samples/Multiselect.Core/Program.fs
rename to src/Samples/Dynamic/Multiselect.Core/Program.fs
diff --git a/src/Samples/Multiselect/App.xaml b/src/Samples/Dynamic/Multiselect/App.xaml
similarity index 95%
rename from src/Samples/Multiselect/App.xaml
rename to src/Samples/Dynamic/Multiselect/App.xaml
index eafb156d..4ff3036f 100644
--- a/src/Samples/Multiselect/App.xaml
+++ b/src/Samples/Dynamic/Multiselect/App.xaml
@@ -4,4 +4,4 @@
              StartupUri="MainWindow.xaml">
   <Application.Resources>
   </Application.Resources>
-</Application>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Multiselect/App.xaml.cs b/src/Samples/Dynamic/Multiselect/App.xaml.cs
new file mode 100644
index 00000000..52e41913
--- /dev/null
+++ b/src/Samples/Dynamic/Multiselect/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Multiselect;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Multiselect/MainWindow.xaml b/src/Samples/Dynamic/Multiselect/MainWindow.xaml
similarity index 83%
rename from src/Samples/Multiselect/MainWindow.xaml
rename to src/Samples/Dynamic/Multiselect/MainWindow.xaml
index 54717138..de9ce9f9 100644
--- a/src/Samples/Multiselect/MainWindow.xaml
+++ b/src/Samples/Dynamic/Multiselect/MainWindow.xaml
@@ -14,17 +14,20 @@
   <Window.Resources>
     <ObjectDataProvider x:Key="dataFromEnum" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
       <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="SelectionMode"/>
+        <x:Type TypeName="SelectionMode" />
       </ObjectDataProvider.MethodParameters>
     </ObjectDataProvider>
   </Window.Resources>
   <StackPanel Margin="0,15,0,0">
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Command="{Binding SelectRandom}" Content="Select random" Margin="5 5" Width="100"/>
-      <Button Command="{Binding Deselect}" Content="Deselect" Margin="5 5" Width="100"/>
-      <ComboBox x:Name="SelectionModeComboBox" ItemsSource="{Binding Source={StaticResource dataFromEnum}}" SelectedIndex="2" />
+      <Button Command="{Binding SelectRandom}" Content="Select random" Margin="5 5" Width="100" />
+      <Button Command="{Binding Deselect}" Content="Deselect" Margin="5 5" Width="100" />
+      <ComboBox x:Name="SelectionModeComboBox" ItemsSource="{Binding Source={StaticResource dataFromEnum}}"
+                SelectedIndex="2" />
     </StackPanel>
-    <ListBox ItemsSource="{Binding Entities}" SelectionMode="{Binding ElementName=SelectionModeComboBox, Path=SelectedItem}" HorizontalContentAlignment="Center">
+    <ListBox ItemsSource="{Binding Entities}"
+             SelectionMode="{Binding ElementName=SelectionModeComboBox, Path=SelectedItem}"
+             HorizontalContentAlignment="Center">
       <ListBox.Resources>
         <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
           <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
diff --git a/src/Samples/Dynamic/Multiselect/MainWindow.xaml.cs b/src/Samples/Dynamic/Multiselect/MainWindow.xaml.cs
new file mode 100644
index 00000000..8c33fdcc
--- /dev/null
+++ b/src/Samples/Dynamic/Multiselect/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Multiselect;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Multiselect/Multiselect.csproj b/src/Samples/Dynamic/Multiselect/Multiselect.csproj
similarity index 96%
rename from src/Samples/Multiselect/Multiselect.csproj
rename to src/Samples/Dynamic/Multiselect/Multiselect.csproj
index b9b96958..948bf785 100644
--- a/src/Samples/Multiselect/Multiselect.csproj
+++ b/src/Samples/Dynamic/Multiselect/Multiselect.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Multiselect.Core\Multiselect.Core.fsproj" />
+    <ProjectReference Include="..\Multiselect.Core\Multiselect.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/NewWindow.Core/App.fs b/src/Samples/Dynamic/NewWindow.Core/App.fs
similarity index 100%
rename from src/Samples/NewWindow.Core/App.fs
rename to src/Samples/Dynamic/NewWindow.Core/App.fs
diff --git a/src/Samples/NewWindow.Core/AutoOpen.fs b/src/Samples/Dynamic/NewWindow.Core/AutoOpen.fs
similarity index 100%
rename from src/Samples/NewWindow.Core/AutoOpen.fs
rename to src/Samples/Dynamic/NewWindow.Core/AutoOpen.fs
diff --git a/src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj b/src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj
new file mode 100644
index 00000000..7cb0b583
--- /dev/null
+++ b/src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="AutoOpen.fs"/>
+    <Compile Include="Window1.fs"/>
+    <Compile Include="Window2.fs"/>
+    <Compile Include="App.fs"/>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Samples/NewWindow.Core/Program.fs b/src/Samples/Dynamic/NewWindow.Core/Program.fs
similarity index 100%
rename from src/Samples/NewWindow.Core/Program.fs
rename to src/Samples/Dynamic/NewWindow.Core/Program.fs
diff --git a/src/Samples/NewWindow.Core/Window1.fs b/src/Samples/Dynamic/NewWindow.Core/Window1.fs
similarity index 100%
rename from src/Samples/NewWindow.Core/Window1.fs
rename to src/Samples/Dynamic/NewWindow.Core/Window1.fs
diff --git a/src/Samples/NewWindow.Core/Window2.fs b/src/Samples/Dynamic/NewWindow.Core/Window2.fs
similarity index 100%
rename from src/Samples/NewWindow.Core/Window2.fs
rename to src/Samples/Dynamic/NewWindow.Core/Window2.fs
diff --git a/src/Samples/Dynamic/NewWindow/App.xaml b/src/Samples/Dynamic/NewWindow/App.xaml
new file mode 100644
index 00000000..1982a823
--- /dev/null
+++ b/src/Samples/Dynamic/NewWindow/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Elmish.WPF.Samples.NewWindow.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml"
+             ShutdownMode="OnMainWindowClose">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/NewWindow/App.xaml.cs b/src/Samples/Dynamic/NewWindow/App.xaml.cs
new file mode 100644
index 00000000..a6171b85
--- /dev/null
+++ b/src/Samples/Dynamic/NewWindow/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow, () => new Window1(), () => new Window2());
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/NewWindow/MainWindow.xaml b/src/Samples/Dynamic/NewWindow/MainWindow.xaml
similarity index 86%
rename from src/Samples/NewWindow/MainWindow.xaml
rename to src/Samples/Dynamic/NewWindow/MainWindow.xaml
index 14423d8f..77fb0fd7 100644
--- a/src/Samples/NewWindow/MainWindow.xaml
+++ b/src/Samples/Dynamic/NewWindow/MainWindow.xaml
@@ -12,14 +12,13 @@
         d:DataContext="{x:Static vm:AppModule.designVm}">
   <Window.Resources>
     <ResourceDictionary>
-      <BooleanToVisibilityConverter x:Key="VisibilityConverter" />
     </ResourceDictionary>
   </Window.Resources>
   <StackPanel VerticalAlignment="Center">
     <TextBlock HorizontalAlignment="Center" FontWeight="Bold">Window 1</TextBlock>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Command="{Binding Window1Show}"  Content="Show"  Width="70" Margin="5" />
-      <Button Command="{Binding Window1Hide}"  Content="Hide"  Width="70" Margin="5" />
+      <Button Command="{Binding Window1Show}" Content="Show" Width="70" Margin="5" />
+      <Button Command="{Binding Window1Hide}" Content="Hide" Width="70" Margin="5" />
       <Button Command="{Binding Window1Close}" Content="Close" Width="70" Margin="5" />
     </StackPanel>
     <TextBlock HorizontalAlignment="Center" FontWeight="Bold" Margin="0 10 0 0">Window 2</TextBlock>
diff --git a/src/Samples/Dynamic/NewWindow/MainWindow.xaml.cs b/src/Samples/Dynamic/NewWindow/MainWindow.xaml.cs
new file mode 100644
index 00000000..5635359e
--- /dev/null
+++ b/src/Samples/Dynamic/NewWindow/MainWindow.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void CounterWithClock_Loaded(object sender, RoutedEventArgs e)
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/NewWindow/NewWindow.csproj b/src/Samples/Dynamic/NewWindow/NewWindow.csproj
similarity index 94%
rename from src/Samples/NewWindow/NewWindow.csproj
rename to src/Samples/Dynamic/NewWindow/NewWindow.csproj
index e109d2cd..514bead8 100644
--- a/src/Samples/NewWindow/NewWindow.csproj
+++ b/src/Samples/Dynamic/NewWindow/NewWindow.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NewWindow.Core\NewWindow.Core.fsproj" />
+    <ProjectReference Include="..\NewWindow.Core\NewWindow.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/NewWindow/Window1.xaml b/src/Samples/Dynamic/NewWindow/Window1.xaml
similarity index 100%
rename from src/Samples/NewWindow/Window1.xaml
rename to src/Samples/Dynamic/NewWindow/Window1.xaml
diff --git a/src/Samples/Dynamic/NewWindow/Window1.xaml.cs b/src/Samples/Dynamic/NewWindow/Window1.xaml.cs
new file mode 100644
index 00000000..fa874aaa
--- /dev/null
+++ b/src/Samples/Dynamic/NewWindow/Window1.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class Window1 : Window
+{
+    public Window1()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/NewWindow/Window2.xaml b/src/Samples/Dynamic/NewWindow/Window2.xaml
similarity index 94%
rename from src/Samples/NewWindow/Window2.xaml
rename to src/Samples/Dynamic/NewWindow/Window2.xaml
index a45bedeb..6317824c 100644
--- a/src/Samples/NewWindow/Window2.xaml
+++ b/src/Samples/Dynamic/NewWindow/Window2.xaml
@@ -12,7 +12,7 @@
         d:DataContext="{x:Static vm:Window2Module.designVm}">
   <i:Interaction.Triggers>
     <i:EventTrigger EventName="Closing">
-      <i:InvokeCommandAction Command="{Binding Close}"/>
+      <i:InvokeCommandAction Command="{Binding Close}" />
     </i:EventTrigger>
   </i:Interaction.Triggers>
   <StackPanel VerticalAlignment="Center" Width="400">
@@ -25,7 +25,7 @@
       show a message to the user (you could, for example, display form
       validation errors when submit is clicked.)
     </TextBlock>
-    <TextBlock TextWrapping="Wrap" Margin="0 5 0 0" >
+    <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
       The window can be closed in three ways:
     </TextBlock>
     <TextBlock TextWrapping="Wrap" Margin="15 0 0 0">
@@ -34,7 +34,7 @@
     <TextBlock TextWrapping="Wrap" Margin="15 0 0 0">
       – Clicking Cancel (or Esc, since the button has IsCancel=true)
     </TextBlock>
-    <TextBlock TextWrapping="Wrap" Margin="15 0 0 0" >
+    <TextBlock TextWrapping="Wrap" Margin="15 0 0 0">
       – Externally: Close (X) button, Alt+F4, or System Menu -> Close
     </TextBlock>
     <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
diff --git a/src/Samples/Dynamic/NewWindow/Window2.xaml.cs b/src/Samples/Dynamic/NewWindow/Window2.xaml.cs
new file mode 100644
index 00000000..f718404e
--- /dev/null
+++ b/src/Samples/Dynamic/NewWindow/Window2.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class Window2 : Window
+{
+    public Window2()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/OneWaySeq.Core/OneWaySeq.Core.fsproj b/src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj
similarity index 72%
rename from src/Samples/OneWaySeq.Core/OneWaySeq.Core.fsproj
rename to src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/OneWaySeq.Core/OneWaySeq.Core.fsproj
+++ b/src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/OneWaySeq.Core/Program.fs b/src/Samples/Dynamic/OneWaySeq.Core/Program.fs
similarity index 100%
rename from src/Samples/OneWaySeq.Core/Program.fs
rename to src/Samples/Dynamic/OneWaySeq.Core/Program.fs
diff --git a/src/Samples/Dynamic/OneWaySeq/App.xaml b/src/Samples/Dynamic/OneWaySeq/App.xaml
new file mode 100644
index 00000000..3bfad125
--- /dev/null
+++ b/src/Samples/Dynamic/OneWaySeq/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.OneWaySeq.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/OneWaySeq/App.xaml.cs b/src/Samples/Dynamic/OneWaySeq/App.xaml.cs
new file mode 100644
index 00000000..aec2bfd5
--- /dev/null
+++ b/src/Samples/Dynamic/OneWaySeq/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.OneWaySeq;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/OneWaySeq/MainWindow.xaml b/src/Samples/Dynamic/OneWaySeq/MainWindow.xaml
similarity index 79%
rename from src/Samples/OneWaySeq/MainWindow.xaml
rename to src/Samples/Dynamic/OneWaySeq/MainWindow.xaml
index 7bf61917..e2a1e58d 100644
--- a/src/Samples/OneWaySeq/MainWindow.xaml
+++ b/src/Samples/Dynamic/OneWaySeq/MainWindow.xaml
@@ -12,9 +12,9 @@
         d:DataContext="{x:Static vm:Program.designVm}">
   <StackPanel>
     <TextBlock
-        Text="This sample shows the difference between Binding.oneWay and Binding.oneWaySeq. For oneWay, the whole ListView is re-rendered for every change. For oneWaySeq, only the new item is added."
-        Margin="10,20,10,10"
-        TextWrapping="Wrap" />
+      Text="This sample shows the difference between Binding.oneWay and Binding.oneWaySeq. For oneWay, the whole ListView is re-rendered for every change. For oneWaySeq, only the new item is added."
+      Margin="10,20,10,10"
+      TextWrapping="Wrap" />
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
       <StackPanel Margin="0,0,50,0">
         <TextBlock Text="Binding.oneWay" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,0,0,10" />
@@ -22,10 +22,11 @@
         <ListView ItemsSource="{Binding OneWayNumbers}" />
       </StackPanel>
       <StackPanel>
-        <TextBlock Text="Binding.oneWaySeq" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,0,0,10" />
+        <TextBlock Text="Binding.oneWaySeq" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center"
+                   Margin="0,0,0,10" />
         <Button Command="{Binding AddOneWaySeqNumber}" Content="Add number" Width="150" Margin="0,0,0,20" />
         <ListView ItemsSource="{Binding OneWaySeqNumbers}" />
       </StackPanel>
     </StackPanel>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/OneWaySeq/MainWindow.xaml.cs b/src/Samples/Dynamic/OneWaySeq/MainWindow.xaml.cs
new file mode 100644
index 00000000..74ee523f
--- /dev/null
+++ b/src/Samples/Dynamic/OneWaySeq/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.OneWaySeq;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/OneWaySeq/OneWaySeq.csproj b/src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj
similarity index 97%
rename from src/Samples/OneWaySeq/OneWaySeq.csproj
rename to src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj
index f1ebf0bc..c1f865d3 100644
--- a/src/Samples/OneWaySeq/OneWaySeq.csproj
+++ b/src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OneWaySeq.Core\OneWaySeq.Core.fsproj" />
+    <ProjectReference Include="..\OneWaySeq.Core\OneWaySeq.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/SingleCounter.Core/Program.fs b/src/Samples/Dynamic/SingleCounter.Core/Program.fs
similarity index 100%
rename from src/Samples/SingleCounter.Core/Program.fs
rename to src/Samples/Dynamic/SingleCounter.Core/Program.fs
diff --git a/src/Samples/SingleCounter.Core/SingleCounter.Core.fsproj b/src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj
similarity index 72%
rename from src/Samples/SingleCounter.Core/SingleCounter.Core.fsproj
rename to src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/SingleCounter.Core/SingleCounter.Core.fsproj
+++ b/src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/SingleCounter/App.xaml b/src/Samples/Dynamic/SingleCounter/App.xaml
new file mode 100644
index 00000000..b3b2594b
--- /dev/null
+++ b/src/Samples/Dynamic/SingleCounter/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SingleCounter.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SingleCounter/App.xaml.cs b/src/Samples/Dynamic/SingleCounter/App.xaml.cs
new file mode 100644
index 00000000..ccb07a59
--- /dev/null
+++ b/src/Samples/Dynamic/SingleCounter/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SingleCounter;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SingleCounter/MainWindow.xaml b/src/Samples/Dynamic/SingleCounter/MainWindow.xaml
similarity index 92%
rename from src/Samples/SingleCounter/MainWindow.xaml
rename to src/Samples/Dynamic/SingleCounter/MainWindow.xaml
index c5989c2f..4bbc765b 100644
--- a/src/Samples/SingleCounter/MainWindow.xaml
+++ b/src/Samples/Dynamic/SingleCounter/MainWindow.xaml
@@ -15,7 +15,8 @@
     <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
     <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
     <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
-    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100" Margin="0,5,10,5" />
+    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+            Width="100" Margin="0,5,10,5" />
     <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SingleCounter/MainWindow.xaml.cs b/src/Samples/Dynamic/SingleCounter/MainWindow.xaml.cs
new file mode 100644
index 00000000..460fc5ca
--- /dev/null
+++ b/src/Samples/Dynamic/SingleCounter/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SingleCounter;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SingleCounter/SingleCounter.csproj b/src/Samples/Dynamic/SingleCounter/SingleCounter.csproj
similarity index 95%
rename from src/Samples/SingleCounter/SingleCounter.csproj
rename to src/Samples/Dynamic/SingleCounter/SingleCounter.csproj
index 5d06951b..b720a6c0 100644
--- a/src/Samples/SingleCounter/SingleCounter.csproj
+++ b/src/Samples/Dynamic/SingleCounter/SingleCounter.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SingleCounter.Core\SingleCounter.Core.fsproj" />
+    <ProjectReference Include="..\SingleCounter.Core\SingleCounter.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Sticky.Core/Program.fs b/src/Samples/Dynamic/Sticky.Core/Program.fs
similarity index 100%
rename from src/Samples/Sticky.Core/Program.fs
rename to src/Samples/Dynamic/Sticky.Core/Program.fs
diff --git a/src/Samples/Sticky.Core/Sticky.Core.fsproj b/src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj
similarity index 72%
rename from src/Samples/Sticky.Core/Sticky.Core.fsproj
rename to src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/Sticky.Core/Sticky.Core.fsproj
+++ b/src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Sticky/App.xaml b/src/Samples/Dynamic/Sticky/App.xaml
similarity index 100%
rename from src/Samples/Sticky/App.xaml
rename to src/Samples/Dynamic/Sticky/App.xaml
diff --git a/src/Samples/Dynamic/Sticky/App.xaml.cs b/src/Samples/Dynamic/Sticky/App.xaml.cs
new file mode 100644
index 00000000..da76cbed
--- /dev/null
+++ b/src/Samples/Dynamic/Sticky/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Sticky;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Sticky/MainWindow.xaml b/src/Samples/Dynamic/Sticky/MainWindow.xaml
similarity index 92%
rename from src/Samples/Sticky/MainWindow.xaml
rename to src/Samples/Dynamic/Sticky/MainWindow.xaml
index 95ce2a9c..cfa4a233 100644
--- a/src/Samples/Sticky/MainWindow.xaml
+++ b/src/Samples/Dynamic/Sticky/MainWindow.xaml
@@ -11,14 +11,15 @@
         mc:Ignorable="d"
         d:DataContext="{x:Static vm:Program.designVm}">
   <StackPanel Orientation="Vertical">
-    <TextBlock Text="The counter value binding is sticky to even numbers"/>
+    <TextBlock Text="The counter value binding is sticky to even numbers" />
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
       <TextBlock Text="{Binding CounterValue, StringFormat='Counter value: {0}'}" Width="110" Margin="0,5,10,5" />
       <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
       <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
       <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
-      <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100" Margin="0,5,10,5" />
+      <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+              Width="100" Margin="0,5,10,5" />
       <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
     </StackPanel>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Sticky/MainWindow.xaml.cs b/src/Samples/Dynamic/Sticky/MainWindow.xaml.cs
new file mode 100644
index 00000000..7ce284bb
--- /dev/null
+++ b/src/Samples/Dynamic/Sticky/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Sticky;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Sticky/Sticky.csproj b/src/Samples/Dynamic/Sticky/Sticky.csproj
similarity index 98%
rename from src/Samples/Sticky/Sticky.csproj
rename to src/Samples/Dynamic/Sticky/Sticky.csproj
index 5e9ebe83..c453e405 100644
--- a/src/Samples/Sticky/Sticky.csproj
+++ b/src/Samples/Dynamic/Sticky/Sticky.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Sticky.Core\Sticky.Core.fsproj" />
+    <ProjectReference Include="..\Sticky.Core\Sticky.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/SubModel.Core/Program.fs b/src/Samples/Dynamic/SubModel.Core/Program.fs
similarity index 100%
rename from src/Samples/SubModel.Core/Program.fs
rename to src/Samples/Dynamic/SubModel.Core/Program.fs
diff --git a/src/Samples/SubModel.Core/SubModel.Core.fsproj b/src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj
similarity index 72%
rename from src/Samples/SubModel.Core/SubModel.Core.fsproj
rename to src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/SubModel.Core/SubModel.Core.fsproj
+++ b/src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/SubModel/App.xaml b/src/Samples/Dynamic/SubModel/App.xaml
new file mode 100644
index 00000000..ad187d0a
--- /dev/null
+++ b/src/Samples/Dynamic/SubModel/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModel.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModel/App.xaml.cs b/src/Samples/Dynamic/SubModel/App.xaml.cs
new file mode 100644
index 00000000..9953023e
--- /dev/null
+++ b/src/Samples/Dynamic/SubModel/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModel;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModel/Clock.xaml b/src/Samples/Dynamic/SubModel/Clock.xaml
similarity index 72%
rename from src/Samples/SubModel/Clock.xaml
rename to src/Samples/Dynamic/SubModel/Clock.xaml
index 443146a5..79641d73 100644
--- a/src/Samples/SubModel/Clock.xaml
+++ b/src/Samples/Dynamic/SubModel/Clock.xaml
@@ -7,8 +7,10 @@
              mc:Ignorable="d"
              d:DataContext="{x:Static vm:Program.clockDesignVm}">
   <StackPanel Orientation="Horizontal">
-    <TextBlock Text="{Binding Time, StringFormat='Today is {0:MMMM dd, yyyy}. The time is {0:HH:mm:ssK}. It is {0:dddd}.'}" />
-    <RadioButton Command="{Binding SetLocal}" IsChecked="{Binding IsLocal, Mode=OneWay}" Content="Local" Margin="10,0,0,0"/>
-    <RadioButton Command="{Binding SetUtc}" IsChecked="{Binding IsUtc, Mode=OneWay}" Content="Utc" Margin="10,0,0,0"/>
+    <TextBlock
+      Text="{Binding Time, StringFormat='Today is {0:MMMM dd, yyyy}. The time is {0:HH:mm:ssK}. It is {0:dddd}.'}" />
+    <RadioButton Command="{Binding SetLocal}" IsChecked="{Binding IsLocal, Mode=OneWay}" Content="Local"
+                 Margin="10,0,0,0" />
+    <RadioButton Command="{Binding SetUtc}" IsChecked="{Binding IsUtc, Mode=OneWay}" Content="Utc" Margin="10,0,0,0" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModel/Clock.xaml.cs b/src/Samples/Dynamic/SubModel/Clock.xaml.cs
new file mode 100644
index 00000000..b962a88c
--- /dev/null
+++ b/src/Samples/Dynamic/SubModel/Clock.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModel;
+
+public partial class Clock : UserControl
+{
+    public Clock()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModel/Counter.xaml b/src/Samples/Dynamic/SubModel/Counter.xaml
similarity index 92%
rename from src/Samples/SubModel/Counter.xaml
rename to src/Samples/Dynamic/SubModel/Counter.xaml
index 11896cd9..1f351431 100644
--- a/src/Samples/SubModel/Counter.xaml
+++ b/src/Samples/Dynamic/SubModel/Counter.xaml
@@ -11,7 +11,8 @@
     <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
     <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
     <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
-    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100" Margin="0,5,10,5" />
+    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+            Width="100" Margin="0,5,10,5" />
     <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModel/Counter.xaml.cs b/src/Samples/Dynamic/SubModel/Counter.xaml.cs
new file mode 100644
index 00000000..89772293
--- /dev/null
+++ b/src/Samples/Dynamic/SubModel/Counter.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModel;
+
+public partial class Counter : UserControl
+{
+    public Counter()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModel/CounterWithClock.xaml b/src/Samples/Dynamic/SubModel/CounterWithClock.xaml
similarity index 59%
rename from src/Samples/SubModel/CounterWithClock.xaml
rename to src/Samples/Dynamic/SubModel/CounterWithClock.xaml
index d7fa2ebf..70fb5ee6 100644
--- a/src/Samples/SubModel/CounterWithClock.xaml
+++ b/src/Samples/Dynamic/SubModel/CounterWithClock.xaml
@@ -8,7 +8,11 @@
              mc:Ignorable="d"
              d:DataContext="{x:Static vm:Program.counterWithClockDesignVm}">
   <StackPanel>
-    <local:Counter DataContext="{Binding Counter}" d:DataContext="{Binding DataContext.Counter, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Center" />
-    <local:Clock DataContext="{Binding Clock}" d:DataContext="{Binding DataContext.Clock, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Center" />
+    <local:Counter DataContext="{Binding Counter}"
+                   d:DataContext="{Binding DataContext.Counter, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                   HorizontalAlignment="Center" />
+    <local:Clock DataContext="{Binding Clock}"
+                 d:DataContext="{Binding DataContext.Clock, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                 HorizontalAlignment="Center" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModel/CounterWithClock.xaml.cs b/src/Samples/Dynamic/SubModel/CounterWithClock.xaml.cs
new file mode 100644
index 00000000..ac049adf
--- /dev/null
+++ b/src/Samples/Dynamic/SubModel/CounterWithClock.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModel;
+
+public partial class CounterWithClock : UserControl
+{
+    public CounterWithClock()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModel/MainWindow.xaml b/src/Samples/Dynamic/SubModel/MainWindow.xaml
similarity index 68%
rename from src/Samples/SubModel/MainWindow.xaml
rename to src/Samples/Dynamic/SubModel/MainWindow.xaml
index 96aa7dd0..81fce09c 100644
--- a/src/Samples/SubModel/MainWindow.xaml
+++ b/src/Samples/Dynamic/SubModel/MainWindow.xaml
@@ -12,9 +12,13 @@
         mc:Ignorable="d"
         d:DataContext="{x:Static vm:Program.mainDesignVm}">
   <StackPanel>
-    <TextBlock Text="Counter with clock 1" FontSize="18" FontWeight="Bold" Margin="0,25,0,0" HorizontalAlignment="Center" />
-    <local:CounterWithClock DataContext="{Binding ClockCounter1}" d:DataContext="{Binding DataContext.ClockCounter1, RelativeSource={RelativeSource AncestorType=StackPanel}}"/>
-    <TextBlock Text="Counter with clock 2" FontSize="18" FontWeight="Bold" Margin="0,25,0,0" HorizontalAlignment="Center" />
-    <local:CounterWithClock DataContext="{Binding ClockCounter2}" d:DataContext="{Binding DataContext.ClockCounter2, RelativeSource={RelativeSource AncestorType=StackPanel}}"/>
+    <TextBlock Text="Counter with clock 1" FontSize="18" FontWeight="Bold" Margin="0,25,0,0"
+               HorizontalAlignment="Center" />
+    <local:CounterWithClock DataContext="{Binding ClockCounter1}"
+                            d:DataContext="{Binding DataContext.ClockCounter1, RelativeSource={RelativeSource AncestorType=StackPanel}}" />
+    <TextBlock Text="Counter with clock 2" FontSize="18" FontWeight="Bold" Margin="0,25,0,0"
+               HorizontalAlignment="Center" />
+    <local:CounterWithClock DataContext="{Binding ClockCounter2}"
+                            d:DataContext="{Binding DataContext.ClockCounter2, RelativeSource={RelativeSource AncestorType=StackPanel}}" />
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModel/MainWindow.xaml.cs b/src/Samples/Dynamic/SubModel/MainWindow.xaml.cs
new file mode 100644
index 00000000..b3cde925
--- /dev/null
+++ b/src/Samples/Dynamic/SubModel/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModel;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModel/SubModel.csproj b/src/Samples/Dynamic/SubModel/SubModel.csproj
similarity index 97%
rename from src/Samples/SubModel/SubModel.csproj
rename to src/Samples/Dynamic/SubModel/SubModel.csproj
index 832926c6..9a004d23 100644
--- a/src/Samples/SubModel/SubModel.csproj
+++ b/src/Samples/Dynamic/SubModel/SubModel.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SubModel.Core\SubModel.Core.fsproj" />
+    <ProjectReference Include="..\SubModel.Core\SubModel.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/SubModelOpt.Core/Program.fs b/src/Samples/Dynamic/SubModelOpt.Core/Program.fs
similarity index 100%
rename from src/Samples/SubModelOpt.Core/Program.fs
rename to src/Samples/Dynamic/SubModelOpt.Core/Program.fs
diff --git a/src/Samples/SubModelOpt.Core/SubModelOpt.Core.fsproj b/src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj
similarity index 72%
rename from src/Samples/SubModelOpt.Core/SubModelOpt.Core.fsproj
rename to src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/SubModelOpt.Core/SubModelOpt.Core.fsproj
+++ b/src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/SubModelOpt/App.xaml b/src/Samples/Dynamic/SubModelOpt/App.xaml
new file mode 100644
index 00000000..a628a7e6
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelOpt/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelOpt.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelOpt/App.xaml.cs b/src/Samples/Dynamic/SubModelOpt/App.xaml.cs
new file mode 100644
index 00000000..09b0faf6
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelOpt/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelOpt/Form1.xaml b/src/Samples/Dynamic/SubModelOpt/Form1.xaml
similarity index 88%
rename from src/Samples/SubModelOpt/Form1.xaml
rename to src/Samples/Dynamic/SubModelOpt/Form1.xaml
index 3ebad21d..0e8d834d 100644
--- a/src/Samples/SubModelOpt/Form1.xaml
+++ b/src/Samples/Dynamic/SubModelOpt/Form1.xaml
@@ -9,7 +9,8 @@
              d:DataContext="{x:Static vm:Program.form1DesignVm}">
   <StackPanel Width="300">
     <TextBlock Text="Form 1" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,0,0,5" />
-    <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" Height="80" Margin="0,5,0,5" />
+    <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True"
+             Height="80" Margin="0,5,0,5" />
     <Button Command="{Binding Submit}" Content="Submit" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelOpt/Form1.xaml.cs b/src/Samples/Dynamic/SubModelOpt/Form1.xaml.cs
new file mode 100644
index 00000000..0144e363
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelOpt/Form1.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class Form1 : UserControl
+{
+    public Form1()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelOpt/Form2.xaml b/src/Samples/Dynamic/SubModelOpt/Form2.xaml
similarity index 98%
rename from src/Samples/SubModelOpt/Form2.xaml
rename to src/Samples/Dynamic/SubModelOpt/Form2.xaml
index bf72a029..fed9cb56 100644
--- a/src/Samples/SubModelOpt/Form2.xaml
+++ b/src/Samples/Dynamic/SubModelOpt/Form2.xaml
@@ -13,4 +13,4 @@
     <TextBox Text="{Binding Text2, UpdateSourceTrigger=PropertyChanged}" Margin="0,5,0,5" />
     <Button Command="{Binding Submit}" Content="Submit" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelOpt/Form2.xaml.cs b/src/Samples/Dynamic/SubModelOpt/Form2.xaml.cs
new file mode 100644
index 00000000..ed7bd00c
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelOpt/Form2.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class Form2 : UserControl
+{
+    public Form2()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelOpt/MainWindow.xaml b/src/Samples/Dynamic/SubModelOpt/MainWindow.xaml
similarity index 68%
rename from src/Samples/SubModelOpt/MainWindow.xaml
rename to src/Samples/Dynamic/SubModelOpt/MainWindow.xaml
index 47998f77..133fcaf2 100644
--- a/src/Samples/SubModelOpt/MainWindow.xaml
+++ b/src/Samples/Dynamic/SubModelOpt/MainWindow.xaml
@@ -22,29 +22,29 @@
       <Button Command="{Binding ShowForm2}" Content="Show form 2" Width="200" Margin="0,5,0,5" />
     </StackPanel>
     <Rectangle
-        Fill="Black"
-        Opacity="0.6"
-        Visibility="{Binding DialogVisible, Converter={StaticResource VisibilityConverter}}" />
+      Fill="Black"
+      Opacity="0.6"
+      Visibility="{Binding DialogVisible, Converter={StaticResource VisibilityConverter}}" />
     <Border
-        BorderBrush="Black"
-        BorderThickness="2"
-        Width="350"
-        Height="200"
-        Visibility="{Binding DialogVisible, Converter={StaticResource VisibilityConverter}}">
+      BorderBrush="Black"
+      BorderThickness="2"
+      Width="350"
+      Height="200"
+      Visibility="{Binding DialogVisible, Converter={StaticResource VisibilityConverter}}">
       <StackPanel Background="White">
         <local:Form1
-            DataContext="{Binding Form1}"
-            d:DataContext="{Binding DataContext.Form1, RelativeSource={RelativeSource AncestorType=StackPanel}}"
-            Visibility="{Binding DataContext.Form1Visible,
+          DataContext="{Binding Form1}"
+          d:DataContext="{Binding DataContext.Form1, RelativeSource={RelativeSource AncestorType=StackPanel}}"
+          Visibility="{Binding DataContext.Form1Visible,
                          RelativeSource={RelativeSource AncestorType=StackPanel},
                          Converter={StaticResource VisibilityConverter}}" />
         <local:Form2
-            DataContext="{Binding Form2}"
-            d:DataContext="{Binding DataContext.Form2, RelativeSource={RelativeSource AncestorType=StackPanel}}"
-            Visibility="{Binding DataContext.Form2Visible,
+          DataContext="{Binding Form2}"
+          d:DataContext="{Binding DataContext.Form2, RelativeSource={RelativeSource AncestorType=StackPanel}}"
+          Visibility="{Binding DataContext.Form2Visible,
                          RelativeSource={RelativeSource AncestorType=StackPanel},
                          Converter={StaticResource VisibilityConverter}}" />
       </StackPanel>
     </Border>
   </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelOpt/MainWindow.xaml.cs b/src/Samples/Dynamic/SubModelOpt/MainWindow.xaml.cs
new file mode 100644
index 00000000..8adcd032
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelOpt/MainWindow.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void CounterWithClock_Loaded(object sender, RoutedEventArgs e)
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelOpt/SubModelOpt.csproj b/src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj
similarity index 96%
rename from src/Samples/SubModelOpt/SubModelOpt.csproj
rename to src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj
index 7e7e801a..d8a9d392 100644
--- a/src/Samples/SubModelOpt/SubModelOpt.csproj
+++ b/src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SubModelOpt.Core\SubModelOpt.Core.fsproj" />
+    <ProjectReference Include="..\SubModelOpt.Core\SubModelOpt.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/SubModelSelectedItem.Core/Program.fs b/src/Samples/Dynamic/SubModelSelectedItem.Core/Program.fs
similarity index 100%
rename from src/Samples/SubModelSelectedItem.Core/Program.fs
rename to src/Samples/Dynamic/SubModelSelectedItem.Core/Program.fs
diff --git a/src/Samples/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj b/src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
similarity index 72%
rename from src/Samples/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
rename to src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
+++ b/src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/SubModelSelectedItem/App.xaml b/src/Samples/Dynamic/SubModelSelectedItem/App.xaml
new file mode 100644
index 00000000..7aa226ac
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSelectedItem/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelSelectedItem.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelSelectedItem/App.xaml.cs b/src/Samples/Dynamic/SubModelSelectedItem/App.xaml.cs
new file mode 100644
index 00000000..2339da83
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSelectedItem/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSelectedItem;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelSelectedItem/MainWindow.xaml b/src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml
similarity index 94%
rename from src/Samples/SubModelSelectedItem/MainWindow.xaml
rename to src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml
index a2702e7c..73f29955 100644
--- a/src/Samples/SubModelSelectedItem/MainWindow.xaml
+++ b/src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml
@@ -15,7 +15,8 @@
       <Button Command="{Binding SelectRandom}" Margin="5 5" Width="100">Select random</Button>
       <Button Command="{Binding Deselect}" Margin="5 5" Width="100">Deselect</Button>
     </StackPanel>
-    <ListView ItemsSource="{Binding Entities}" SelectedItem="{Binding SelectedEntity}" HorizontalContentAlignment="Center">
+    <ListView ItemsSource="{Binding Entities}" SelectedItem="{Binding SelectedEntity}"
+              HorizontalContentAlignment="Center">
       <ItemsControl.ItemTemplate>
         <DataTemplate>
           <StackPanel Orientation="Horizontal">
@@ -26,4 +27,4 @@
       </ItemsControl.ItemTemplate>
     </ListView>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml.cs b/src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml.cs
new file mode 100644
index 00000000..5ccb3f81
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSelectedItem/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSelectedItem;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelSelectedItem/SubModelSelectedItem.csproj b/src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj
similarity index 91%
rename from src/Samples/SubModelSelectedItem/SubModelSelectedItem.csproj
rename to src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj
index 4549e3fa..0849a120 100644
--- a/src/Samples/SubModelSelectedItem/SubModelSelectedItem.csproj
+++ b/src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj" />
+    <ProjectReference Include="..\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/SubModelSeq.Core/Program.fs b/src/Samples/Dynamic/SubModelSeq.Core/Program.fs
similarity index 100%
rename from src/Samples/SubModelSeq.Core/Program.fs
rename to src/Samples/Dynamic/SubModelSeq.Core/Program.fs
diff --git a/src/Samples/SubModelSeq.Core/SubModelSeq.Core.fsproj b/src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj
similarity index 72%
rename from src/Samples/SubModelSeq.Core/SubModelSeq.Core.fsproj
rename to src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/SubModelSeq.Core/SubModelSeq.Core.fsproj
+++ b/src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/SubModelSeq/App.xaml b/src/Samples/Dynamic/SubModelSeq/App.xaml
new file mode 100644
index 00000000..5ef8de5b
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSeq/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelSeq.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelSeq/App.xaml.cs b/src/Samples/Dynamic/SubModelSeq/App.xaml.cs
new file mode 100644
index 00000000..c3b73409
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSeq/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSeq;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelSeq/Counter.xaml b/src/Samples/Dynamic/SubModelSeq/Counter.xaml
similarity index 92%
rename from src/Samples/SubModelSeq/Counter.xaml
rename to src/Samples/Dynamic/SubModelSeq/Counter.xaml
index 89c609b8..5a195a5c 100644
--- a/src/Samples/SubModelSeq/Counter.xaml
+++ b/src/Samples/Dynamic/SubModelSeq/Counter.xaml
@@ -12,6 +12,7 @@
     <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
     <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
     <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
-    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100" Margin="0,5,10,5" />
+    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+            Width="100" Margin="0,5,10,5" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelSeq/Counter.xaml.cs b/src/Samples/Dynamic/SubModelSeq/Counter.xaml.cs
new file mode 100644
index 00000000..e5e21d83
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSeq/Counter.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelSeq;
+
+public partial class Counter : UserControl
+{
+    public Counter()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelSeq/MainWindow.xaml b/src/Samples/Dynamic/SubModelSeq/MainWindow.xaml
similarity index 91%
rename from src/Samples/SubModelSeq/MainWindow.xaml
rename to src/Samples/Dynamic/SubModelSeq/MainWindow.xaml
index d568eb9f..e2d3e07b 100644
--- a/src/Samples/SubModelSeq/MainWindow.xaml
+++ b/src/Samples/Dynamic/SubModelSeq/MainWindow.xaml
@@ -13,8 +13,8 @@
         d:DataContext="{x:Static vm:Program.mainDesignVm}">
   <Grid Margin="0,20,0,10">
     <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="*"/>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
     </Grid.RowDefinitions>
     <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
       <Button Command="{Binding AddCounter}" Content="Add counter" Width="150" Margin="10,0,10,20" />
@@ -23,22 +23,22 @@
     <TreeView Grid.Row="1" ItemsSource="{Binding Counters}">
       <TreeView.ItemContainerStyle>
         <Style TargetType="{x:Type TreeViewItem}">
-          <Setter Property="IsExpanded" Value="True"/>
+          <Setter Property="IsExpanded" Value="True" />
         </Style>
       </TreeView.ItemContainerStyle>
       <TreeView.ItemTemplate>
         <HierarchicalDataTemplate ItemsSource="{Binding ChildCounters}">
           <StackPanel Orientation="Horizontal">
             <TextBlock Text="{Binding CounterIdText}" Width="250" Margin="10,5,10,5" />
-            <local:Counter/>
+            <local:Counter />
             <Button Command="{Binding AddChild}" Content="Add child" Margin="0,5,10,5" />
             <Button Command="{Binding Remove}" Content="×" Margin="0,5,10,5" Width="20" />
             <Button Command="{Binding MoveUp}" Content="↑" Margin="0,5,10,5" Width="20" />
-            <Button Command="{Binding MoveDown}" Content="↓" Margin="0,5,10,5" Width="20"/>
+            <Button Command="{Binding MoveDown}" Content="↓" Margin="0,5,10,5" Width="20" />
             <TextBlock Text="{Binding GlobalState, StringFormat='Global state: {0}'}" Margin="10,5,10,5" />
           </StackPanel>
         </HierarchicalDataTemplate>
       </TreeView.ItemTemplate>
     </TreeView>
   </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/SubModelSeq/MainWindow.xaml.cs b/src/Samples/Dynamic/SubModelSeq/MainWindow.xaml.cs
new file mode 100644
index 00000000..b94b1adf
--- /dev/null
+++ b/src/Samples/Dynamic/SubModelSeq/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSeq;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelSeq/SubModelSeq.csproj b/src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj
similarity index 96%
rename from src/Samples/SubModelSeq/SubModelSeq.csproj
rename to src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj
index 4b28243d..0cc9aa54 100644
--- a/src/Samples/SubModelSeq/SubModelSeq.csproj
+++ b/src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SubModelSeq.Core\SubModelSeq.Core.fsproj" />
+    <ProjectReference Include="..\SubModelSeq.Core\SubModelSeq.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Threading.Core/Program.fs b/src/Samples/Dynamic/Threading.Core/Program.fs
similarity index 100%
rename from src/Samples/Threading.Core/Program.fs
rename to src/Samples/Dynamic/Threading.Core/Program.fs
diff --git a/src/Samples/Threading.Core/Threading.Core.fsproj b/src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj
similarity index 72%
rename from src/Samples/Threading.Core/Threading.Core.fsproj
rename to src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj
index 46a4ee00..47e4b937 100644
--- a/src/Samples/Threading.Core/Threading.Core.fsproj
+++ b/src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Samples/Threading/App.xaml b/src/Samples/Dynamic/Threading/App.xaml
similarity index 89%
rename from src/Samples/Threading/App.xaml
rename to src/Samples/Dynamic/Threading/App.xaml
index 4fee4579..43b2ae0e 100644
--- a/src/Samples/Threading/App.xaml
+++ b/src/Samples/Dynamic/Threading/App.xaml
@@ -2,5 +2,5 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-  <Application.Resources/>
+  <Application.Resources />
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Threading/App.xaml.cs b/src/Samples/Dynamic/Threading/App.xaml.cs
new file mode 100644
index 00000000..82987545
--- /dev/null
+++ b/src/Samples/Dynamic/Threading/App.xaml.cs
@@ -0,0 +1,31 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Threading;
+using Elmish.WPF.Samples.Threading;
+
+namespace Threading;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+        Exit += StopElmish;
+    }
+
+    private Thread? ElmishThread { get; set; }
+
+    private void StopElmish(object? sender, ExitEventArgs e)
+    {
+        Dispatcher.FromThread(ElmishThread)?.InvokeShutdown();
+        ElmishThread?.Join();
+    }
+
+    private void StartElmish(object? _1, EventArgs _2)
+    {
+        Activated -= StartElmish;
+        ElmishThread = Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Threading/MainWindow.xaml b/src/Samples/Dynamic/Threading/MainWindow.xaml
similarity index 87%
rename from src/Samples/Threading/MainWindow.xaml
rename to src/Samples/Dynamic/Threading/MainWindow.xaml
index 359f4b3a..40f40c13 100644
--- a/src/Samples/Threading/MainWindow.xaml
+++ b/src/Samples/Dynamic/Threading/MainWindow.xaml
@@ -9,13 +9,14 @@
         d:DataContext="{x:Static vm:Program.designVm}">
   <Grid>
     <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="300"/>
+      <ColumnDefinition Width="300" />
     </Grid.ColumnDefinitions>
     <StackPanel Grid.Column="0" Orientation="Vertical" Margin="12">
       <TextBlock Text="{Binding Pings, StringFormat='Seconds Since Startup: {0}'}" />
-      <TextBox Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True" Height="80" />
-      <Button Click="Button_Click" Content="Freeze UI 5 seconds"/>
-      <Button Click="Button2_Click" Content="Append number of seconds in 5 seconds"/>
+      <TextBox Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True"
+               Height="80" />
+      <Button Click="Button_Click" Content="Freeze UI 5 seconds" />
+      <Button Click="Button2_Click" Content="Append number of seconds in 5 seconds" />
     </StackPanel>
   </Grid>
 </Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Threading/MainWindow.xaml.cs b/src/Samples/Dynamic/Threading/MainWindow.xaml.cs
new file mode 100644
index 00000000..541b8d07
--- /dev/null
+++ b/src/Samples/Dynamic/Threading/MainWindow.xaml.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Threading;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        Task.Delay(5000).Wait();
+    }
+
+    private void Button2_Click(object sender, RoutedEventArgs e)
+    {
+        dynamic viewModel = DataContext;
+        Task.Delay(5000).ContinueWith(t => viewModel.Message = $"{viewModel.Message}{viewModel.Pings}");
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Threading/Threading.csproj b/src/Samples/Dynamic/Threading/Threading.csproj
similarity index 94%
rename from src/Samples/Threading/Threading.csproj
rename to src/Samples/Dynamic/Threading/Threading.csproj
index 76890b34..26382cc1 100644
--- a/src/Samples/Threading/Threading.csproj
+++ b/src/Samples/Dynamic/Threading/Threading.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Threading.Core\Threading.Core.fsproj" />
+    <ProjectReference Include="..\Threading.Core\Threading.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Samples/UiBoundCmdParam.Core/Program.fs b/src/Samples/Dynamic/UiBoundCmdParam.Core/Program.fs
similarity index 100%
rename from src/Samples/UiBoundCmdParam.Core/Program.fs
rename to src/Samples/Dynamic/UiBoundCmdParam.Core/Program.fs
diff --git a/src/Samples/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj b/src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
similarity index 72%
rename from src/Samples/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
rename to src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
+++ b/src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/UiBoundCmdParam/App.xaml b/src/Samples/Dynamic/UiBoundCmdParam/App.xaml
new file mode 100644
index 00000000..cf665ec1
--- /dev/null
+++ b/src/Samples/Dynamic/UiBoundCmdParam/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.UiBoundCmdParam.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/UiBoundCmdParam/App.xaml.cs b/src/Samples/Dynamic/UiBoundCmdParam/App.xaml.cs
new file mode 100644
index 00000000..bcf99d7a
--- /dev/null
+++ b/src/Samples/Dynamic/UiBoundCmdParam/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.UiBoundCmdParam;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/UiBoundCmdParam/MainWindow.xaml b/src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml
similarity index 93%
rename from src/Samples/UiBoundCmdParam/MainWindow.xaml
rename to src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml
index 132df622..9edce88b 100644
--- a/src/Samples/UiBoundCmdParam/MainWindow.xaml
+++ b/src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml
@@ -20,7 +20,8 @@
         Padding="5">
         <TextBlock Text="{Binding Limit, StringFormat='Disabled when selected item is &gt; {0}'}" />
       </Button>
-      <Slider Value="{Binding Limit}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100" Margin="0,5,10,5" />
+      <Slider Value="{Binding Limit}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100"
+              Margin="0,5,10,5" />
     </StackPanel>
     <ListView x:Name="List" ItemsSource="{Binding Numbers}" HorizontalContentAlignment="Center">
       <ItemsControl.ItemTemplate>
@@ -30,4 +31,4 @@
       </ItemsControl.ItemTemplate>
     </ListView>
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml.cs b/src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml.cs
new file mode 100644
index 00000000..260d1b51
--- /dev/null
+++ b/src/Samples/Dynamic/UiBoundCmdParam/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.UiBoundCmdParam;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/UiBoundCmdParam/UiBoundCmdParam.csproj b/src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj
similarity index 94%
rename from src/Samples/UiBoundCmdParam/UiBoundCmdParam.csproj
rename to src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj
index 7ed472e8..1396605d 100644
--- a/src/Samples/UiBoundCmdParam/UiBoundCmdParam.csproj
+++ b/src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\UiBoundCmdParam.Core\UiBoundCmdParam.Core.fsproj" />
+    <ProjectReference Include="..\UiBoundCmdParam.Core\UiBoundCmdParam.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Validation.Core/Program.fs b/src/Samples/Dynamic/Validation.Core/Program.fs
similarity index 100%
rename from src/Samples/Validation.Core/Program.fs
rename to src/Samples/Dynamic/Validation.Core/Program.fs
diff --git a/src/Samples/Validation.Core/Validation.Core.fsproj b/src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj
similarity index 72%
rename from src/Samples/Validation.Core/Validation.Core.fsproj
rename to src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/Validation.Core/Validation.Core.fsproj
+++ b/src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Dynamic/Validation/App.xaml b/src/Samples/Dynamic/Validation/App.xaml
new file mode 100644
index 00000000..8493d19c
--- /dev/null
+++ b/src/Samples/Dynamic/Validation/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.Validation.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Validation/App.xaml.cs b/src/Samples/Dynamic/Validation/App.xaml.cs
new file mode 100644
index 00000000..5c0e560b
--- /dev/null
+++ b/src/Samples/Dynamic/Validation/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Validation;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Validation/MainWindow.xaml b/src/Samples/Dynamic/Validation/MainWindow.xaml
similarity index 73%
rename from src/Samples/Validation/MainWindow.xaml
rename to src/Samples/Dynamic/Validation/MainWindow.xaml
index 67b0115f..d10811a3 100644
--- a/src/Samples/Validation/MainWindow.xaml
+++ b/src/Samples/Dynamic/Validation/MainWindow.xaml
@@ -17,15 +17,16 @@
           <ControlTemplate>
             <DockPanel>
               <TextBlock DockPanel.Dock="Left" Foreground="Red" FontWeight="Bold">*</TextBlock>
-              <ItemsControl DockPanel.Dock="Bottom" ItemsSource="{Binding ElementName=placeholder, Path=AdornedElement.(Validation.Errors)}">
+              <ItemsControl DockPanel.Dock="Bottom"
+                            ItemsSource="{Binding ElementName=placeholder, Path=AdornedElement.(Validation.Errors)}">
                 <ItemsControl.ItemTemplate>
                   <DataTemplate>
-                    <TextBlock Text="{Binding ErrorContent}" Foreground="Red"/>
+                    <TextBlock Text="{Binding ErrorContent}" Foreground="Red" />
                   </DataTemplate>
                 </ItemsControl.ItemTemplate>
               </ItemsControl>
               <Border BorderBrush="Red" BorderThickness="2">
-                <AdornedElementPlaceholder x:Name="placeholder"/>
+                <AdornedElementPlaceholder x:Name="placeholder" />
               </Border>
             </DockPanel>
           </ControlTemplate>
@@ -35,17 +36,20 @@
   </Window.Resources>
   <StackPanel HorizontalAlignment="Center" Margin="0,25,0,0">
     <StackPanel Orientation="Horizontal">
-      <TextBlock Text="Update count:         "/>
-      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount}" Width="200" Margin="0,5,0,25" />
+      <TextBlock Text="Update count:         " />
+      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount}" Width="200"
+               Margin="0,5,0,25" />
     </StackPanel>
     <StackPanel Orientation="Horizontal">
-      <TextBlock Text="Value:         "/>
-      <TextBox Style="{StaticResource textBoxInError}" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Width="200" Margin="0,5,0,25" />
+      <TextBlock Text="Value:         " />
+      <TextBox Style="{StaticResource textBoxInError}" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
+               Width="200" Margin="0,5,0,25" />
     </StackPanel>
     <StackPanel Orientation="Horizontal">
-      <TextBlock Text="Password:   "/>
-      <TextBox Style="{StaticResource textBoxInError}" Text="{Binding Password, UpdateSourceTrigger=PropertyChanged}" Width="200" Margin="0,5,0,25" />
+      <TextBlock Text="Password:   " />
+      <TextBox Style="{StaticResource textBoxInError}" Text="{Binding Password, UpdateSourceTrigger=PropertyChanged}"
+               Width="200" Margin="0,5,0,25" />
     </StackPanel>
     <Button Command="{Binding Submit}" Content="Submit" Margin="0,40,10,5" Width="50" />
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Validation/MainWindow.xaml.cs b/src/Samples/Dynamic/Validation/MainWindow.xaml.cs
new file mode 100644
index 00000000..c2f4d8bd
--- /dev/null
+++ b/src/Samples/Dynamic/Validation/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Validation;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Validation/Validation.csproj b/src/Samples/Dynamic/Validation/Validation.csproj
similarity index 96%
rename from src/Samples/Validation/Validation.csproj
rename to src/Samples/Dynamic/Validation/Validation.csproj
index b33ab6ad..f4ce4709 100644
--- a/src/Samples/Validation/Validation.csproj
+++ b/src/Samples/Dynamic/Validation/Validation.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Validation.Core\Validation.Core.fsproj" />
+    <ProjectReference Include="..\Validation.Core\Validation.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/EventBindingsAndBehaviors/App.xaml b/src/Samples/EventBindingsAndBehaviors/App.xaml
deleted file mode 100644
index ce502bae..00000000
--- a/src/Samples/EventBindingsAndBehaviors/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.EventBindingsAndBehaviors.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/EventBindingsAndBehaviors/App.xaml.cs b/src/Samples/EventBindingsAndBehaviors/App.xaml.cs
deleted file mode 100644
index fab3db97..00000000
--- a/src/Samples/EventBindingsAndBehaviors/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.EventBindingsAndBehaviors
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs b/src/Samples/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
deleted file mode 100644
index 1a617d4d..00000000
--- a/src/Samples/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Windows;
-using Microsoft.Xaml.Behaviors;
-
-namespace Elmish.WPF.Samples.EventBindingsAndBehaviors
-{
-  public class FocusWhenVisibleBehavior : Behavior<UIElement>
-  {
-    protected override void OnAttached()
-    {
-      base.OnAttached();
-      AssociatedObject.IsVisibleChanged += UIElement_IsVisibleChanged;
-
-    }
-
-    private void UIElement_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-    {
-      if (e.NewValue is bool b && b == true)
-      {
-        _ = AssociatedObject.Focus();
-      }
-    }
-
-    protected override void OnDetaching()
-    {
-      base.OnDetaching();
-      AssociatedObject.IsVisibleChanged -= UIElement_IsVisibleChanged;
-    }
-  }
-}
diff --git a/src/Samples/EventBindingsAndBehaviors/MainWindow.xaml.cs b/src/Samples/EventBindingsAndBehaviors/MainWindow.xaml.cs
deleted file mode 100644
index 8c63b720..00000000
--- a/src/Samples/EventBindingsAndBehaviors/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.EventBindingsAndBehaviors
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/FileDialogs/App.xaml b/src/Samples/FileDialogs/App.xaml
deleted file mode 100644
index 089ddff7..00000000
--- a/src/Samples/FileDialogs/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.FileDialogs.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/FileDialogs/App.xaml.cs b/src/Samples/FileDialogs/App.xaml.cs
deleted file mode 100644
index aa119663..00000000
--- a/src/Samples/FileDialogs/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.FileDialogs
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/FileDialogs/MainWindow.xaml.cs b/src/Samples/FileDialogs/MainWindow.xaml.cs
deleted file mode 100644
index 5f76aa00..00000000
--- a/src/Samples/FileDialogs/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.FileDialogs
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/FileDialogsCmdMsg/App.xaml b/src/Samples/FileDialogsCmdMsg/App.xaml
deleted file mode 100644
index 34ba25b0..00000000
--- a/src/Samples/FileDialogsCmdMsg/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.FileDialogsCmdMsg.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/FileDialogsCmdMsg/App.xaml.cs b/src/Samples/FileDialogsCmdMsg/App.xaml.cs
deleted file mode 100644
index 173192cb..00000000
--- a/src/Samples/FileDialogsCmdMsg/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.FileDialogsCmdMsg
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/FileDialogsCmdMsg/MainWindow.xaml.cs b/src/Samples/FileDialogsCmdMsg/MainWindow.xaml.cs
deleted file mode 100644
index 1a3e3d9a..00000000
--- a/src/Samples/FileDialogsCmdMsg/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.FileDialogsCmdMsg
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/Multiselect/App.xaml.cs b/src/Samples/Multiselect/App.xaml.cs
deleted file mode 100644
index aed91def..00000000
--- a/src/Samples/Multiselect/App.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Multiselect {
-  public partial class App : Application {
-    public App() {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e) {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-  }
-}
diff --git a/src/Samples/Multiselect/MainWindow.xaml.cs b/src/Samples/Multiselect/MainWindow.xaml.cs
deleted file mode 100644
index 268bc246..00000000
--- a/src/Samples/Multiselect/MainWindow.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Multiselect {
-  public partial class MainWindow : Window {
-    public MainWindow() {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/src/Samples/NewWindow.Core/NewWindow.Core.fsproj b/src/Samples/NewWindow.Core/NewWindow.Core.fsproj
deleted file mode 100644
index c6cfaabd..00000000
--- a/src/Samples/NewWindow.Core/NewWindow.Core.fsproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="AutoOpen.fs" />
-    <Compile Include="Window1.fs" />
-    <Compile Include="Window2.fs" />
-    <Compile Include="App.fs" />
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Samples/NewWindow/App.xaml b/src/Samples/NewWindow/App.xaml
deleted file mode 100644
index 59bddd0d..00000000
--- a/src/Samples/NewWindow/App.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.NewWindow.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml"
-        ShutdownMode="OnMainWindowClose">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/NewWindow/App.xaml.cs b/src/Samples/NewWindow/App.xaml.cs
deleted file mode 100644
index dbb61aa3..00000000
--- a/src/Samples/NewWindow/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.NewWindow
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow, () => new Window1(), () => new Window2());
-    }
-
-  }
-}
diff --git a/src/Samples/NewWindow/MainWindow.xaml.cs b/src/Samples/NewWindow/MainWindow.xaml.cs
deleted file mode 100644
index 71f8e721..00000000
--- a/src/Samples/NewWindow/MainWindow.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.NewWindow
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void CounterWithClock_Loaded(object sender, RoutedEventArgs e)
-        {
-
-        }
-    }
-}
diff --git a/src/Samples/NewWindow/Window1.xaml.cs b/src/Samples/NewWindow/Window1.xaml.cs
deleted file mode 100644
index bd88eece..00000000
--- a/src/Samples/NewWindow/Window1.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.NewWindow
-{
-    public partial class Window1 : Window
-    {
-        public Window1()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/NewWindow/Window2.xaml.cs b/src/Samples/NewWindow/Window2.xaml.cs
deleted file mode 100644
index e2101a04..00000000
--- a/src/Samples/NewWindow/Window2.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.NewWindow
-{
-    public partial class Window2 : Window
-    {
-        public Window2()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/OneWaySeq/App.xaml b/src/Samples/OneWaySeq/App.xaml
deleted file mode 100644
index aeca0749..00000000
--- a/src/Samples/OneWaySeq/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.OneWaySeq.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/OneWaySeq/App.xaml.cs b/src/Samples/OneWaySeq/App.xaml.cs
deleted file mode 100644
index 0352ffd5..00000000
--- a/src/Samples/OneWaySeq/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.OneWaySeq
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/OneWaySeq/MainWindow.xaml.cs b/src/Samples/OneWaySeq/MainWindow.xaml.cs
deleted file mode 100644
index 6cdcced8..00000000
--- a/src/Samples/OneWaySeq/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.OneWaySeq
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/README.md b/src/Samples/README.md
new file mode 100644
index 00000000..ee504411
--- /dev/null
+++ b/src/Samples/README.md
@@ -0,0 +1,93 @@
+# Elmish.WPF Samples
+
+This directory contains sample applications demonstrating different approaches to using Elmish.WPF.
+
+## Two Binding Approaches
+
+Elmish.WPF supports two different approaches for creating bindings between your F# model and WPF views:
+
+### 1. Dynamic Bindings (Traditional Approach)
+
+Located in the `Dynamic/` folder, these samples use the traditional dynamic binding approach with a `bindings()` function that returns a list of `Binding<Model, Msg>`.
+
+**Characteristics:**
+- More flexible and dynamic
+- Bindings are defined at runtime
+- Less boilerplate for simple scenarios
+- All bindings defined in a single function
+
+**Example:**
+```fsharp
+let bindings () : Binding<Model, Msg> list = [
+    "CounterValue" |> Binding.oneWay (fun m -> m.Count)
+    "Increment" |> Binding.cmd Increment
+    "StepSize" |> Binding.twoWay ((fun m -> float m.StepSize), int >> SetStepSize)
+]
+```
+
+**When to use:**
+- Rapid prototyping
+- Simple applications
+- When you prefer functional composition over OOP
+- When bindings need to be highly dynamic
+
+### 2. Typed ViewModels (Static Approach)
+
+Located in the `Typed/` folder, these samples use strongly-typed view models that inherit from `ViewModelBase<Model, Msg>`.
+
+**Characteristics:**
+- Compile-time type safety for WPF bindings
+- Better IntelliSense support in XAML
+- More familiar to WPF developers
+- Each property is explicitly defined
+- Better design-time support in Visual Studio/Blend
+
+**Example:**
+```fsharp
+type CounterViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+    
+    member _.CounterValue =
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
+    
+    member _.StepSize
+        with get () = base.Get () stepSizeBinding
+        and set (v) = base.Set (v) stepSizeBinding
+```
+
+**When to use:**
+- Large applications requiring strong typing
+- When working with designers who need design-time data
+- When you want compile-time validation of binding names
+- Complex view models with many properties
+- When integrating with existing WPF applications
+
+## Sample Organization
+
+### Dynamic Samples
+- **SingleCounter** - Basic counter with increment/decrement
+- **SubModel** - Nested models and view models
+- **SubModelSeq** - Collections of sub-models
+- **Validation** - Input validation examples
+- **FileDialogs** - File dialog integration
+- **Threading** - Async and threading examples
+- ...and more
+
+### Typed Samples
+- **SubModelStatic** - Complex nested view models with static typing
+- **SingleCounterTyped** - Typed version of the basic counter example
+
+## Getting Started
+
+1. Choose the approach that best fits your needs
+2. Navigate to the corresponding folder (Dynamic or Typed)
+3. Open the sample that most closely matches your use case
+4. Study both the F# code (.fs files) and XAML files to understand the binding approach
+
+## Migration Between Approaches
+
+You can convert between approaches:
+- **Dynamic to Typed**: Create a class inheriting from `ViewModelBase` and define properties for each binding
+- **Typed to Dynamic**: Extract bindings into a `bindings()` function returning a list
+
+Both approaches can coexist in the same application if needed.
\ No newline at end of file
diff --git a/src/Samples/SingleCounter/App.xaml b/src/Samples/SingleCounter/App.xaml
deleted file mode 100644
index fe7285be..00000000
--- a/src/Samples/SingleCounter/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.SingleCounter.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/SingleCounter/App.xaml.cs b/src/Samples/SingleCounter/App.xaml.cs
deleted file mode 100644
index c1c60653..00000000
--- a/src/Samples/SingleCounter/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SingleCounter
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/SingleCounter/MainWindow.xaml.cs b/src/Samples/SingleCounter/MainWindow.xaml.cs
deleted file mode 100644
index 9f665a9a..00000000
--- a/src/Samples/SingleCounter/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SingleCounter
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/Sticky/App.xaml.cs b/src/Samples/Sticky/App.xaml.cs
deleted file mode 100644
index 8743cc7d..00000000
--- a/src/Samples/Sticky/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Sticky
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/Sticky/MainWindow.xaml.cs b/src/Samples/Sticky/MainWindow.xaml.cs
deleted file mode 100644
index f9852c52..00000000
--- a/src/Samples/Sticky/MainWindow.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Sticky {
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModel/App.xaml b/src/Samples/SubModel/App.xaml
deleted file mode 100644
index 87cebe7a..00000000
--- a/src/Samples/SubModel/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.SubModel.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/SubModel/App.xaml.cs b/src/Samples/SubModel/App.xaml.cs
deleted file mode 100644
index 23b7db55..00000000
--- a/src/Samples/SubModel/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModel
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/SubModel/Clock.xaml.cs b/src/Samples/SubModel/Clock.xaml.cs
deleted file mode 100644
index 7c1dd4ab..00000000
--- a/src/Samples/SubModel/Clock.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModel
-{
-    public partial class Clock : UserControl
-    {
-        public Clock()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModel/Counter.xaml.cs b/src/Samples/SubModel/Counter.xaml.cs
deleted file mode 100644
index 2632fd95..00000000
--- a/src/Samples/SubModel/Counter.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModel
-{
-    public partial class Counter : UserControl
-    {
-        public Counter()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModel/CounterWithClock.xaml.cs b/src/Samples/SubModel/CounterWithClock.xaml.cs
deleted file mode 100644
index 0ae9b3d9..00000000
--- a/src/Samples/SubModel/CounterWithClock.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModel
-{
-    public partial class CounterWithClock : UserControl
-    {
-        public CounterWithClock()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModel/MainWindow.xaml.cs b/src/Samples/SubModel/MainWindow.xaml.cs
deleted file mode 100644
index f11247d8..00000000
--- a/src/Samples/SubModel/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModel
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelOpt/App.xaml b/src/Samples/SubModelOpt/App.xaml
deleted file mode 100644
index 20fc048d..00000000
--- a/src/Samples/SubModelOpt/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.SubModelOpt.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/SubModelOpt/App.xaml.cs b/src/Samples/SubModelOpt/App.xaml.cs
deleted file mode 100644
index 13dc4d6d..00000000
--- a/src/Samples/SubModelOpt/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelOpt
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/SubModelOpt/Form1.xaml.cs b/src/Samples/SubModelOpt/Form1.xaml.cs
deleted file mode 100644
index b9a28a67..00000000
--- a/src/Samples/SubModelOpt/Form1.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModelOpt
-{
-    public partial class Form1 : UserControl
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelOpt/Form2.xaml.cs b/src/Samples/SubModelOpt/Form2.xaml.cs
deleted file mode 100644
index 64e65ddc..00000000
--- a/src/Samples/SubModelOpt/Form2.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModelOpt
-{
-    public partial class Form2 : UserControl
-    {
-        public Form2()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelOpt/MainWindow.xaml.cs b/src/Samples/SubModelOpt/MainWindow.xaml.cs
deleted file mode 100644
index 89392862..00000000
--- a/src/Samples/SubModelOpt/MainWindow.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelOpt
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void CounterWithClock_Loaded(object sender, RoutedEventArgs e)
-        {
-
-        }
-    }
-}
diff --git a/src/Samples/SubModelSelectedItem/App.xaml b/src/Samples/SubModelSelectedItem/App.xaml
deleted file mode 100644
index 9265305a..00000000
--- a/src/Samples/SubModelSelectedItem/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.SubModelSelectedItem.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/SubModelSelectedItem/App.xaml.cs b/src/Samples/SubModelSelectedItem/App.xaml.cs
deleted file mode 100644
index 15195c44..00000000
--- a/src/Samples/SubModelSelectedItem/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelSelectedItem
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/SubModelSelectedItem/MainWindow.xaml.cs b/src/Samples/SubModelSelectedItem/MainWindow.xaml.cs
deleted file mode 100644
index 3a47308a..00000000
--- a/src/Samples/SubModelSelectedItem/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelSelectedItem
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelSeq/App.xaml b/src/Samples/SubModelSeq/App.xaml
deleted file mode 100644
index 872e73aa..00000000
--- a/src/Samples/SubModelSeq/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.SubModelSeq.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/SubModelSeq/App.xaml.cs b/src/Samples/SubModelSeq/App.xaml.cs
deleted file mode 100644
index 9313c8eb..00000000
--- a/src/Samples/SubModelSeq/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelSeq
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/SubModelSeq/Counter.xaml.cs b/src/Samples/SubModelSeq/Counter.xaml.cs
deleted file mode 100644
index c74f1134..00000000
--- a/src/Samples/SubModelSeq/Counter.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModelSeq {
-  public partial class Counter : UserControl {
-    public Counter() {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/src/Samples/SubModelSeq/MainWindow.xaml.cs b/src/Samples/SubModelSeq/MainWindow.xaml.cs
deleted file mode 100644
index e51034bd..00000000
--- a/src/Samples/SubModelSeq/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelSeq
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelStatic/App.xaml b/src/Samples/SubModelStatic/App.xaml
deleted file mode 100644
index 8b7f2277..00000000
--- a/src/Samples/SubModelStatic/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.SubModelStatic.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/SubModelStatic/App.xaml.cs b/src/Samples/SubModelStatic/App.xaml.cs
deleted file mode 100644
index 8f7c00c8..00000000
--- a/src/Samples/SubModelStatic/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelStatic
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/SubModelStatic/Clock.xaml.cs b/src/Samples/SubModelStatic/Clock.xaml.cs
deleted file mode 100644
index 7293be6d..00000000
--- a/src/Samples/SubModelStatic/Clock.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModelStatic
-{
-    public partial class Clock : UserControl
-    {
-        public Clock()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelStatic/Counter.xaml.cs b/src/Samples/SubModelStatic/Counter.xaml.cs
deleted file mode 100644
index a6d04598..00000000
--- a/src/Samples/SubModelStatic/Counter.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModelStatic
-{
-    public partial class Counter : UserControl
-    {
-        public Counter()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelStatic/CounterWithClock.xaml.cs b/src/Samples/SubModelStatic/CounterWithClock.xaml.cs
deleted file mode 100644
index 79d0fff4..00000000
--- a/src/Samples/SubModelStatic/CounterWithClock.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows.Controls;
-
-namespace Elmish.WPF.Samples.SubModelStatic
-{
-    public partial class CounterWithClock : UserControl
-    {
-        public CounterWithClock()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/SubModelStatic/MainWindow.xaml.cs b/src/Samples/SubModelStatic/MainWindow.xaml.cs
deleted file mode 100644
index db258cd0..00000000
--- a/src/Samples/SubModelStatic/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.SubModelStatic
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/Threading/App.xaml.cs b/src/Samples/Threading/App.xaml.cs
deleted file mode 100644
index a725c82a..00000000
--- a/src/Samples/Threading/App.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Threading;
-using System.Windows;
-using System.Windows.Threading;
-using Elmish.WPF.Samples.Threading;
-
-#nullable enable
-namespace Threading {
-  public partial class App : Application {
-    Thread? ElmishThread { get; set; } = null;
-
-    public App() {
-      this.Activated += StartElmish;
-      this.Exit += StopElmish;
-    }
-
-    private void StopElmish(object? sender, ExitEventArgs e)
-    {
-      Dispatcher.FromThread(ElmishThread)?.InvokeShutdown();
-      ElmishThread?.Join();
-    }
-
-    private void StartElmish(object? _1, EventArgs _2) {
-      this.Activated -= StartElmish;
-      ElmishThread = Program.main(MainWindow);
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Samples/Threading/MainWindow.xaml.cs b/src/Samples/Threading/MainWindow.xaml.cs
deleted file mode 100644
index cdbfddc8..00000000
--- a/src/Samples/Threading/MainWindow.xaml.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Threading
-{
-  public partial class MainWindow : Window
-  {
-    public MainWindow()
-    {
-      InitializeComponent();
-    }
-
-    private void Button_Click(object sender, RoutedEventArgs e)
-    {
-      System.Threading.Tasks.Task.Delay(5000).Wait();
-    }
-
-    private void Button2_Click(object sender, RoutedEventArgs e)
-    {
-      dynamic viewModel = DataContext;
-      System.Threading.Tasks.Task.Delay(5000).ContinueWith(t => viewModel.Message = $"{viewModel.Message}{viewModel.Pings}");
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic.Core/Program.fs b/src/Samples/Typed/SubModelStatic.Core/Program.fs
similarity index 100%
rename from src/Samples/SubModelStatic.Core/Program.fs
rename to src/Samples/Typed/SubModelStatic.Core/Program.fs
diff --git a/src/Samples/SubModelStatic.Core/SubModelStatic.Core.fsproj b/src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj
similarity index 72%
rename from src/Samples/SubModelStatic.Core/SubModelStatic.Core.fsproj
rename to src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj
index 28983b0f..c406ba6d 100644
--- a/src/Samples/SubModelStatic.Core/SubModelStatic.Core.fsproj
+++ b/src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj
@@ -9,17 +9,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Typed/SubModelStatic/App.xaml b/src/Samples/Typed/SubModelStatic/App.xaml
new file mode 100644
index 00000000..9bfc949f
--- /dev/null
+++ b/src/Samples/Typed/SubModelStatic/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelStatic.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelStatic/App.xaml.cs b/src/Samples/Typed/SubModelStatic/App.xaml.cs
new file mode 100644
index 00000000..bc10b5a7
--- /dev/null
+++ b/src/Samples/Typed/SubModelStatic/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelStatic;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic/Clock.xaml b/src/Samples/Typed/SubModelStatic/Clock.xaml
similarity index 73%
rename from src/Samples/SubModelStatic/Clock.xaml
rename to src/Samples/Typed/SubModelStatic/Clock.xaml
index e948d0ba..993447c5 100644
--- a/src/Samples/SubModelStatic/Clock.xaml
+++ b/src/Samples/Typed/SubModelStatic/Clock.xaml
@@ -7,8 +7,10 @@
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=vm:ClockViewModel, IsDesignTimeCreatable=True}">
   <StackPanel Orientation="Horizontal">
-    <TextBlock Text="{Binding Time, StringFormat='Today is {0:MMMM dd, yyyy}. The time is {0:HH:mm:ssK}. It is {0:dddd}.'}" />
-    <RadioButton Command="{Binding SetLocal}" IsChecked="{Binding IsLocal, Mode=OneWay}" Content="Local" Margin="10,0,0,0"/>
-    <RadioButton Command="{Binding SetUtc}" IsChecked="{Binding IsUtc, Mode=OneWay}" Content="Utc" Margin="10,0,0,0"/>
+    <TextBlock
+      Text="{Binding Time, StringFormat='Today is {0:MMMM dd, yyyy}. The time is {0:HH:mm:ssK}. It is {0:dddd}.'}" />
+    <RadioButton Command="{Binding SetLocal}" IsChecked="{Binding IsLocal, Mode=OneWay}" Content="Local"
+                 Margin="10,0,0,0" />
+    <RadioButton Command="{Binding SetUtc}" IsChecked="{Binding IsUtc, Mode=OneWay}" Content="Utc" Margin="10,0,0,0" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelStatic/Clock.xaml.cs b/src/Samples/Typed/SubModelStatic/Clock.xaml.cs
new file mode 100644
index 00000000..19156b0d
--- /dev/null
+++ b/src/Samples/Typed/SubModelStatic/Clock.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelStatic;
+
+public partial class Clock : UserControl
+{
+    public Clock()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic/Counter.xaml b/src/Samples/Typed/SubModelStatic/Counter.xaml
similarity index 91%
rename from src/Samples/SubModelStatic/Counter.xaml
rename to src/Samples/Typed/SubModelStatic/Counter.xaml
index 5551966d..1405b8a2 100644
--- a/src/Samples/SubModelStatic/Counter.xaml
+++ b/src/Samples/Typed/SubModelStatic/Counter.xaml
@@ -8,35 +8,36 @@
              d:DataContext="{d:DesignInstance Type=vm:CounterViewModel, IsDesignTimeCreatable=True}">
   <Grid>
     <Grid.RowDefinitions>
-      <RowDefinition/>
-      <RowDefinition/>
+      <RowDefinition />
+      <RowDefinition />
     </Grid.RowDefinitions>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top">
       <TextBlock Text="{Binding CounterValue, StringFormat='Counter value: {0}'}" Width="110" Margin="0,5,10,5" />
       <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
       <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
       <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
-      <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100" Margin="0,5,10,5" />
+      <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+              Width="100" Margin="0,5,10,5" />
       <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
     </StackPanel>
     <DockPanel Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Top">
-      <TextBlock DockPanel.Dock="Left" Margin="0,5,10,5">History:</TextBlock>
+      <TextBlock DockPanel.Dock="Left" Margin="0,5,10,5">History:</TextBlock>
       <TextBlock Margin="2,5,2,5">
         <Run Text="{Binding CounterValue, Mode=OneWay, StringFormat='({0},'}" />
         <Run Text="{Binding History.Count, Mode=OneWay, StringFormat='{}{0})'}" />
       </TextBlock>
-      <ItemsControl ItemsSource="{Binding History}">
-        <ItemsControl.ItemTemplate>
-          <DataTemplate>
-            <TextBlock Text="{Binding}" TextDecorations="Strikethrough" Margin="2,5,2,5" />
-          </DataTemplate>
-        </ItemsControl.ItemTemplate>
-        <ItemsControl.ItemsPanel>
-          <ItemsPanelTemplate>
-            <StackPanel Orientation="Horizontal"/>
+      <ItemsControl ItemsSource="{Binding History}">
+        <ItemsControl.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding}" TextDecorations="Strikethrough" Margin="2,5,2,5" />
+          </DataTemplate>
+        </ItemsControl.ItemTemplate>
+        <ItemsControl.ItemsPanel>
+          <ItemsPanelTemplate>
+            <StackPanel Orientation="Horizontal" />
           </ItemsPanelTemplate>
         </ItemsControl.ItemsPanel>
       </ItemsControl>
     </DockPanel>
   </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelStatic/Counter.xaml.cs b/src/Samples/Typed/SubModelStatic/Counter.xaml.cs
new file mode 100644
index 00000000..dd4a6e90
--- /dev/null
+++ b/src/Samples/Typed/SubModelStatic/Counter.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelStatic;
+
+public partial class Counter : UserControl
+{
+    public Counter()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic/CounterWithClock.xaml b/src/Samples/Typed/SubModelStatic/CounterWithClock.xaml
similarity index 98%
rename from src/Samples/SubModelStatic/CounterWithClock.xaml
rename to src/Samples/Typed/SubModelStatic/CounterWithClock.xaml
index a59cd017..b481258b 100644
--- a/src/Samples/SubModelStatic/CounterWithClock.xaml
+++ b/src/Samples/Typed/SubModelStatic/CounterWithClock.xaml
@@ -11,4 +11,4 @@
     <local:Counter DataContext="{Binding Counter}" HorizontalAlignment="Center" />
     <local:Clock DataContext="{Binding Clock}" HorizontalAlignment="Center" />
   </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelStatic/CounterWithClock.xaml.cs b/src/Samples/Typed/SubModelStatic/CounterWithClock.xaml.cs
new file mode 100644
index 00000000..293fac46
--- /dev/null
+++ b/src/Samples/Typed/SubModelStatic/CounterWithClock.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelStatic;
+
+public partial class CounterWithClock : UserControl
+{
+    public CounterWithClock()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic/MainWindow.xaml b/src/Samples/Typed/SubModelStatic/MainWindow.xaml
similarity index 86%
rename from src/Samples/SubModelStatic/MainWindow.xaml
rename to src/Samples/Typed/SubModelStatic/MainWindow.xaml
index e721778d..54bb1d7d 100644
--- a/src/Samples/SubModelStatic/MainWindow.xaml
+++ b/src/Samples/Typed/SubModelStatic/MainWindow.xaml
@@ -12,9 +12,11 @@
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=vm:AppViewModel, IsDesignTimeCreatable=True}">
   <StackPanel>
-    <TextBlock Text="Counter with clock 1" FontSize="18" FontWeight="Bold" Margin="0,25,0,0" HorizontalAlignment="Center" />
+    <TextBlock Text="Counter with clock 1" FontSize="18" FontWeight="Bold" Margin="0,25,0,0"
+               HorizontalAlignment="Center" />
     <local:CounterWithClock DataContext="{Binding ClockCounter1}" />
-    <TextBlock Text="Counter with clock 2" FontSize="18" FontWeight="Bold" Margin="0,25,0,0" HorizontalAlignment="Center" />
+    <TextBlock Text="Counter with clock 2" FontSize="18" FontWeight="Bold" Margin="0,25,0,0"
+               HorizontalAlignment="Center" />
     <local:CounterWithClock DataContext="{Binding ClockCounter2}" />
   </StackPanel>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelStatic/MainWindow.xaml.cs b/src/Samples/Typed/SubModelStatic/MainWindow.xaml.cs
new file mode 100644
index 00000000..294c83f4
--- /dev/null
+++ b/src/Samples/Typed/SubModelStatic/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelStatic;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/SubModelStatic/SubModelStatic.csproj b/src/Samples/Typed/SubModelStatic/SubModelStatic.csproj
similarity index 94%
rename from src/Samples/SubModelStatic/SubModelStatic.csproj
rename to src/Samples/Typed/SubModelStatic/SubModelStatic.csproj
index a6a2a948..f4fcd826 100644
--- a/src/Samples/SubModelStatic/SubModelStatic.csproj
+++ b/src/Samples/Typed/SubModelStatic/SubModelStatic.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SubModelStatic.Core\SubModelStatic.Core.fsproj" />
+    <ProjectReference Include="..\SubModelStatic.Core\SubModelStatic.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/UiBoundCmdParam/App.xaml b/src/Samples/UiBoundCmdParam/App.xaml
deleted file mode 100644
index c3d6b67d..00000000
--- a/src/Samples/UiBoundCmdParam/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.UiBoundCmdParam.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/UiBoundCmdParam/App.xaml.cs b/src/Samples/UiBoundCmdParam/App.xaml.cs
deleted file mode 100644
index 1a43c104..00000000
--- a/src/Samples/UiBoundCmdParam/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.UiBoundCmdParam
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/UiBoundCmdParam/MainWindow.xaml.cs b/src/Samples/UiBoundCmdParam/MainWindow.xaml.cs
deleted file mode 100644
index f1512789..00000000
--- a/src/Samples/UiBoundCmdParam/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.UiBoundCmdParam
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Samples/Validation/App.xaml b/src/Samples/Validation/App.xaml
deleted file mode 100644
index c045d6b3..00000000
--- a/src/Samples/Validation/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application x:Class="Elmish.WPF.Samples.Validation.App"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        StartupUri="MainWindow.xaml">
-  <Application.Resources>
-  </Application.Resources>
-</Application>
diff --git a/src/Samples/Validation/App.xaml.cs b/src/Samples/Validation/App.xaml.cs
deleted file mode 100644
index ab0c9b90..00000000
--- a/src/Samples/Validation/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Validation
-{
-  public partial class App : Application
-  {
-    public App()
-    {
-      this.Activated += StartElmish;
-    }
-
-    private void StartElmish(object sender, EventArgs e)
-    {
-      this.Activated -= StartElmish;
-      Program.main(MainWindow);
-    }
-
-  }
-}
diff --git a/src/Samples/Validation/MainWindow.xaml.cs b/src/Samples/Validation/MainWindow.xaml.cs
deleted file mode 100644
index bc96fd9d..00000000
--- a/src/Samples/Validation/MainWindow.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Elmish.WPF.Samples.Validation
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj b/tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj
similarity index 76%
rename from src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj
rename to tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj
index 9916b623..9030d026 100644
--- a/src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj
+++ b/tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj
@@ -7,15 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\src\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Elmish.WPF.Benchmarks/Program.fs b/tests/Elmish.WPF.Benchmarks/Program.fs
similarity index 100%
rename from src/Elmish.WPF.Benchmarks/Program.fs
rename to tests/Elmish.WPF.Benchmarks/Program.fs
diff --git a/src/Elmish.WPF.Tests/AutoOpen.fs b/tests/Elmish.WPF.Tests/AutoOpen.fs
similarity index 100%
rename from src/Elmish.WPF.Tests/AutoOpen.fs
rename to tests/Elmish.WPF.Tests/AutoOpen.fs
diff --git a/src/Elmish.WPF.Tests/BindingTests.fs b/tests/Elmish.WPF.Tests/BindingTests.fs
similarity index 100%
rename from src/Elmish.WPF.Tests/BindingTests.fs
rename to tests/Elmish.WPF.Tests/BindingTests.fs
diff --git a/src/Elmish.WPF.Tests/BindingVmHelpersTests.fs b/tests/Elmish.WPF.Tests/BindingVmHelpersTests.fs
similarity index 100%
rename from src/Elmish.WPF.Tests/BindingVmHelpersTests.fs
rename to tests/Elmish.WPF.Tests/BindingVmHelpersTests.fs
diff --git a/src/Elmish.WPF.Tests/DynamicViewModelTests.fs b/tests/Elmish.WPF.Tests/DynamicViewModelTests.fs
similarity index 100%
rename from src/Elmish.WPF.Tests/DynamicViewModelTests.fs
rename to tests/Elmish.WPF.Tests/DynamicViewModelTests.fs
diff --git a/src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj b/tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
similarity index 64%
rename from src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
rename to tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
index 31bd0e78..4cc036b8 100644
--- a/src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
+++ b/tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
@@ -14,22 +14,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="AutoOpen.fs" />
-    <Compile Include="MergeTests.fs" />
-    <Compile Include="BindingVmHelpersTests.fs" />
-    <Compile Include="DynamicViewModelTests.fs" />
-    <Compile Include="StaticViewModelTests.fs" />
-    <Compile Include="BindingTests.fs" />
-    <Compile Include="UtilsTests.fs" />
+    <Compile Include="AutoOpen.fs"/>
+    <Compile Include="MergeTests.fs"/>
+    <Compile Include="BindingVmHelpersTests.fs"/>
+    <Compile Include="DynamicViewModelTests.fs"/>
+    <Compile Include="StaticViewModelTests.fs"/>
+    <Compile Include="BindingTests.fs"/>
+    <Compile Include="UtilsTests.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Interop.Dynamic" Version="5.0.1.268" />
-    <PackageReference Include="Hedgehog" Version="0.12.1" />
-    <PackageReference Include="Hedgehog.Experimental" Version="0.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Unquote" Version="6.1.0" />
-    <PackageReference Include="xunit.core" Version="2.4.1" />
+    <PackageReference Include="FSharp.Interop.Dynamic" Version="5.0.1.268"/>
+    <PackageReference Include="Hedgehog" Version="0.12.1"/>
+    <PackageReference Include="Hedgehog.Experimental" Version="0.6.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0"/>
+    <PackageReference Include="Unquote" Version="6.1.0"/>
+    <PackageReference Include="xunit.core" Version="2.4.1"/>
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\src\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Elmish.WPF.Tests/MergeTests.fs b/tests/Elmish.WPF.Tests/MergeTests.fs
similarity index 100%
rename from src/Elmish.WPF.Tests/MergeTests.fs
rename to tests/Elmish.WPF.Tests/MergeTests.fs
diff --git a/src/Elmish.WPF.Tests/StaticViewModelTests.fs b/tests/Elmish.WPF.Tests/StaticViewModelTests.fs
similarity index 99%
rename from src/Elmish.WPF.Tests/StaticViewModelTests.fs
rename to tests/Elmish.WPF.Tests/StaticViewModelTests.fs
index 5f4ddf59..cc699e41 100644
--- a/src/Elmish.WPF.Tests/StaticViewModelTests.fs
+++ b/tests/Elmish.WPF.Tests/StaticViewModelTests.fs
@@ -1,8 +1,6 @@
 module StaticViewModelTests.M
 
-open System
 open System.Collections.Concurrent
-open System.Collections.ObjectModel
 open System.Collections.Specialized
 open System.ComponentModel
 open System.Windows.Input
diff --git a/src/Elmish.WPF.Tests/UtilsTests.fs b/tests/Elmish.WPF.Tests/UtilsTests.fs
similarity index 100%
rename from src/Elmish.WPF.Tests/UtilsTests.fs
rename to tests/Elmish.WPF.Tests/UtilsTests.fs

From 2aa660e4cdf9599e25ee3797936b477bd1b4f580 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 18:06:00 +0200
Subject: [PATCH 07/18] Remove .claude folder

---
 .claude/settings.local.json | 10 ----------
 .gitignore                  |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 .claude/settings.local.json

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
deleted file mode 100644
index 6d280cc4..00000000
--- a/.claude/settings.local.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(mv:*)",
-      "Bash(mkdir:*)",
-      "Bash(cp:*)"
-    ],
-    "deny": []
-  }
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9f0c5275..d0581198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,9 @@ BenchmarkDotNet.Artifacts/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
+# Claude AI local settings
+.claude/
+
 ### VS Code ###
 .vscode/*
 !.vscode/settings.json

From aad29e8882d286456b59bc43e1557934669d5773 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 18:11:44 +0200
Subject: [PATCH 08/18] Update github workflow files

Update files reflecting the changes made in the project structure.
---
 .github/workflows/continuous_integration.yml | 6 +++---
 .github/workflows/pull_request.yml           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 2bd7c2e4..720cca79 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -21,13 +21,13 @@ jobs:
           6.0.x
 
     - name: Restore
-      run: dotnet restore src/Elmish.WPF.sln
+      run: dotnet restore Elmish.WPF.slnx
 
     - name: Build
-      run: dotnet build --no-restore --configuration Release src/Elmish.WPF.sln
+      run: dotnet build --no-restore --configuration Release Elmish.WPF.slnx
 
     - name: Test
-      run: dotnet test --no-build --configuration Release src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
+      run: dotnet test --no-build --configuration Release tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
 
     - name: Publish NuGet
       uses: alirezanet/publish-nuget@v3.0.4
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 28bddc2a..aa6b028d 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -23,10 +23,10 @@ jobs:
           6.0.x
 
     - name: Restore
-      run: dotnet restore src/Elmish.WPF.sln
+      run: dotnet restore Elmish.WPF.slnx
 
     - name: Build
-      run: dotnet build --no-restore --configuration Release src/Elmish.WPF.sln
+      run: dotnet build --no-restore --configuration Release Elmish.WPF.slnx
 
     - name: Test
-      run: dotnet test --no-build --configuration Release src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
+      run: dotnet test --no-build --configuration Release tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj

From e045d806ffa636b480f2dd0f94adbf82a9452b53 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 18:21:27 +0200
Subject: [PATCH 09/18] Fix github workflow issues

Create a new sln file.
Update the workflow files to point to the sln file.
---
 .github/workflows/continuous_integration.yml |   4 +-
 .github/workflows/pull_request.yml           |   4 +-
 Elmish.WPF.sln                               | 590 +++++++++++++++++++
 3 files changed, 594 insertions(+), 4 deletions(-)
 create mode 100644 Elmish.WPF.sln

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 720cca79..52372b8f 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -21,10 +21,10 @@ jobs:
           6.0.x
 
     - name: Restore
-      run: dotnet restore Elmish.WPF.slnx
+      run: dotnet restore Elmish.WPF.sln
 
     - name: Build
-      run: dotnet build --no-restore --configuration Release Elmish.WPF.slnx
+      run: dotnet build --no-restore --configuration Release Elmish.WPF.sln
 
     - name: Test
       run: dotnet test --no-build --configuration Release tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index aa6b028d..fc8187b3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -23,10 +23,10 @@ jobs:
           6.0.x
 
     - name: Restore
-      run: dotnet restore Elmish.WPF.slnx
+      run: dotnet restore Elmish.WPF.sln
 
     - name: Build
-      run: dotnet build --no-restore --configuration Release Elmish.WPF.slnx
+      run: dotnet build --no-restore --configuration Release Elmish.WPF.sln
 
     - name: Test
       run: dotnet test --no-build --configuration Release tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
diff --git a/Elmish.WPF.sln b/Elmish.WPF.sln
new file mode 100644
index 00000000..8d4cb0b5
--- /dev/null
+++ b/Elmish.WPF.sln
@@ -0,0 +1,590 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Elmish.WPF", "src\Elmish.WPF\Elmish.WPF.fsproj", "{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Elmish.WPF.Benchmarks", "tests\Elmish.WPF.Benchmarks\Elmish.WPF.Benchmarks.fsproj", "{06B21109-54A2-47FD-B701-C5B572059F88}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Elmish.WPF.Tests", "tests\Elmish.WPF.Tests\Elmish.WPF.Tests.fsproj", "{603D8145-0AD4-44BE-A730-678B9BE015E1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D1B4CF99-7947-DD6C-81D0-5B5B3989814C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamic", "Dynamic", "{D93CAD63-3252-5A7F-9C37-FCA27F08B606}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Capabilities", "src\Samples\Dynamic\Capabilities\Capabilities.csproj", "{F905EB30-20A0-42F6-9035-98C27D1CCF81}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Capabilities.Core", "src\Samples\Dynamic\Capabilities.Core\Capabilities.Core.fsproj", "{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventBindingsAndBehaviors", "src\Samples\Dynamic\EventBindingsAndBehaviors\EventBindingsAndBehaviors.csproj", "{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EventBindingsAndBehaviors.Core", "src\Samples\Dynamic\EventBindingsAndBehaviors.Core\EventBindingsAndBehaviors.Core.fsproj", "{C1E54278-5FE4-4370-AA98-AB20F037AD6A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileDialogs", "src\Samples\Dynamic\FileDialogs\FileDialogs.csproj", "{1982CF30-6D02-45F6-808A-C35A75623343}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FileDialogs.Core", "src\Samples\Dynamic\FileDialogs.Core\FileDialogs.Core.fsproj", "{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileDialogsCmdMsg", "src\Samples\Dynamic\FileDialogsCmdMsg\FileDialogsCmdMsg.csproj", "{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FileDialogsCmdMsg.Core", "src\Samples\Dynamic\FileDialogsCmdMsg.Core\FileDialogsCmdMsg.Core.fsproj", "{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Multiselect", "src\Samples\Dynamic\Multiselect\Multiselect.csproj", "{02668954-D273-4140-9FD2-1BDE615A401E}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Multiselect.Core", "src\Samples\Dynamic\Multiselect.Core\Multiselect.Core.fsproj", "{8565CE50-713C-4336-88AD-EAC732DC921A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewWindow", "src\Samples\Dynamic\NewWindow\NewWindow.csproj", "{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "NewWindow.Core", "src\Samples\Dynamic\NewWindow.Core\NewWindow.Core.fsproj", "{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWaySeq", "src\Samples\Dynamic\OneWaySeq\OneWaySeq.csproj", "{239809C7-5679-4A85-AC76-254AB83C1DF0}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "OneWaySeq.Core", "src\Samples\Dynamic\OneWaySeq.Core\OneWaySeq.Core.fsproj", "{7B1997D7-7E82-4094-97FF-F267AB1E628E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleCounter", "src\Samples\Dynamic\SingleCounter\SingleCounter.csproj", "{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SingleCounter.Core", "src\Samples\Dynamic\SingleCounter.Core\SingleCounter.Core.fsproj", "{74BE5736-B441-4371-AB5B-F1C7A61341C2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sticky", "src\Samples\Dynamic\Sticky\Sticky.csproj", "{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Sticky.Core", "src\Samples\Dynamic\Sticky.Core\Sticky.Core.fsproj", "{F30FD499-8F88-4613-8B15-C06AA649881F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModel", "src\Samples\Dynamic\SubModel\SubModel.csproj", "{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModel.Core", "src\Samples\Dynamic\SubModel.Core\SubModel.Core.fsproj", "{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelOpt", "src\Samples\Dynamic\SubModelOpt\SubModelOpt.csproj", "{6A489E6B-CD18-442D-A856-89DDE710B009}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelOpt.Core", "src\Samples\Dynamic\SubModelOpt.Core\SubModelOpt.Core.fsproj", "{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelSelectedItem", "src\Samples\Dynamic\SubModelSelectedItem\SubModelSelectedItem.csproj", "{86B65707-7652-4ED0-8B0A-6C4907E8FF86}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelSelectedItem.Core", "src\Samples\Dynamic\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj", "{686BA896-BD38-490A-88C1-A8D0B48D05E6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelSeq", "src\Samples\Dynamic\SubModelSeq\SubModelSeq.csproj", "{A737F617-3916-4AC1-AEEE-69585FF89838}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelSeq.Core", "src\Samples\Dynamic\SubModelSeq.Core\SubModelSeq.Core.fsproj", "{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Threading", "src\Samples\Dynamic\Threading\Threading.csproj", "{335C2372-CB51-4569-B04D-CE8AFC8EC755}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Threading.Core", "src\Samples\Dynamic\Threading.Core\Threading.Core.fsproj", "{59976F36-A8F0-425E-9620-FA78E68E145F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiBoundCmdParam", "src\Samples\Dynamic\UiBoundCmdParam\UiBoundCmdParam.csproj", "{3D4E6246-667E-4243-B2F3-B9CE12743B8D}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UiBoundCmdParam.Core", "src\Samples\Dynamic\UiBoundCmdParam.Core\UiBoundCmdParam.Core.fsproj", "{BBC09072-9D08-454F-90BF-FD754CD60B93}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation", "src\Samples\Dynamic\Validation\Validation.csproj", "{43CF5F69-38A8-493E-960A-0877E248996F}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Validation.Core", "src\Samples\Dynamic\Validation.Core\Validation.Core.fsproj", "{C7D0416E-9785-40A1-921D-C92A56A9848F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typed", "Typed", "{1740D47D-DA94-6415-017E-48203BA1C52C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelStatic", "src\Samples\Typed\SubModelStatic\SubModelStatic.csproj", "{2A113076-21F0-4F11-A1CF-D0E4A1D14503}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelStatic.Core", "src\Samples\Typed\SubModelStatic.Core\SubModelStatic.Core.fsproj", "{A7BA896C-1D7E-4336-BE50-032BF8E62D81}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Debug|x64.Build.0 = Debug|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Debug|x86.Build.0 = Debug|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Release|x64.ActiveCfg = Release|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Release|x64.Build.0 = Release|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Release|x86.ActiveCfg = Release|Any CPU
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9}.Release|x86.Build.0 = Release|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Debug|x64.Build.0 = Debug|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Debug|x86.Build.0 = Debug|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Release|x64.ActiveCfg = Release|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Release|x64.Build.0 = Release|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Release|x86.ActiveCfg = Release|Any CPU
+		{06B21109-54A2-47FD-B701-C5B572059F88}.Release|x86.Build.0 = Release|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Release|x64.Build.0 = Release|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{603D8145-0AD4-44BE-A730-678B9BE015E1}.Release|x86.Build.0 = Release|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Debug|x64.Build.0 = Debug|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Debug|x86.Build.0 = Debug|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Release|x64.ActiveCfg = Release|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Release|x64.Build.0 = Release|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Release|x86.ActiveCfg = Release|Any CPU
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81}.Release|x86.Build.0 = Release|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Debug|x64.Build.0 = Debug|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Debug|x86.Build.0 = Debug|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Release|x64.ActiveCfg = Release|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Release|x64.Build.0 = Release|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Release|x86.ActiveCfg = Release|Any CPU
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059}.Release|x86.Build.0 = Release|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Release|x64.Build.0 = Release|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F}.Release|x86.Build.0 = Release|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Debug|x86.Build.0 = Debug|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Release|x64.Build.0 = Release|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Release|x86.ActiveCfg = Release|Any CPU
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A}.Release|x86.Build.0 = Release|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Debug|x64.Build.0 = Debug|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Debug|x86.Build.0 = Debug|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Release|x64.ActiveCfg = Release|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Release|x64.Build.0 = Release|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Release|x86.ActiveCfg = Release|Any CPU
+		{1982CF30-6D02-45F6-808A-C35A75623343}.Release|x86.Build.0 = Release|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Release|x64.Build.0 = Release|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3}.Release|x86.Build.0 = Release|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Debug|x64.Build.0 = Debug|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Debug|x86.Build.0 = Debug|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Release|x64.ActiveCfg = Release|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Release|x64.Build.0 = Release|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Release|x86.ActiveCfg = Release|Any CPU
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9}.Release|x86.Build.0 = Release|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Debug|x64.Build.0 = Debug|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Debug|x86.Build.0 = Debug|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Release|x64.ActiveCfg = Release|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Release|x64.Build.0 = Release|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Release|x86.ActiveCfg = Release|Any CPU
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08}.Release|x86.Build.0 = Release|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Debug|x64.Build.0 = Debug|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Debug|x86.Build.0 = Debug|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Release|x64.ActiveCfg = Release|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Release|x64.Build.0 = Release|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Release|x86.ActiveCfg = Release|Any CPU
+		{02668954-D273-4140-9FD2-1BDE615A401E}.Release|x86.Build.0 = Release|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Debug|x64.Build.0 = Debug|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Debug|x86.Build.0 = Debug|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Release|x64.ActiveCfg = Release|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Release|x64.Build.0 = Release|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8565CE50-713C-4336-88AD-EAC732DC921A}.Release|x86.Build.0 = Release|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Release|x64.Build.0 = Release|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5}.Release|x86.Build.0 = Release|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Debug|x86.Build.0 = Debug|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Release|x64.Build.0 = Release|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E}.Release|x86.Build.0 = Release|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Debug|x64.Build.0 = Debug|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Debug|x86.Build.0 = Debug|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Release|x64.ActiveCfg = Release|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Release|x64.Build.0 = Release|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Release|x86.ActiveCfg = Release|Any CPU
+		{239809C7-5679-4A85-AC76-254AB83C1DF0}.Release|x86.Build.0 = Release|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Debug|x64.Build.0 = Debug|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Release|x64.ActiveCfg = Release|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Release|x64.Build.0 = Release|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E}.Release|x86.Build.0 = Release|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Release|x64.Build.0 = Release|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE}.Release|x86.Build.0 = Release|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Debug|x64.Build.0 = Debug|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Debug|x86.Build.0 = Debug|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Release|x64.ActiveCfg = Release|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Release|x64.Build.0 = Release|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Release|x86.ActiveCfg = Release|Any CPU
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2}.Release|x86.Build.0 = Release|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Debug|x64.Build.0 = Debug|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Debug|x86.Build.0 = Debug|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Release|x64.ActiveCfg = Release|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Release|x64.Build.0 = Release|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Release|x86.ActiveCfg = Release|Any CPU
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0}.Release|x86.Build.0 = Release|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Debug|x64.Build.0 = Debug|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Debug|x86.Build.0 = Debug|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Release|x64.ActiveCfg = Release|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Release|x64.Build.0 = Release|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F30FD499-8F88-4613-8B15-C06AA649881F}.Release|x86.Build.0 = Release|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Debug|x64.Build.0 = Debug|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Debug|x86.Build.0 = Debug|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Release|x64.ActiveCfg = Release|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Release|x64.Build.0 = Release|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Release|x86.ActiveCfg = Release|Any CPU
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79}.Release|x86.Build.0 = Release|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Debug|x64.Build.0 = Debug|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Debug|x86.Build.0 = Debug|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Release|x64.ActiveCfg = Release|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Release|x64.Build.0 = Release|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Release|x86.ActiveCfg = Release|Any CPU
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55}.Release|x86.Build.0 = Release|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Release|x64.Build.0 = Release|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A489E6B-CD18-442D-A856-89DDE710B009}.Release|x86.Build.0 = Release|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Debug|x64.Build.0 = Debug|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Debug|x86.Build.0 = Debug|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Release|x64.ActiveCfg = Release|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Release|x64.Build.0 = Release|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Release|x86.ActiveCfg = Release|Any CPU
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6}.Release|x86.Build.0 = Release|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Debug|x64.Build.0 = Debug|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Debug|x86.Build.0 = Debug|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Release|x64.ActiveCfg = Release|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Release|x64.Build.0 = Release|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Release|x86.ActiveCfg = Release|Any CPU
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86}.Release|x86.Build.0 = Release|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Debug|x64.Build.0 = Debug|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Debug|x86.Build.0 = Debug|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Release|x64.ActiveCfg = Release|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Release|x64.Build.0 = Release|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Release|x86.ActiveCfg = Release|Any CPU
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6}.Release|x86.Build.0 = Release|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Debug|x64.Build.0 = Debug|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Debug|x86.Build.0 = Debug|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Release|x64.ActiveCfg = Release|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Release|x64.Build.0 = Release|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Release|x86.ActiveCfg = Release|Any CPU
+		{A737F617-3916-4AC1-AEEE-69585FF89838}.Release|x86.Build.0 = Release|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Release|x64.Build.0 = Release|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4}.Release|x86.Build.0 = Release|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Debug|x64.Build.0 = Debug|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Debug|x86.Build.0 = Debug|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Release|Any CPU.Build.0 = Release|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Release|x64.ActiveCfg = Release|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Release|x64.Build.0 = Release|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Release|x86.ActiveCfg = Release|Any CPU
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755}.Release|x86.Build.0 = Release|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Debug|x64.Build.0 = Debug|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Debug|x86.Build.0 = Debug|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Release|x64.ActiveCfg = Release|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Release|x64.Build.0 = Release|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Release|x86.ActiveCfg = Release|Any CPU
+		{59976F36-A8F0-425E-9620-FA78E68E145F}.Release|x86.Build.0 = Release|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Debug|x86.Build.0 = Debug|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Release|x64.Build.0 = Release|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D}.Release|x86.Build.0 = Release|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Debug|x64.Build.0 = Debug|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Debug|x86.Build.0 = Debug|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Release|x64.ActiveCfg = Release|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Release|x64.Build.0 = Release|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Release|x86.ActiveCfg = Release|Any CPU
+		{BBC09072-9D08-454F-90BF-FD754CD60B93}.Release|x86.Build.0 = Release|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Debug|x64.Build.0 = Debug|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Debug|x86.Build.0 = Debug|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Release|x64.ActiveCfg = Release|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Release|x64.Build.0 = Release|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Release|x86.ActiveCfg = Release|Any CPU
+		{43CF5F69-38A8-493E-960A-0877E248996F}.Release|x86.Build.0 = Release|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Debug|x64.Build.0 = Debug|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Debug|x86.Build.0 = Debug|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Release|x64.ActiveCfg = Release|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Release|x64.Build.0 = Release|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Release|x86.ActiveCfg = Release|Any CPU
+		{C7D0416E-9785-40A1-921D-C92A56A9848F}.Release|x86.Build.0 = Release|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Debug|x64.Build.0 = Debug|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Debug|x86.Build.0 = Debug|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Release|x64.ActiveCfg = Release|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Release|x64.Build.0 = Release|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503}.Release|x86.Build.0 = Release|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Debug|x64.Build.0 = Debug|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Debug|x86.Build.0 = Debug|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x64.ActiveCfg = Release|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x64.Build.0 = Release|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x86.ActiveCfg = Release|Any CPU
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{ED67A1EA-E467-4ABC-B627-8D8A184E20E9} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{06B21109-54A2-47FD-B701-C5B572059F88} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{603D8145-0AD4-44BE-A730-678B9BE015E1} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{D1B4CF99-7947-DD6C-81D0-5B5B3989814C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{D93CAD63-3252-5A7F-9C37-FCA27F08B606} = {D1B4CF99-7947-DD6C-81D0-5B5B3989814C}
+		{F905EB30-20A0-42F6-9035-98C27D1CCF81} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{EBC55A44-EF7F-4D3E-8E94-8848C00C3059} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{CE4B62D4-26FD-4C6A-B1C4-6871A057CE3F} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{C1E54278-5FE4-4370-AA98-AB20F037AD6A} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{1982CF30-6D02-45F6-808A-C35A75623343} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{ABCDCFAB-666F-40FA-906F-AFC3916E25D3} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{69C45190-79DC-4F2F-B0D2-0FD84B77F8A9} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{FAD8476C-AE4E-4298-9F08-044ED3C0BA08} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{02668954-D273-4140-9FD2-1BDE615A401E} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{8565CE50-713C-4336-88AD-EAC732DC921A} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{5D83CDEA-106C-4002-BCC9-1F2BBB63EBE5} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{F884FA9A-2A79-48AB-938C-A34E8A8BCF3E} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{239809C7-5679-4A85-AC76-254AB83C1DF0} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{7B1997D7-7E82-4094-97FF-F267AB1E628E} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{464B25D1-BF6F-4F52-B8C1-2F783A4865AE} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{74BE5736-B441-4371-AB5B-F1C7A61341C2} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{54B7ACB9-F2CD-4B30-ABA6-191C37E336A0} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{F30FD499-8F88-4613-8B15-C06AA649881F} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{220CFDCE-5B3B-49C7-A340-C19B7C28BF79} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{D17190BB-8C0E-4CC3-8644-F0B120EDBD55} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{6A489E6B-CD18-442D-A856-89DDE710B009} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{E060A98E-50F0-45B0-AB5C-D33A90ADC1E6} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{86B65707-7652-4ED0-8B0A-6C4907E8FF86} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{686BA896-BD38-490A-88C1-A8D0B48D05E6} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{A737F617-3916-4AC1-AEEE-69585FF89838} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{A1B60C73-0FAC-43EF-93F9-4E6AD121F9D4} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{335C2372-CB51-4569-B04D-CE8AFC8EC755} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{59976F36-A8F0-425E-9620-FA78E68E145F} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{3D4E6246-667E-4243-B2F3-B9CE12743B8D} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{BBC09072-9D08-454F-90BF-FD754CD60B93} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{43CF5F69-38A8-493E-960A-0877E248996F} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{C7D0416E-9785-40A1-921D-C92A56A9848F} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{1740D47D-DA94-6415-017E-48203BA1C52C} = {D1B4CF99-7947-DD6C-81D0-5B5B3989814C}
+		{2A113076-21F0-4F11-A1CF-D0E4A1D14503} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{A7BA896C-1D7E-4336-BE50-032BF8E62D81} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+	EndGlobalSection
+EndGlobal

From d4c2e85c743f39d96ba61b262cc47fc0b836dda7 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 18:58:18 +0200
Subject: [PATCH 10/18] Add transposed typed samples

---
 Elmish.WPF.sln                                | 122 ++++++++++++
 Elmish.WPF.slnx                               | 100 +++++-----
 .../Typed/SingleCounter.Core/Program.fs       |  61 ++++++
 .../SingleCounter.Core.fsproj                 |  25 +++
 src/Samples/Typed/SingleCounter/App.xaml      |   7 +
 src/Samples/Typed/SingleCounter/App.xaml.cs   |  19 ++
 .../Typed/SingleCounter/MainWindow.xaml       |  20 ++
 .../Typed/SingleCounter/MainWindow.xaml.cs    |  12 ++
 .../Typed/SingleCounter/SingleCounter.csproj  |  14 ++
 src/Samples/Typed/SubModelOpt.Core/Program.fs | 182 ++++++++++++++++++
 .../SubModelOpt.Core/SubModelOpt.Core.fsproj  |  25 +++
 src/Samples/Typed/SubModelOpt/App.xaml        |   7 +
 src/Samples/Typed/SubModelOpt/App.xaml.cs     |  19 ++
 src/Samples/Typed/SubModelOpt/Form1.xaml      |  14 ++
 src/Samples/Typed/SubModelOpt/Form1.xaml.cs   |  12 ++
 src/Samples/Typed/SubModelOpt/Form2.xaml      |  14 ++
 src/Samples/Typed/SubModelOpt/Form2.xaml.cs   |  12 ++
 src/Samples/Typed/SubModelOpt/MainWindow.xaml |  46 +++++
 .../Typed/SubModelOpt/MainWindow.xaml.cs      |  12 ++
 .../Typed/SubModelOpt/SubModelOpt.csproj      |  14 ++
 src/Samples/Typed/SubModelSeq.Core/Program.fs | 156 +++++++++++++++
 .../SubModelSeq.Core/SubModelSeq.Core.fsproj  |  25 +++
 src/Samples/Typed/SubModelSeq/App.xaml        |   7 +
 src/Samples/Typed/SubModelSeq/App.xaml.cs     |  19 ++
 src/Samples/Typed/SubModelSeq/Counter.xaml    |  16 ++
 src/Samples/Typed/SubModelSeq/Counter.xaml.cs |  12 ++
 src/Samples/Typed/SubModelSeq/MainWindow.xaml |  38 ++++
 .../Typed/SubModelSeq/MainWindow.xaml.cs      |  12 ++
 .../Typed/SubModelSeq/SubModelSeq.csproj      |  14 ++
 src/Samples/Typed/Validation.Core/Program.fs  | 127 ++++++++++++
 .../Validation.Core/Validation.Core.fsproj    |  25 +++
 src/Samples/Typed/Validation/App.xaml         |   7 +
 src/Samples/Typed/Validation/App.xaml.cs      |  19 ++
 src/Samples/Typed/Validation/MainWindow.xaml  |  53 +++++
 .../Typed/Validation/MainWindow.xaml.cs       |  12 ++
 .../Typed/Validation/Validation.csproj        |  14 ++
 36 files changed, 1247 insertions(+), 46 deletions(-)
 create mode 100644 src/Samples/Typed/SingleCounter.Core/Program.fs
 create mode 100644 src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj
 create mode 100644 src/Samples/Typed/SingleCounter/App.xaml
 create mode 100644 src/Samples/Typed/SingleCounter/App.xaml.cs
 create mode 100644 src/Samples/Typed/SingleCounter/MainWindow.xaml
 create mode 100644 src/Samples/Typed/SingleCounter/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/SingleCounter/SingleCounter.csproj
 create mode 100644 src/Samples/Typed/SubModelOpt.Core/Program.fs
 create mode 100644 src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj
 create mode 100644 src/Samples/Typed/SubModelOpt/App.xaml
 create mode 100644 src/Samples/Typed/SubModelOpt/App.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelOpt/Form1.xaml
 create mode 100644 src/Samples/Typed/SubModelOpt/Form1.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelOpt/Form2.xaml
 create mode 100644 src/Samples/Typed/SubModelOpt/Form2.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelOpt/MainWindow.xaml
 create mode 100644 src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelOpt/SubModelOpt.csproj
 create mode 100644 src/Samples/Typed/SubModelSeq.Core/Program.fs
 create mode 100644 src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj
 create mode 100644 src/Samples/Typed/SubModelSeq/App.xaml
 create mode 100644 src/Samples/Typed/SubModelSeq/App.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelSeq/Counter.xaml
 create mode 100644 src/Samples/Typed/SubModelSeq/Counter.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelSeq/MainWindow.xaml
 create mode 100644 src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelSeq/SubModelSeq.csproj
 create mode 100644 src/Samples/Typed/Validation.Core/Program.fs
 create mode 100644 src/Samples/Typed/Validation.Core/Validation.Core.fsproj
 create mode 100644 src/Samples/Typed/Validation/App.xaml
 create mode 100644 src/Samples/Typed/Validation/App.xaml.cs
 create mode 100644 src/Samples/Typed/Validation/MainWindow.xaml
 create mode 100644 src/Samples/Typed/Validation/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Validation/Validation.csproj

diff --git a/Elmish.WPF.sln b/Elmish.WPF.sln
index 8d4cb0b5..968dabd9 100644
--- a/Elmish.WPF.sln
+++ b/Elmish.WPF.sln
@@ -87,6 +87,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelStatic", "src\Sampl
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelStatic.Core", "src\Samples\Typed\SubModelStatic.Core\SubModelStatic.Core.fsproj", "{A7BA896C-1D7E-4336-BE50-032BF8E62D81}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typed Samples", "Typed Samples", "{D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SingleCounter.Core", "src\Samples\Typed\SingleCounter.Core\SingleCounter.Core.fsproj", "{F964D761-6542-4A3C-8ADC-41F5B8F77529}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleCounter", "src\Samples\Typed\SingleCounter\SingleCounter.csproj", "{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Validation.Core", "src\Samples\Typed\Validation.Core\Validation.Core.fsproj", "{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation", "src\Samples\Typed\Validation\Validation.csproj", "{84AF37C1-52A8-4F3F-8F2C-E7394E789523}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelSeq.Core", "src\Samples\Typed\SubModelSeq.Core\SubModelSeq.Core.fsproj", "{75110CC0-5A94-4491-BA7E-234ACC39106D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelSeq", "src\Samples\Typed\SubModelSeq\SubModelSeq.csproj", "{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelOpt.Core", "src\Samples\Typed\SubModelOpt.Core\SubModelOpt.Core.fsproj", "{A57D4155-3F27-4BDA-900E-1A39B022BE00}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelOpt", "src\Samples\Typed\SubModelOpt\SubModelOpt.csproj", "{86E04393-86E7-4BBF-A9EF-9433B91E4988}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -541,6 +559,102 @@ Global
 		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x64.Build.0 = Release|Any CPU
 		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x86.ActiveCfg = Release|Any CPU
 		{A7BA896C-1D7E-4336-BE50-032BF8E62D81}.Release|x86.Build.0 = Release|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Debug|x64.Build.0 = Debug|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Debug|x86.Build.0 = Debug|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Release|x64.ActiveCfg = Release|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Release|x64.Build.0 = Release|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Release|x86.ActiveCfg = Release|Any CPU
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529}.Release|x86.Build.0 = Release|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Release|x64.Build.0 = Release|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}.Release|x86.Build.0 = Release|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Debug|x64.Build.0 = Debug|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Debug|x86.Build.0 = Debug|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Release|x64.ActiveCfg = Release|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Release|x64.Build.0 = Release|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Release|x86.ActiveCfg = Release|Any CPU
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A}.Release|x86.Build.0 = Release|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Debug|x64.Build.0 = Debug|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Debug|x86.Build.0 = Debug|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Release|x64.ActiveCfg = Release|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Release|x64.Build.0 = Release|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Release|x86.ActiveCfg = Release|Any CPU
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523}.Release|x86.Build.0 = Release|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Debug|x64.Build.0 = Debug|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Debug|x86.Build.0 = Debug|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Release|x64.ActiveCfg = Release|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Release|x64.Build.0 = Release|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Release|x86.ActiveCfg = Release|Any CPU
+		{75110CC0-5A94-4491-BA7E-234ACC39106D}.Release|x86.Build.0 = Release|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Debug|x64.Build.0 = Debug|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Release|x64.ActiveCfg = Release|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Release|x64.Build.0 = Release|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD}.Release|x86.Build.0 = Release|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Debug|x64.Build.0 = Debug|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Debug|x86.Build.0 = Debug|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Release|x64.ActiveCfg = Release|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Release|x64.Build.0 = Release|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Release|x86.ActiveCfg = Release|Any CPU
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00}.Release|x86.Build.0 = Release|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Debug|x64.Build.0 = Debug|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Debug|x86.Build.0 = Debug|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x64.ActiveCfg = Release|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x64.Build.0 = Release|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x86.ActiveCfg = Release|Any CPU
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -586,5 +700,13 @@ Global
 		{1740D47D-DA94-6415-017E-48203BA1C52C} = {D1B4CF99-7947-DD6C-81D0-5B5B3989814C}
 		{2A113076-21F0-4F11-A1CF-D0E4A1D14503} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{A7BA896C-1D7E-4336-BE50-032BF8E62D81} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{75110CC0-5A94-4491-BA7E-234ACC39106D} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
 	EndGlobalSection
 EndGlobal
diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 51df4b22..8c296470 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -1,58 +1,66 @@
 <Solution>
   <Folder Name="/Solution Items/">
-    <File Path="README.md"/>
-    <File Path="REFERENCE.md"/>
-    <File Path="RELEASE_NOTES.md"/>
-    <File Path="TUTORIAL.md"/>
-    <File Path=".editorconfig"/>
-    <File Path=".gitignore"/>
-    <File Path="LICENSE.md"/>
+    <File Path="README.md" />
+    <File Path="REFERENCE.md" />
+    <File Path="RELEASE_NOTES.md" />
+    <File Path="TUTORIAL.md" />
+    <File Path=".editorconfig" />
+    <File Path=".gitignore" />
+    <File Path="LICENSE.md" />
   </Folder>
   <Folder Name="/src/">
-    <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj"/>
-    <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj"/>
+    <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
+    <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj" />
   </Folder>
-  <Folder Name="/src/Samples/"/>
+  <Folder Name="/src/Samples/" />
   <Folder Name="/src/Samples/Dynamic/">
-    <Project Path="src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/Capabilities/Capabilities.csproj"/>
-    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj"/>
-    <Project Path="src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/FileDialogs/FileDialogs.csproj"/>
-    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj"/>
-    <Project Path="src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/Multiselect/Multiselect.csproj"/>
-    <Project Path="src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/NewWindow/NewWindow.csproj"/>
-    <Project Path="src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj"/>
-    <Project Path="src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/SingleCounter/SingleCounter.csproj"/>
-    <Project Path="src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/Sticky/Sticky.csproj"/>
-    <Project Path="src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/SubModel/SubModel.csproj"/>
-    <Project Path="src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj"/>
-    <Project Path="src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj"/>
-    <Project Path="src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj"/>
-    <Project Path="src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/Threading/Threading.csproj"/>
-    <Project Path="src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj"/>
-    <Project Path="src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj"/>
-    <Project Path="src/Samples/Dynamic/Validation/Validation.csproj"/>
+    <Project Path="src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/Capabilities/Capabilities.csproj" />
+    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj" />
+    <Project Path="src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/FileDialogs/FileDialogs.csproj" />
+    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
+    <Project Path="src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/Multiselect/Multiselect.csproj" />
+    <Project Path="src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/NewWindow/NewWindow.csproj" />
+    <Project Path="src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj" />
+    <Project Path="src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/SingleCounter/SingleCounter.csproj" />
+    <Project Path="src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/Sticky/Sticky.csproj" />
+    <Project Path="src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/SubModel/SubModel.csproj" />
+    <Project Path="src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj" />
+    <Project Path="src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj" />
+    <Project Path="src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj" />
+    <Project Path="src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/Threading/Threading.csproj" />
+    <Project Path="src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj" />
+    <Project Path="src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/Validation/Validation.csproj" />
   </Folder>
   <Folder Name="/src/Samples/Typed/">
-    <Project Path="src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj"/>
-    <Project Path="src/Samples/Typed/SubModelStatic/SubModelStatic.csproj"/>
+    <Project Path="src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj" />
+    <Project Path="src/Samples/Typed/SingleCounter/SingleCounter.csproj" />
+    <Project Path="src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
+    <Project Path="src/Samples/Typed/SubModelOpt/SubModelOpt.csproj" />
+    <Project Path="src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
+    <Project Path="src/Samples/Typed/SubModelSeq/SubModelSeq.csproj" />
+    <Project Path="src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj" />
+    <Project Path="src/Samples/Typed/SubModelStatic/SubModelStatic.csproj" />
+    <Project Path="src/Samples/Typed/Validation.Core/Validation.Core.fsproj" />
+    <Project Path="src/Samples/Typed/Validation/Validation.csproj" />
   </Folder>
   <Folder Name="/tests/">
-    <Project Path="tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj"/>
-    <Project Path="tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj"/>
+    <Project Path="tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
+    <Project Path="tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj" />
   </Folder>
 </Solution>
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter.Core/Program.fs b/src/Samples/Typed/SingleCounter.Core/Program.fs
new file mode 100644
index 00000000..ae9c5149
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter.Core/Program.fs
@@ -0,0 +1,61 @@
+module Elmish.WPF.Samples.SingleCounter.Program
+
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+module Counter =
+    type Model = { Count: int; StepSize: int }
+
+    type Msg =
+        | Increment
+        | Decrement
+        | SetStepSize of int
+        | Reset
+
+    let init () = { Count = 0; StepSize = 1 }
+
+    let canReset m = m <> init ()
+
+    let update msg m =
+        match msg with
+        | Increment -> { m with Count = m.Count + m.StepSize }
+        | Decrement -> { m with Count = m.Count - m.StepSize }
+        | SetStepSize x -> { m with StepSize = x }
+        | Reset -> init ()
+
+[<AllowNullLiteral>]
+type CounterViewModel(args) =
+    inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
+
+    member _.CounterValue =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Count))
+
+    member _.Increment = base.Get () (Binding.CmdT.setAlways Counter.Increment)
+    member _.Decrement = base.Get () (Binding.CmdT.setAlways Counter.Decrement)
+
+    member _.StepSize =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
+             >> Binding.mapMsg (int >> Counter.SetStepSize))
+
+    member _.Reset = base.Get () (Binding.CmdT.set Counter.canReset Counter.Reset)
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = CounterViewModel(args)
+
+    WpfProgram.mkSimpleT Counter.init Counter.update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj b/src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/App.xaml b/src/Samples/Typed/SingleCounter/App.xaml
new file mode 100644
index 00000000..318b635a
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SingleCounter.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/App.xaml.cs b/src/Samples/Typed/SingleCounter/App.xaml.cs
new file mode 100644
index 00000000..c7fea640
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SingleCounter
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/MainWindow.xaml b/src/Samples/Typed/SingleCounter/MainWindow.xaml
new file mode 100644
index 00000000..5b873f45
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter/MainWindow.xaml
@@ -0,0 +1,20 @@
+<Window x:Class="Elmish.WPF.Samples.SingleCounter.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="Single counter (Typed)"
+        Height="120"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
+    <TextBlock Text="{Binding CounterValue, StringFormat='Counter value: {0}'}" Width="110" Margin="0,5,10,5" />
+    <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
+    <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
+    <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
+    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+            Width="100" Margin="0,5,10,5" />
+    <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs b/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs
new file mode 100644
index 00000000..8675ce9d
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SingleCounter
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/SingleCounter.csproj b/src/Samples/Typed/SingleCounter/SingleCounter.csproj
new file mode 100644
index 00000000..cac23871
--- /dev/null
+++ b/src/Samples/Typed/SingleCounter/SingleCounter.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SingleCounter.Core\SingleCounter.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt.Core/Program.fs b/src/Samples/Typed/SubModelOpt.Core/Program.fs
new file mode 100644
index 00000000..b4de941b
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt.Core/Program.fs
@@ -0,0 +1,182 @@
+module Elmish.WPF.Samples.SubModelOpt.Program
+
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+module Form1 =
+    type Model = { Text: string }
+
+    type Msg =
+        | SetText of string
+        | Submit
+
+    let init = { Text = "" }
+
+    let update msg m =
+        match msg with
+        | SetText s -> { m with Text = s }
+        | Submit -> m // handled by parent
+
+[<AllowNullLiteral>]
+type Form1ViewModel(args) =
+    inherit ViewModelBase<Form1.Model, Form1.Msg>(args)
+
+    member _.Text =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Form1.Model) -> m.Text)
+             >> Binding.mapMsg Form1.SetText)
+
+    member _.Submit = base.Get () (Binding.CmdT.setAlways Form1.Submit)
+
+module Form2 =
+    type Model = { Text1: string; Text2: string }
+
+    type Msg =
+        | SetText1 of string
+        | SetText2 of string
+        | Submit
+
+    let init = { Text1 = ""; Text2 = "" }
+
+    let update msg m =
+        match msg with
+        | SetText1 s -> { m with Text1 = s }
+        | SetText2 s -> { m with Text2 = s }
+        | Submit -> m // handled by parent
+
+[<AllowNullLiteral>]
+type Form2ViewModel(args) =
+    inherit ViewModelBase<Form2.Model, Form2.Msg>(args)
+
+    member _.Text1 =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Form2.Model) -> m.Text1)
+             >> Binding.mapMsg Form2.SetText1)
+
+    member _.Text2 =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Form2.Model) -> m.Text2)
+             >> Binding.mapMsg Form2.SetText2)
+
+    member _.Submit = base.Get () (Binding.CmdT.setAlways Form2.Submit)
+
+module App =
+    type Dialog =
+        | Form1 of Form1.Model
+        | Form2 of Form2.Model
+
+    type Model = { Dialog: Dialog option }
+
+    let init () = { Dialog = None }
+
+    type Msg =
+        | ShowForm1
+        | ShowForm2
+        | Form1Msg of Form1.Msg
+        | Form2Msg of Form2.Msg
+
+    let update msg m =
+        match msg with
+        | ShowForm1 ->
+            { m with
+                Dialog = Some <| Form1 Form1.init }
+        | ShowForm2 ->
+            { m with
+                Dialog = Some <| Form2 Form2.init }
+        | Form1Msg Form1.Submit -> { m with Dialog = None }
+        | Form1Msg msg' ->
+            match m.Dialog with
+            | Some(Form1 m') ->
+                { m with
+                    Dialog = Form1.update msg' m' |> Form1 |> Some }
+            | _ -> m
+        | Form2Msg Form2.Submit -> { m with Dialog = None }
+        | Form2Msg msg' ->
+            match m.Dialog with
+            | Some(Form2 m') ->
+                { m with
+                    Dialog = Form2.update msg' m' |> Form2 |> Some }
+            | _ -> m
+
+[<AllowNullLiteral>]
+type MainViewModel(args) =
+    inherit ViewModelBase<App.Model, App.Msg>(args)
+
+    let createForm1Vm (args: ViewModelArgs<Form1.Model, Form1.Msg>) = Form1ViewModel(args)
+    let createForm2Vm (args: ViewModelArgs<Form2.Model, Form2.Msg>) = Form2ViewModel(args)
+
+    member _.ShowForm1 = base.Get () (Binding.CmdT.setAlways App.ShowForm1)
+    member _.ShowForm2 = base.Get () (Binding.CmdT.setAlways App.ShowForm2)
+
+    member _.DialogVisible =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.Dialog.IsSome))
+
+    member _.Form1Visible =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m ->
+                 match m.Dialog with
+                 | Some(App.Form1 _) -> true
+                 | _ -> false))
+
+    member _.Form2Visible =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m ->
+                 match m.Dialog with
+                 | Some(App.Form2 _) -> true
+                 | _ -> false))
+
+    member _.Form1 =
+        base.Get
+            ()
+            (Binding.SubModelT.opt createForm1Vm
+             >> Binding.mapModel (fun (m: App.Model) ->
+                 match m.Dialog with
+                 | Some(App.Form1 m') -> ValueSome m'
+                 | _ -> ValueNone)
+             >> Binding.mapMsg App.Form1Msg)
+
+    member _.Form2 =
+        base.Get
+            ()
+            (Binding.SubModelT.opt createForm2Vm
+             >> Binding.mapModel (fun (m: App.Model) ->
+                 match m.Dialog with
+                 | Some(App.Form2 m') -> ValueSome m'
+                 | _ -> ValueNone)
+             >> Binding.mapMsg App.Form2Msg)
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = MainViewModel(args)
+
+    WpfProgram.mkSimpleT App.init App.update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj b/src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/App.xaml b/src/Samples/Typed/SubModelOpt/App.xaml
new file mode 100644
index 00000000..8a732a54
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelOpt.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/App.xaml.cs b/src/Samples/Typed/SubModelOpt/App.xaml.cs
new file mode 100644
index 00000000..704fab10
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelOpt
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/Form1.xaml b/src/Samples/Typed/SubModelOpt/Form1.xaml
new file mode 100644
index 00000000..793a2fd8
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/Form1.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="Elmish.WPF.Samples.SubModelOpt.Form1"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             Padding="10"
+             mc:Ignorable="d">
+  <StackPanel Width="300">
+    <TextBlock Text="Form 1" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,0,0,5" />
+    <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True"
+             Height="80" Margin="0,5,0,5" />
+    <Button Command="{Binding Submit}" Content="Submit" />
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/Form1.xaml.cs b/src/Samples/Typed/SubModelOpt/Form1.xaml.cs
new file mode 100644
index 00000000..42ee95a5
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/Form1.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelOpt
+{
+    public partial class Form1 : UserControl
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/Form2.xaml b/src/Samples/Typed/SubModelOpt/Form2.xaml
new file mode 100644
index 00000000..3c5f2fe5
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/Form2.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="Elmish.WPF.Samples.SubModelOpt.Form2"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             Padding="10"
+             mc:Ignorable="d">
+  <StackPanel Width="300">
+    <TextBlock Text="Form 2" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,0,0,5" />
+    <TextBox Text="{Binding Text1, UpdateSourceTrigger=PropertyChanged}" Margin="0,5,0,5" />
+    <TextBox Text="{Binding Text2, UpdateSourceTrigger=PropertyChanged}" Margin="0,5,0,5" />
+    <Button Command="{Binding Submit}" Content="Submit" />
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/Form2.xaml.cs b/src/Samples/Typed/SubModelOpt/Form2.xaml.cs
new file mode 100644
index 00000000..55854545
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/Form2.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelOpt
+{
+    public partial class Form2 : UserControl
+    {
+        public Form2()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/MainWindow.xaml b/src/Samples/Typed/SubModelOpt/MainWindow.xaml
new file mode 100644
index 00000000..2012a634
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/MainWindow.xaml
@@ -0,0 +1,46 @@
+<Window x:Class="Elmish.WPF.Samples.SubModelOpt.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elmish.WPF.Samples.SubModelOpt"
+        Title="Sub-model Optional (Typed)"
+        Height="350"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <Window.Resources>
+    <ResourceDictionary>
+      <BooleanToVisibilityConverter x:Key="VisibilityConverter" />
+    </ResourceDictionary>
+  </Window.Resources>
+  <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+    <StackPanel Margin="0,15,0,0">
+      <Button Command="{Binding ShowForm1}" Content="Show form 1" Width="200" Margin="0,5,0,5" />
+      <Button Command="{Binding ShowForm2}" Content="Show form 2" Width="200" Margin="0,5,0,5" />
+    </StackPanel>
+    <Rectangle
+      Fill="Black"
+      Opacity="0.6"
+      Visibility="{Binding DialogVisible, Converter={StaticResource VisibilityConverter}}" />
+    <Border
+      BorderBrush="Black"
+      BorderThickness="2"
+      Width="350"
+      Height="200"
+      Visibility="{Binding DialogVisible, Converter={StaticResource VisibilityConverter}}">
+      <StackPanel Background="White">
+        <local:Form1
+          DataContext="{Binding Form1}"
+          Visibility="{Binding DataContext.Form1Visible,
+                         RelativeSource={RelativeSource AncestorType=StackPanel},
+                         Converter={StaticResource VisibilityConverter}}" />
+        <local:Form2
+          DataContext="{Binding Form2}"
+          Visibility="{Binding DataContext.Form2Visible,
+                         RelativeSource={RelativeSource AncestorType=StackPanel},
+                         Converter={StaticResource VisibilityConverter}}" />
+      </StackPanel>
+    </Border>
+  </Grid>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs b/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs
new file mode 100644
index 00000000..56844fbb
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelOpt
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/SubModelOpt.csproj b/src/Samples/Typed/SubModelOpt/SubModelOpt.csproj
new file mode 100644
index 00000000..5c9aecac
--- /dev/null
+++ b/src/Samples/Typed/SubModelOpt/SubModelOpt.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SubModelOpt.Core\SubModelOpt.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq.Core/Program.fs b/src/Samples/Typed/SubModelSeq.Core/Program.fs
new file mode 100644
index 00000000..6b77675f
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq.Core/Program.fs
@@ -0,0 +1,156 @@
+module Elmish.WPF.Samples.SubModelSeq.Program
+
+open System
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+module Counter =
+    type Model = { Id: Guid; Count: int; StepSize: int }
+
+    type Msg =
+        | Increment
+        | Decrement
+        | SetStepSize of int
+        | Reset
+
+    let init id = { Id = id; Count = 0; StepSize = 1 }
+
+    let canReset m = m.Count <> 0 || m.StepSize <> 1
+
+    let update msg m =
+        match msg with
+        | Increment -> { m with Count = m.Count + m.StepSize }
+        | Decrement -> { m with Count = m.Count - m.StepSize }
+        | SetStepSize x -> { m with StepSize = x }
+        | Reset -> { m with Count = 0; StepSize = 1 }
+
+[<AllowNullLiteral>]
+type CounterViewModel(args) =
+    inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
+
+    member _.CounterId =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Id))
+
+    member _.CounterValue =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Count))
+
+    member _.Increment = base.Get () (Binding.CmdT.setAlways Counter.Increment)
+    member _.Decrement = base.Get () (Binding.CmdT.setAlways Counter.Decrement)
+
+    member _.StepSize =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
+             >> Binding.mapMsg (int >> Counter.SetStepSize))
+
+    member _.Reset = base.Get () (Binding.CmdT.set Counter.canReset Counter.Reset)
+
+module App =
+    type Model =
+        { Counters: Counter.Model list
+          GlobalState: bool }
+
+    type CounterOutMsg = | Remove
+
+    type Msg =
+        | AddCounter
+        | RemoveCounter of Guid
+        | CounterMsg of Guid * Counter.Msg
+        | ToggleGlobalState
+
+    let init () =
+        { Counters = [ Counter.init (Guid.NewGuid()) ]
+          GlobalState = false }
+
+    let update msg m =
+        match msg with
+        | AddCounter ->
+            { m with
+                Counters = m.Counters @ [ Counter.init (Guid.NewGuid()) ] }
+        | RemoveCounter id ->
+            { m with
+                Counters = m.Counters |> List.filter (fun c -> c.Id <> id) }
+        | CounterMsg(id, counterMsg) ->
+            { m with
+                Counters =
+                    m.Counters
+                    |> List.map (fun c -> if c.Id = id then Counter.update counterMsg c else c) }
+        | ToggleGlobalState ->
+            { m with
+                GlobalState = not m.GlobalState }
+
+type InOutMsg<'a, 'b> =
+    | InMsg of 'a
+    | OutMsg of 'b
+
+[<AllowNullLiteral>]
+type CounterWithRemoveViewModel(args) =
+    inherit ViewModelBase<Counter.Model, InOutMsg<Counter.Msg, App.CounterOutMsg>>(args)
+
+    member _.CounterId =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Id))
+
+    member _.CounterValue =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Count))
+
+    member _.Increment = base.Get () (Binding.CmdT.setAlways (InMsg Counter.Increment))
+    member _.Decrement = base.Get () (Binding.CmdT.setAlways (InMsg Counter.Decrement))
+
+    member _.StepSize =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
+             >> Binding.mapMsg (int >> Counter.SetStepSize >> InMsg))
+
+    member _.Reset = base.Get () (Binding.CmdT.set Counter.canReset (InMsg Counter.Reset))
+
+    member _.Remove =
+        base.Get () (Binding.CmdT.setAlways (OutMsg App.CounterOutMsg.Remove))
+
+[<AllowNullLiteral>]
+type MainViewModel(args) =
+    inherit ViewModelBase<App.Model, App.Msg>(args)
+
+    let createCounterVm (args: ViewModelArgs<Counter.Model, InOutMsg<Counter.Msg, App.CounterOutMsg>>) =
+        CounterWithRemoveViewModel(args)
+
+    member _.Counters =
+        base.Get
+            ()
+            (Binding.SubModelSeqKeyedT.id createCounterVm (fun (m: Counter.Model) -> m.Id)
+             >> Binding.mapModel (fun (m: App.Model) -> m.Counters)
+             >> Binding.mapMsg (fun (id, msg) ->
+                 match msg with
+                 | InMsg counterMsg -> App.CounterMsg(id, counterMsg)
+                 | OutMsg App.CounterOutMsg.Remove -> App.RemoveCounter id))
+
+    member _.AddCounter = base.Get () (Binding.CmdT.setAlways App.AddCounter)
+    member _.ToggleGlobalState = base.Get () (Binding.CmdT.setAlways App.ToggleGlobalState)
+
+    member _.GlobalState =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.GlobalState))
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = MainViewModel(args)
+
+    WpfProgram.mkSimpleT App.init App.update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj b/src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/App.xaml b/src/Samples/Typed/SubModelSeq/App.xaml
new file mode 100644
index 00000000..15d2324c
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelSeq.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/App.xaml.cs b/src/Samples/Typed/SubModelSeq/App.xaml.cs
new file mode 100644
index 00000000..ef8b5d41
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSeq
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/Counter.xaml b/src/Samples/Typed/SubModelSeq/Counter.xaml
new file mode 100644
index 00000000..f1f6709d
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/Counter.xaml
@@ -0,0 +1,16 @@
+<UserControl x:Class="Elmish.WPF.Samples.SubModelSeq.Counter"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d">
+  <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top">
+    <TextBlock Text="{Binding CounterValue, StringFormat='Counter value: {0}'}" Width="110" Margin="0,5,10,5" />
+    <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
+    <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
+    <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
+    <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
+    <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+            Width="100" Margin="0,5,10,5" />
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/Counter.xaml.cs b/src/Samples/Typed/SubModelSeq/Counter.xaml.cs
new file mode 100644
index 00000000..c03dd94d
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/Counter.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows.Controls;
+
+namespace Elmish.WPF.Samples.SubModelSeq
+{
+    public partial class Counter : UserControl
+    {
+        public Counter()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/MainWindow.xaml b/src/Samples/Typed/SubModelSeq/MainWindow.xaml
new file mode 100644
index 00000000..584cea3b
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/MainWindow.xaml
@@ -0,0 +1,38 @@
+<Window x:Class="Elmish.WPF.Samples.SubModelSeq.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elmish.WPF.Samples.SubModelSeq"
+        Title="SubModelSeq (Typed)"
+        Height="600"
+        Width="800"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <Grid Margin="0,20,0,10">
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Command="{Binding AddCounter}" Content="Add counter" Width="150" Margin="10,0,10,20" />
+      <Button Command="{Binding ToggleGlobalState}" Content="Toggle global state" Width="150" Margin="10,0,10,20" />
+      <TextBlock Text="{Binding GlobalState, StringFormat='Global state: {0}'}" Margin="10,5,10,5" />
+    </StackPanel>
+    <ScrollViewer Grid.Row="1">
+      <ItemsControl ItemsSource="{Binding Counters}">
+        <ItemsControl.ItemTemplate>
+          <DataTemplate>
+            <Border BorderBrush="LightGray" BorderThickness="1" Margin="10,5" Padding="10">
+              <StackPanel>
+                <TextBlock Text="{Binding CounterId, StringFormat='Counter ID: {0}'}" Margin="0,0,0,10" FontWeight="Bold" />
+                <local:Counter />
+                <Button Command="{Binding Remove}" Content="Remove" Width="100" Margin="0,10,0,0" />
+              </StackPanel>
+            </Border>
+          </DataTemplate>
+        </ItemsControl.ItemTemplate>
+      </ItemsControl>
+    </ScrollViewer>
+  </Grid>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs b/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs
new file mode 100644
index 00000000..4ea1fb9b
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSeq
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/SubModelSeq.csproj b/src/Samples/Typed/SubModelSeq/SubModelSeq.csproj
new file mode 100644
index 00000000..2e60e796
--- /dev/null
+++ b/src/Samples/Typed/SubModelSeq/SubModelSeq.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SubModelSeq.Core\SubModelSeq.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation.Core/Program.fs b/src/Samples/Typed/Validation.Core/Program.fs
new file mode 100644
index 00000000..c1c656fa
--- /dev/null
+++ b/src/Samples/Typed/Validation.Core/Program.fs
@@ -0,0 +1,127 @@
+module Elmish.WPF.Samples.Validation.Program
+
+open System
+open System.Linq
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+module Result =
+    module Error =
+        let toList =
+            function
+            | Ok _ -> []
+            | Error e -> [ e ]
+
+let requireNotEmpty s =
+    if String.IsNullOrEmpty s then
+        Error "This field is required"
+    else
+        Ok s
+
+let parseInt (s: string) =
+    match Int32.TryParse s with
+    | true, i -> Ok i
+    | false, _ -> Error "Please enter a valid integer"
+
+let requireExactly y x =
+    if x = y then Ok x else Error <| sprintf "Please enter %A" y
+
+let validateInt42 =
+    requireNotEmpty >> Result.bind parseInt >> Result.bind (requireExactly 42)
+
+let validatePassword (s: string) =
+    [ if s.All(fun c -> Char.IsDigit c |> not) then
+          "Must contain a digit"
+      if s.All(fun c -> Char.IsLower c |> not) then
+          "Must contain a lowercase letter"
+      if s.All(fun c -> Char.IsUpper c |> not) then
+          "Must contain an uppercase letter" ]
+
+module Validation =
+    type Model =
+        { UpdateCount: int
+          Value: string
+          Password: string }
+
+    let init () =
+        { UpdateCount = 0
+          Value = ""
+          Password = "" }
+
+    type Msg =
+        | NewValue of string
+        | NewPassword of string
+        | Submit
+
+    let increaseUpdateCount m =
+        { m with
+            UpdateCount = m.UpdateCount + 1 }
+
+    let update msg m =
+        let m = increaseUpdateCount m
+
+        match msg with
+        | NewValue x -> { m with Value = x }
+        | NewPassword x -> { m with Password = x }
+        | Submit -> m
+
+    let errorOnEven m =
+        if m.UpdateCount % 2 = 0 then
+            [ "Even counts have this error" ]
+        else
+            []
+
+    let canSubmit m =
+        (match validateInt42 m.Value with
+         | Ok _ -> true
+         | Error _ -> false)
+        && (validatePassword m.Password |> List.isEmpty)
+
+[<AllowNullLiteral>]
+type ValidationViewModel(args) =
+    inherit ViewModelBase<Validation.Model, Validation.Msg>(args)
+
+    member _.UpdateCount =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Validation.Model) -> m.UpdateCount)
+             >> Binding.addValidation Validation.errorOnEven)
+
+    member _.Value =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Validation.Model) -> m.Value)
+             >> Binding.mapMsg Validation.NewValue
+             >> Binding.addValidation (fun m -> m.Value |> validateInt42 |> Result.Error.toList))
+
+    member _.Password =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Validation.Model) -> m.Password)
+             >> Binding.mapMsg Validation.NewPassword
+             >> Binding.addValidation (fun m -> m.Password |> validatePassword))
+
+    member _.Submit = base.Get () (Binding.CmdT.set Validation.canSubmit Validation.Submit)
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = ValidationViewModel(args)
+
+    WpfProgram.mkSimpleT Validation.init Validation.update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation.Core/Validation.Core.fsproj b/src/Samples/Typed/Validation.Core/Validation.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/Validation.Core/Validation.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/App.xaml b/src/Samples/Typed/Validation/App.xaml
new file mode 100644
index 00000000..5a7b5bc0
--- /dev/null
+++ b/src/Samples/Typed/Validation/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.Validation.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/App.xaml.cs b/src/Samples/Typed/Validation/App.xaml.cs
new file mode 100644
index 00000000..f4caa2c4
--- /dev/null
+++ b/src/Samples/Typed/Validation/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Validation
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/MainWindow.xaml b/src/Samples/Typed/Validation/MainWindow.xaml
new file mode 100644
index 00000000..2024d48f
--- /dev/null
+++ b/src/Samples/Typed/Validation/MainWindow.xaml
@@ -0,0 +1,53 @@
+<Window x:Class="Elmish.WPF.Samples.Validation.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="Validation (Typed)"
+        Height="300"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <Window.Resources>
+    <Style x:Key="textBoxInError" TargetType="Control">
+      <Setter Property="Validation.ErrorTemplate">
+        <Setter.Value>
+          <ControlTemplate>
+            <DockPanel>
+              <TextBlock DockPanel.Dock="Left" Foreground="Red" FontWeight="Bold">*</TextBlock>
+              <ItemsControl DockPanel.Dock="Bottom"
+                            ItemsSource="{Binding ElementName=placeholder, Path=AdornedElement.(Validation.Errors)}">
+                <ItemsControl.ItemTemplate>
+                  <DataTemplate>
+                    <TextBlock Text="{Binding ErrorContent}" Foreground="Red" />
+                  </DataTemplate>
+                </ItemsControl.ItemTemplate>
+              </ItemsControl>
+              <Border BorderBrush="Red" BorderThickness="2">
+                <AdornedElementPlaceholder x:Name="placeholder" />
+              </Border>
+            </DockPanel>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+  </Window.Resources>
+  <StackPanel HorizontalAlignment="Center" Margin="0,25,0,0">
+    <StackPanel Orientation="Horizontal">
+      <TextBlock Text="Update count:         " />
+      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount}" Width="200"
+               Margin="0,5,0,25" />
+    </StackPanel>
+    <StackPanel Orientation="Horizontal">
+      <TextBlock Text="Value:         " />
+      <TextBox Style="{StaticResource textBoxInError}" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
+               Width="200" Margin="0,5,0,25" />
+    </StackPanel>
+    <StackPanel Orientation="Horizontal">
+      <TextBlock Text="Password:   " />
+      <TextBox Style="{StaticResource textBoxInError}" Text="{Binding Password, UpdateSourceTrigger=PropertyChanged}"
+               Width="200" Margin="0,5,0,25" />
+    </StackPanel>
+    <Button Command="{Binding Submit}" Content="Submit" Margin="0,40,10,5" Width="50" />
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/MainWindow.xaml.cs b/src/Samples/Typed/Validation/MainWindow.xaml.cs
new file mode 100644
index 00000000..faceea79
--- /dev/null
+++ b/src/Samples/Typed/Validation/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Validation
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/Validation.csproj b/src/Samples/Typed/Validation/Validation.csproj
new file mode 100644
index 00000000..248e683a
--- /dev/null
+++ b/src/Samples/Typed/Validation/Validation.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Validation.Core\Validation.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file

From 7cc6eeeec3a85a91a376d3e0a19a405544ed8757 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 20:40:47 +0200
Subject: [PATCH 11/18] Add transposed typed samples

---
 Elmish.WPF.sln                                | 334 ++++++++++++++++++
 Elmish.WPF.slnx                               |   1 -
 .../Capabilities.Core.fsproj                  |  27 ++
 .../Typed/Capabilities.Core/Program.fs        |  81 +++++
 .../Typed/Capabilities.Core/Selection.fs      | 103 ++++++
 .../Typed/Capabilities.Core/Utilities.fs      |   6 +
 src/Samples/Typed/Capabilities/App.xaml       |   6 +
 src/Samples/Typed/Capabilities/App.xaml.cs    |  19 +
 .../Typed/Capabilities/Capabilities.csproj    |  18 +
 .../Typed/Capabilities/MainWindow.xaml        |  23 ++
 .../Typed/Capabilities/MainWindow.xaml.cs     |  11 +
 .../Selection/BindableSelectedValue.cs        |  40 +++
 .../Selection/SelectionScreen.xaml            |  72 ++++
 .../Selection/SelectionScreen.xaml.cs         |  19 +
 .../EventBindingsAndBehaviors.Core.fsproj     |  25 ++
 .../EventBindingsAndBehaviors.Core/Program.fs |  92 +++++
 .../Typed/EventBindingsAndBehaviors/App.xaml  |   7 +
 .../EventBindingsAndBehaviors/App.xaml.cs     |  18 +
 .../EventBindingsAndBehaviors.csproj          |  18 +
 .../FocusWhenVisibleBehavior.cs               |  24 ++
 .../EventBindingsAndBehaviors/MainWindow.xaml |  81 +++++
 .../MainWindow.xaml.cs                        |  11 +
 .../FileDialogs.Core/FileDialogs.Core.fsproj  |  25 ++
 src/Samples/Typed/FileDialogs.Core/Program.fs | 143 ++++++++
 src/Samples/Typed/FileDialogs/App.xaml        |   7 +
 src/Samples/Typed/FileDialogs/App.xaml.cs     |  18 +
 .../Typed/FileDialogs/FileDialogs.csproj      |  14 +
 src/Samples/Typed/FileDialogs/MainWindow.xaml |  24 ++
 .../Typed/FileDialogs/MainWindow.xaml.cs      |  11 +
 .../FileDialogsCmdMsg.Core.fsproj             |  25 ++
 .../Typed/FileDialogsCmdMsg.Core/Program.fs   | 152 ++++++++
 src/Samples/Typed/FileDialogsCmdMsg/App.xaml  |   7 +
 .../Typed/FileDialogsCmdMsg/App.xaml.cs       |  18 +
 .../FileDialogsCmdMsg.csproj                  |  14 +
 .../Typed/FileDialogsCmdMsg/MainWindow.xaml   |  26 ++
 .../FileDialogsCmdMsg/MainWindow.xaml.cs      |  11 +
 .../Multiselect.Core/Multiselect.Core.fsproj  |  25 ++
 src/Samples/Typed/Multiselect.Core/Program.fs | 102 ++++++
 src/Samples/Typed/Multiselect/App.xaml        |   7 +
 src/Samples/Typed/Multiselect/App.xaml.cs     |  18 +
 src/Samples/Typed/Multiselect/MainWindow.xaml |  44 +++
 .../Typed/Multiselect/MainWindow.xaml.cs      |  11 +
 .../Typed/Multiselect/Multiselect.csproj      |  14 +
 src/Samples/Typed/NewWindow.Core/App.fs       |  77 ++++
 src/Samples/Typed/NewWindow.Core/AutoOpen.fs  |  31 ++
 .../NewWindow.Core/NewWindow.Core.fsproj      |  29 ++
 src/Samples/Typed/NewWindow.Core/Program.fs   |  33 ++
 src/Samples/Typed/NewWindow.Core/Window1.fs   |  13 +
 src/Samples/Typed/NewWindow.Core/Window2.fs   | 106 ++++++
 src/Samples/Typed/NewWindow/App.xaml          |   8 +
 src/Samples/Typed/NewWindow/App.xaml.cs       |  18 +
 src/Samples/Typed/NewWindow/MainWindow.xaml   |  30 ++
 .../Typed/NewWindow/MainWindow.xaml.cs        |  15 +
 src/Samples/Typed/NewWindow/NewWindow.csproj  |  18 +
 src/Samples/Typed/NewWindow/Window1.xaml      |  31 ++
 src/Samples/Typed/NewWindow/Window1.xaml.cs   |  11 +
 src/Samples/Typed/NewWindow/Window2.xaml      |  64 ++++
 src/Samples/Typed/NewWindow/Window2.xaml.cs   |  11 +
 .../OneWaySeq.Core/OneWaySeq.Core.fsproj      |  25 ++
 src/Samples/Typed/OneWaySeq.Core/Program.fs   |  62 ++++
 src/Samples/Typed/OneWaySeq/App.xaml          |   7 +
 src/Samples/Typed/OneWaySeq/App.xaml.cs       |  19 +
 src/Samples/Typed/OneWaySeq/MainWindow.xaml   |  30 ++
 .../Typed/OneWaySeq/MainWindow.xaml.cs        |  12 +
 src/Samples/Typed/OneWaySeq/OneWaySeq.csproj  |  14 +
 src/Samples/Typed/Sticky.Core/Program.fs      |  65 ++++
 .../Typed/Sticky.Core/Sticky.Core.fsproj      |  25 ++
 src/Samples/Typed/Sticky/App.xaml             |   7 +
 src/Samples/Typed/Sticky/App.xaml.cs          |  19 +
 src/Samples/Typed/Sticky/MainWindow.xaml      |  23 ++
 src/Samples/Typed/Sticky/MainWindow.xaml.cs   |  12 +
 src/Samples/Typed/Sticky/Sticky.csproj        |  14 +
 .../SubModelSelectedItem.Core/Program.fs      |  82 +++++
 .../SubModelSelectedItem.Core.fsproj          |  25 ++
 .../Typed/SubModelSelectedItem/App.xaml       |   7 +
 .../Typed/SubModelSelectedItem/App.xaml.cs    |  18 +
 .../SubModelSelectedItem/MainWindow.xaml      |  30 ++
 .../SubModelSelectedItem/MainWindow.xaml.cs   |  11 +
 .../SubModelSelectedItem.csproj               |  14 +
 src/Samples/Typed/Threading.Core/Program.fs   |  92 +++++
 .../Threading.Core/Threading.Core.fsproj      |  25 ++
 src/Samples/Typed/Threading/App.xaml          |   6 +
 src/Samples/Typed/Threading/App.xaml.cs       |  31 ++
 src/Samples/Typed/Threading/MainWindow.xaml   |  22 ++
 .../Typed/Threading/MainWindow.xaml.cs        |  18 +
 src/Samples/Typed/Threading/Threading.csproj  |  18 +
 .../Typed/UiBoundCmdParam.Core/Program.fs     |  62 ++++
 .../UiBoundCmdParam.Core.fsproj               |  25 ++
 src/Samples/Typed/UiBoundCmdParam/App.xaml    |   7 +
 src/Samples/Typed/UiBoundCmdParam/App.xaml.cs |  18 +
 .../Typed/UiBoundCmdParam/MainWindow.xaml     |  34 ++
 .../Typed/UiBoundCmdParam/MainWindow.xaml.cs  |  11 +
 .../UiBoundCmdParam/UiBoundCmdParam.csproj    |  14 +
 93 files changed, 3150 insertions(+), 1 deletion(-)
 create mode 100644 src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj
 create mode 100644 src/Samples/Typed/Capabilities.Core/Program.fs
 create mode 100644 src/Samples/Typed/Capabilities.Core/Selection.fs
 create mode 100644 src/Samples/Typed/Capabilities.Core/Utilities.fs
 create mode 100644 src/Samples/Typed/Capabilities/App.xaml
 create mode 100644 src/Samples/Typed/Capabilities/App.xaml.cs
 create mode 100644 src/Samples/Typed/Capabilities/Capabilities.csproj
 create mode 100644 src/Samples/Typed/Capabilities/MainWindow.xaml
 create mode 100644 src/Samples/Typed/Capabilities/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Capabilities/Selection/BindableSelectedValue.cs
 create mode 100644 src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml
 create mode 100644 src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml.cs
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors/App.xaml
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors/App.xaml.cs
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml
 create mode 100644 src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj
 create mode 100644 src/Samples/Typed/FileDialogs.Core/Program.fs
 create mode 100644 src/Samples/Typed/FileDialogs/App.xaml
 create mode 100644 src/Samples/Typed/FileDialogs/App.xaml.cs
 create mode 100644 src/Samples/Typed/FileDialogs/FileDialogs.csproj
 create mode 100644 src/Samples/Typed/FileDialogs/MainWindow.xaml
 create mode 100644 src/Samples/Typed/FileDialogs/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg/App.xaml
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg/App.xaml.cs
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml
 create mode 100644 src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj
 create mode 100644 src/Samples/Typed/Multiselect.Core/Program.fs
 create mode 100644 src/Samples/Typed/Multiselect/App.xaml
 create mode 100644 src/Samples/Typed/Multiselect/App.xaml.cs
 create mode 100644 src/Samples/Typed/Multiselect/MainWindow.xaml
 create mode 100644 src/Samples/Typed/Multiselect/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Multiselect/Multiselect.csproj
 create mode 100644 src/Samples/Typed/NewWindow.Core/App.fs
 create mode 100644 src/Samples/Typed/NewWindow.Core/AutoOpen.fs
 create mode 100644 src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj
 create mode 100644 src/Samples/Typed/NewWindow.Core/Program.fs
 create mode 100644 src/Samples/Typed/NewWindow.Core/Window1.fs
 create mode 100644 src/Samples/Typed/NewWindow.Core/Window2.fs
 create mode 100644 src/Samples/Typed/NewWindow/App.xaml
 create mode 100644 src/Samples/Typed/NewWindow/App.xaml.cs
 create mode 100644 src/Samples/Typed/NewWindow/MainWindow.xaml
 create mode 100644 src/Samples/Typed/NewWindow/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/NewWindow/NewWindow.csproj
 create mode 100644 src/Samples/Typed/NewWindow/Window1.xaml
 create mode 100644 src/Samples/Typed/NewWindow/Window1.xaml.cs
 create mode 100644 src/Samples/Typed/NewWindow/Window2.xaml
 create mode 100644 src/Samples/Typed/NewWindow/Window2.xaml.cs
 create mode 100644 src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj
 create mode 100644 src/Samples/Typed/OneWaySeq.Core/Program.fs
 create mode 100644 src/Samples/Typed/OneWaySeq/App.xaml
 create mode 100644 src/Samples/Typed/OneWaySeq/App.xaml.cs
 create mode 100644 src/Samples/Typed/OneWaySeq/MainWindow.xaml
 create mode 100644 src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/OneWaySeq/OneWaySeq.csproj
 create mode 100644 src/Samples/Typed/Sticky.Core/Program.fs
 create mode 100644 src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj
 create mode 100644 src/Samples/Typed/Sticky/App.xaml
 create mode 100644 src/Samples/Typed/Sticky/App.xaml.cs
 create mode 100644 src/Samples/Typed/Sticky/MainWindow.xaml
 create mode 100644 src/Samples/Typed/Sticky/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Sticky/Sticky.csproj
 create mode 100644 src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
 create mode 100644 src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
 create mode 100644 src/Samples/Typed/SubModelSelectedItem/App.xaml
 create mode 100644 src/Samples/Typed/SubModelSelectedItem/App.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml
 create mode 100644 src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj
 create mode 100644 src/Samples/Typed/Threading.Core/Program.fs
 create mode 100644 src/Samples/Typed/Threading.Core/Threading.Core.fsproj
 create mode 100644 src/Samples/Typed/Threading/App.xaml
 create mode 100644 src/Samples/Typed/Threading/App.xaml.cs
 create mode 100644 src/Samples/Typed/Threading/MainWindow.xaml
 create mode 100644 src/Samples/Typed/Threading/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Threading/Threading.csproj
 create mode 100644 src/Samples/Typed/UiBoundCmdParam.Core/Program.fs
 create mode 100644 src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
 create mode 100644 src/Samples/Typed/UiBoundCmdParam/App.xaml
 create mode 100644 src/Samples/Typed/UiBoundCmdParam/App.xaml.cs
 create mode 100644 src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml
 create mode 100644 src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj

diff --git a/Elmish.WPF.sln b/Elmish.WPF.sln
index 968dabd9..a790a7b7 100644
--- a/Elmish.WPF.sln
+++ b/Elmish.WPF.sln
@@ -105,6 +105,54 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelOpt.Core", "src\Sam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelOpt", "src\Samples\Typed\SubModelOpt\SubModelOpt.csproj", "{86E04393-86E7-4BBF-A9EF-9433B91E4988}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Sticky.Core", "src\Samples\Typed\Sticky.Core\Sticky.Core.fsproj", "{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sticky", "src\Samples\Typed\Sticky\Sticky.csproj", "{435B3E59-C5B2-412A-86DC-795F1E52C223}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "OneWaySeq.Core", "src\Samples\Typed\OneWaySeq.Core\OneWaySeq.Core.fsproj", "{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWaySeq", "src\Samples\Typed\OneWaySeq\OneWaySeq.csproj", "{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UiBoundCmdParam.Core", "src\Samples\Typed\UiBoundCmdParam.Core\UiBoundCmdParam.Core.fsproj", "{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiBoundCmdParam", "src\Samples\Typed\UiBoundCmdParam\UiBoundCmdParam.csproj", "{03FA4F94-962D-4324-B71E-D36E638D13D7}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EventBindingsAndBehaviors.Core", "src\Samples\Typed\EventBindingsAndBehaviors.Core\EventBindingsAndBehaviors.Core.fsproj", "{197B01F2-1974-46A1-9C40-7303E405BFA7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventBindingsAndBehaviors", "src\Samples\Typed\EventBindingsAndBehaviors\EventBindingsAndBehaviors.csproj", "{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FileDialogs.Core", "src\Samples\Typed\FileDialogs.Core\FileDialogs.Core.fsproj", "{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileDialogs", "src\Samples\Typed\FileDialogs\FileDialogs.csproj", "{FC2045E2-A48F-4389-9F72-90EDE8918FCC}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FileDialogsCmdMsg.Core", "src\Samples\Typed\FileDialogsCmdMsg.Core\FileDialogsCmdMsg.Core.fsproj", "{9B3D5A8F-16CD-4644-A239-EC2519195C80}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileDialogsCmdMsg", "src\Samples\Typed\FileDialogsCmdMsg\FileDialogsCmdMsg.csproj", "{BB30719A-3461-493E-972F-F6CEF534163E}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Threading.Core", "src\Samples\Typed\Threading.Core\Threading.Core.fsproj", "{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Threading", "src\Samples\Typed\Threading\Threading.csproj", "{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SamplesTyped", "SamplesTyped", "{4CA4C854-E741-1F89-40C8-44936FD249BC}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Multiselect.Core", "src\Samples\Typed\Multiselect.Core\Multiselect.Core.fsproj", "{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Multiselect", "src\Samples\Typed\Multiselect\Multiselect.csproj", "{20D9470B-F39E-4E67-A00D-9714D6E857DE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typed", "Typed", "{66D998A7-9C00-98D2-A5B4-91D444794DB6}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelSelectedItem.Core", "src\Samples\Typed\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj", "{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelSelectedItem", "src\Samples\Typed\SubModelSelectedItem\SubModelSelectedItem.csproj", "{F10A1DEA-545F-4C9F-AFA1-A115726BD415}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "NewWindow.Core", "src\Samples\Typed\NewWindow.Core\NewWindow.Core.fsproj", "{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewWindow", "src\Samples\Typed\NewWindow\NewWindow.csproj", "{565FC442-5E49-42AD-AC33-14AD14E11961}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Capabilities.Core", "src\Samples\Typed\Capabilities.Core\Capabilities.Core.fsproj", "{F6BB74C6-971A-44D7-BC10-3B37B74DE264}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Capabilities", "src\Samples\Typed\Capabilities\Capabilities.csproj", "{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -655,6 +703,270 @@ Global
 		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x64.Build.0 = Release|Any CPU
 		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x86.ActiveCfg = Release|Any CPU
 		{86E04393-86E7-4BBF-A9EF-9433B91E4988}.Release|x86.Build.0 = Release|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Release|x64.Build.0 = Release|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F}.Release|x86.Build.0 = Release|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Debug|x64.Build.0 = Debug|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Debug|x86.Build.0 = Debug|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Release|Any CPU.Build.0 = Release|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Release|x64.ActiveCfg = Release|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Release|x64.Build.0 = Release|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Release|x86.ActiveCfg = Release|Any CPU
+		{435B3E59-C5B2-412A-86DC-795F1E52C223}.Release|x86.Build.0 = Release|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Debug|x64.Build.0 = Debug|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Debug|x86.Build.0 = Debug|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Release|x64.ActiveCfg = Release|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Release|x64.Build.0 = Release|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643}.Release|x86.Build.0 = Release|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Debug|x64.Build.0 = Debug|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Release|x64.ActiveCfg = Release|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Release|x64.Build.0 = Release|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6}.Release|x86.Build.0 = Release|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Release|x64.Build.0 = Release|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240}.Release|x86.Build.0 = Release|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Release|x64.Build.0 = Release|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{03FA4F94-962D-4324-B71E-D36E638D13D7}.Release|x86.Build.0 = Release|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Release|x64.Build.0 = Release|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{197B01F2-1974-46A1-9C40-7303E405BFA7}.Release|x86.Build.0 = Release|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Release|x64.Build.0 = Release|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1}.Release|x86.Build.0 = Release|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Debug|x64.Build.0 = Debug|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Debug|x86.Build.0 = Debug|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Release|x64.ActiveCfg = Release|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Release|x64.Build.0 = Release|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Release|x86.ActiveCfg = Release|Any CPU
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED}.Release|x86.Build.0 = Release|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Debug|x64.Build.0 = Debug|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Debug|x86.Build.0 = Debug|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Release|x64.ActiveCfg = Release|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Release|x64.Build.0 = Release|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Release|x86.ActiveCfg = Release|Any CPU
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC}.Release|x86.Build.0 = Release|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Debug|x64.Build.0 = Debug|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Debug|x86.Build.0 = Debug|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Release|x64.ActiveCfg = Release|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Release|x64.Build.0 = Release|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80}.Release|x86.Build.0 = Release|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Release|x64.Build.0 = Release|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB30719A-3461-493E-972F-F6CEF534163E}.Release|x86.Build.0 = Release|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Release|x64.Build.0 = Release|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A}.Release|x86.Build.0 = Release|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Release|x64.Build.0 = Release|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}.Release|x86.Build.0 = Release|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Debug|x64.Build.0 = Debug|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Debug|x86.Build.0 = Debug|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Release|x64.ActiveCfg = Release|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Release|x64.Build.0 = Release|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Release|x86.ActiveCfg = Release|Any CPU
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}.Release|x86.Build.0 = Release|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Debug|x64.Build.0 = Debug|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Debug|x86.Build.0 = Debug|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Release|x64.ActiveCfg = Release|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Release|x64.Build.0 = Release|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Release|x86.ActiveCfg = Release|Any CPU
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE}.Release|x86.Build.0 = Release|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Release|x64.Build.0 = Release|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}.Release|x86.Build.0 = Release|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Debug|x64.Build.0 = Debug|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Debug|x86.Build.0 = Debug|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Release|x64.ActiveCfg = Release|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Release|x64.Build.0 = Release|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Release|x86.ActiveCfg = Release|Any CPU
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415}.Release|x86.Build.0 = Release|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Debug|x64.Build.0 = Debug|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Debug|x86.Build.0 = Debug|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Release|x64.ActiveCfg = Release|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Release|x64.Build.0 = Release|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE}.Release|x86.Build.0 = Release|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Debug|x64.Build.0 = Debug|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Debug|x86.Build.0 = Debug|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Release|x64.ActiveCfg = Release|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Release|x64.Build.0 = Release|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Release|x86.ActiveCfg = Release|Any CPU
+		{565FC442-5E49-42AD-AC33-14AD14E11961}.Release|x86.Build.0 = Release|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Release|x64.Build.0 = Release|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264}.Release|x86.Build.0 = Release|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Debug|x64.Build.0 = Debug|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Debug|x86.Build.0 = Debug|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x64.ActiveCfg = Release|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x64.Build.0 = Release|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x86.ActiveCfg = Release|Any CPU
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -708,5 +1020,27 @@ Global
 		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
 		{A57D4155-3F27-4BDA-900E-1A39B022BE00} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
 		{86E04393-86E7-4BBF-A9EF-9433B91E4988} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{435B3E59-C5B2-412A-86DC-795F1E52C223} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{03FA4F94-962D-4324-B71E-D36E638D13D7} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
+		{197B01F2-1974-46A1-9C40-7303E405BFA7} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{FC2045E2-A48F-4389-9F72-90EDE8918FCC} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{9B3D5A8F-16CD-4644-A239-EC2519195C80} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{BB30719A-3461-493E-972F-F6CEF534163E} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8} = {4CA4C854-E741-1F89-40C8-44936FD249BC}
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE} = {4CA4C854-E741-1F89-40C8-44936FD249BC}
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
+		{565FC442-5E49-42AD-AC33-14AD14E11961} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
 	EndGlobalSection
 EndGlobal
diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 8c296470..8866a874 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -9,7 +9,6 @@
     <File Path="LICENSE.md" />
   </Folder>
   <Folder Name="/src/">
-    <Project Path="src/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
     <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj" />
   </Folder>
   <Folder Name="/src/Samples/" />
diff --git a/src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj b/src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj
new file mode 100644
index 00000000..9fb26b76
--- /dev/null
+++ b/src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Utilities.fs"/>
+    <Compile Include="Selection.fs"/>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities.Core/Program.fs b/src/Samples/Typed/Capabilities.Core/Program.fs
new file mode 100644
index 00000000..1e9cf8e1
--- /dev/null
+++ b/src/Samples/Typed/Capabilities.Core/Program.fs
@@ -0,0 +1,81 @@
+module Elmish.WPF.Samples.Capabilities.Program
+
+open System.Windows
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+open Selection
+
+type Screen = SelectionScreen
+
+type Model =
+    { VisibleScreen: Screen option
+      Selection: Selection }
+
+type Msg =
+    | SetVisibleScreen of Screen option
+    | SelectionMsg of SelectionMsg
+
+module Program =
+    module VisibleScreen =
+        let get m = m.VisibleScreen
+        let set v m = { m with VisibleScreen = v }
+
+    module Selection =
+        open Selection
+        let get m = m.Selection
+        let set v m = { m with Selection = v }
+        let map = map get set
+        let update = update >> map
+
+    let init =
+        { VisibleScreen = None
+          Selection = Selection.init }
+
+    let update =
+        function
+        | SetVisibleScreen s -> s |> VisibleScreen.set
+        | SelectionMsg msg -> msg |> Selection.update
+
+    let boolToVis =
+        function
+        | true -> Visibility.Visible
+        | false -> Visibility.Collapsed
+
+[<AllowNullLiteral>]
+type MainViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    let selectionVm (args: ViewModelArgs<Selection, SelectionMsg>) = SelectionViewModel(args)
+
+    member _.Selection =
+        base.Get
+            ()
+            (Binding.SubModelT.required selectionVm
+             >> Binding.mapModel Program.Selection.get
+             >> Binding.mapMsg SelectionMsg)
+
+    member _.ShowSelection =
+        base.Get () (Binding.CmdT.setAlways (SelectionScreen |> Some |> SetVisibleScreen))
+
+    member _.SelectionVisibility =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.mapModel (Program.VisibleScreen.get >> (=) (Some SelectionScreen) >> Program.boolToVis))
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = MainViewModel(args)
+
+    WpfProgram.mkSimpleT (fun () -> Program.init) Program.update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities.Core/Selection.fs b/src/Samples/Typed/Capabilities.Core/Selection.fs
new file mode 100644
index 00000000..d0cad867
--- /dev/null
+++ b/src/Samples/Typed/Capabilities.Core/Selection.fs
@@ -0,0 +1,103 @@
+module Elmish.WPF.Samples.Capabilities.Selection
+
+open Elmish.WPF
+
+type Tree<'a> = { Data: 'a; Children: Tree<'a> list }
+
+module Tree =
+    let create a ma = { Data = a; Children = ma }
+    let createLeaf a = create a []
+
+    module Data =
+        let get m = m.Data
+
+    module Children =
+        let get m = m.Children
+
+type Selection =
+    { SelectedIndex: int option
+      SelectedIndexData: string list
+      SelectedValue: string option
+      SelectedValueData: Tree<string> list }
+
+type SelectionMsg =
+    | SetSelectedIndex of int option
+    | SetSelectedValue of string option
+
+module Selection =
+    module SelectedIndex =
+        let get m = m.SelectedIndex
+        let set v m = { m with SelectedIndex = v }
+
+    module SelectedIndexData =
+        let get m = m.SelectedIndexData
+
+    module SelectedValue =
+        let get m = m.SelectedValue
+        let set v m = { m with SelectedValue = v }
+
+    module SelectedValueData =
+        let get m = m.SelectedValueData
+
+    let init =
+        { SelectedIndex = None
+          SelectedIndexData = [ "A"; "B" ]
+          SelectedValue = None
+          SelectedValueData =
+            [ Tree.create "A" [ Tree.createLeaf "Aa"; Tree.createLeaf "Ab" ]
+              Tree.create "B" [ Tree.createLeaf "Ba"; Tree.createLeaf "Bb" ] ] }
+
+    let update =
+        function
+        | SetSelectedIndex x -> x |> SelectedIndex.set
+        | SetSelectedValue x -> x |> SelectedValue.set
+
+[<AllowNullLiteral>]
+type TreeViewModel(args) =
+    inherit ViewModelBase<Tree<string>, unit>(args)
+
+    let createTreeVm (args: ViewModelArgs<Tree<string>, unit>) = TreeViewModel(args)
+
+    member _.Data =
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel Tree.Data.get)
+
+    member _.SelectedValueChildren =
+        base.Get
+            ()
+            (Binding.SubModelSeqKeyedT.id createTreeVm (fun t -> t.Data)
+             >> Binding.mapModel (Tree.Children.get))
+
+[<AllowNullLiteral>]
+type SelectionViewModel(args) =
+    inherit ViewModelBase<Selection, SelectionMsg>(args)
+
+    let createTreeVm (args: ViewModelArgs<Tree<string>, unit>) = TreeViewModel(args)
+
+    member _.SelectedIndex =
+        base.Get
+            ()
+            (Binding.SelectedIndexT.id
+             >> Binding.mapModel Selection.SelectedIndex.get
+             >> Binding.mapMsg SetSelectedIndex)
+
+    member _.DeselectIndex =
+        base.Get
+            ()
+            (Binding.CmdT.setIf
+             >> Binding.mapModel (Selection.SelectedIndex.get >> Option.map (fun _ -> SetSelectedIndex None)))
+
+    member _.SelectedIndexData =
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel Selection.SelectedIndexData.get)
+
+    member _.SelectedValue =
+        base.Get
+            ()
+            (Binding.TwoWayOptT.id
+             >> Binding.mapModel Selection.SelectedValue.get
+             >> Binding.mapMsg SetSelectedValue)
+
+    member _.SelectedValueData =
+        base.Get
+            ()
+            (Binding.SubModelSeqKeyedT.id createTreeVm (fun t -> t.Data)
+             >> Binding.mapModel Selection.SelectedValueData.get)
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities.Core/Utilities.fs b/src/Samples/Typed/Capabilities.Core/Utilities.fs
new file mode 100644
index 00000000..97497102
--- /dev/null
+++ b/src/Samples/Typed/Capabilities.Core/Utilities.fs
@@ -0,0 +1,6 @@
+[<AutoOpen>]
+module Utilities
+
+let flip f b a = f a b
+
+let map get set f a = a |> get |> f |> flip set a
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/App.xaml b/src/Samples/Typed/Capabilities/App.xaml
new file mode 100644
index 00000000..3c80dd18
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/App.xaml
@@ -0,0 +1,6 @@
+<Application x:Class="Capabilities.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources />
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/App.xaml.cs b/src/Samples/Typed/Capabilities/App.xaml.cs
new file mode 100644
index 00000000..8e3831b7
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+using Elmish.WPF.Samples.Capabilities;
+
+namespace Capabilities;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object _1, EventArgs _2)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/Capabilities.csproj b/src/Samples/Typed/Capabilities/Capabilities.csproj
new file mode 100644
index 00000000..f6a942c3
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/Capabilities.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Capabilities.Core\Capabilities.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/MainWindow.xaml b/src/Samples/Typed/Capabilities/MainWindow.xaml
new file mode 100644
index 00000000..422c12bf
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/MainWindow.xaml
@@ -0,0 +1,23 @@
+<Window x:Class="Elmish.WPF.Samples.Capabilities.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elmish.WPF.Samples.Capabilities"
+        mc:Ignorable="d"
+        Title="Capabilities" Height="450" Width="800">
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="100" />
+      <ColumnDefinition Width="*" />
+    </Grid.ColumnDefinitions>
+    <StackPanel Grid.Column="0" Orientation="Vertical" Margin="12">
+      <Button Command="{Binding ShowSelection}" Content="Selection" />
+    </StackPanel>
+    <Grid Grid.Column="1" Margin="12">
+      <Grid Visibility="{Binding SelectionVisibility}">
+        <local:SelectionScreen DataContext="{Binding Selection}" />
+      </Grid>
+    </Grid>
+  </Grid>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/MainWindow.xaml.cs b/src/Samples/Typed/Capabilities/MainWindow.xaml.cs
new file mode 100644
index 00000000..3bd5ff98
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Capabilities;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/Selection/BindableSelectedValue.cs b/src/Samples/Typed/Capabilities/Selection/BindableSelectedValue.cs
new file mode 100644
index 00000000..e3db3491
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/Selection/BindableSelectedValue.cs
@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Xaml.Behaviors;
+
+namespace Elmish.WPF.Samples.Capabilities;
+
+internal class BindableSelectedValue : Behavior<TreeView>
+{
+    public static readonly DependencyProperty SelectedValueProperty =
+        DependencyProperty.Register(nameof(SelectedValue), typeof(object), typeof(BindableSelectedValue),
+            new UIPropertyMetadata(null, OnSelectedValueChanged));
+
+    public object SelectedValue
+    {
+        get => GetValue(SelectedValueProperty);
+        set => SetValue(SelectedValueProperty, value);
+    }
+
+    private static void OnSelectedValueChanged(DependencyObject _, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is TreeViewItem item) item.SetValue(TreeViewItem.IsSelectedProperty, true);
+    }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.SelectedItemChanged += OnTreeViewSelectedItemChanged;
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        AssociatedObject.SelectedItemChanged -= OnTreeViewSelectedItemChanged;
+    }
+
+    private void OnTreeViewSelectedItemChanged(object _1, RoutedPropertyChangedEventArgs<object> _2)
+    {
+        SelectedValue = AssociatedObject.SelectedValue;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml b/src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml
new file mode 100644
index 00000000..83275ffa
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml
@@ -0,0 +1,72 @@
+<UserControl x:Class="Elmish.WPF.Samples.Capabilities.SelectionScreen"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:root="clr-namespace:Elmish.WPF.Samples.Capabilities"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+  <StackPanel Orientation="Vertical">
+    <StackPanel Orientation="Horizontal">
+      <StackPanel Orientation="Vertical">
+        <StackPanel Orientation="Horizontal">
+          <TextBlock Text="Selected index: " />
+          <TextBlock Text="{Binding SelectedIndex}" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Margin="6">
+          <Button Command="{Binding DeselectIndex}" Content="Deselect" Height="25" Width="75" Margin="6" />
+          <ListBox ItemsSource="{Binding SelectedIndexData}" SelectedIndex="{Binding SelectedIndex}" Margin="6" />
+        </StackPanel>
+      </StackPanel>
+      <TextBlock>
+        The simplest way to handle selection is via a TwoWay binding on
+        <Hyperlink
+          NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.primitives.selector.selectedindex#System_Windows_Controls_Primitives_Selector_SelectedIndex"
+          RequestNavigate="Hyperlink_RequestNavigate">
+          Selector.SelectedIndex
+        </Hyperlink>
+        . The selection is empty when the value is -1.
+      </TextBlock>
+    </StackPanel>
+    <Separator Margin="12" />
+    <StackPanel Orientation="Horizontal">
+      <StackPanel Orientation="Vertical" Width="130">
+        <StackPanel Orientation="Horizontal">
+          <TextBlock Text="Selected value: " />
+          <TextBlock Text="{Binding SelectedValue}" />
+        </StackPanel>
+        <TreeView ItemsSource="{Binding SelectedValueData}" SelectedValuePath="Data" Height="100" Margin="6">
+          <i:Interaction.Behaviors>
+            <root:BindableSelectedValue SelectedValue="{Binding SelectedValue, Mode=OneWayToSource}" />
+          </i:Interaction.Behaviors>
+          <TreeView.ItemTemplate>
+            <HierarchicalDataTemplate ItemsSource="{Binding SelectedValueChildren}">
+              <TextBlock Text="{Binding Data}" />
+            </HierarchicalDataTemplate>
+          </TreeView.ItemTemplate>
+        </TreeView>
+      </StackPanel>
+      <TextBlock>
+        The
+        <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview"
+                   RequestNavigate="Hyperlink_RequestNavigate">
+          TreeView
+        </Hyperlink>
+        class does not have a SelectedIndex property, but it does have
+        <Hyperlink
+          NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview.selectedvalue#System_Windows_Controls_TreeView_SelectedValue"
+          RequestNavigate="Hyperlink_RequestNavigate">
+          SelectedValue
+        </Hyperlink>
+        and
+        <Hyperlink
+          NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.windows.controls.treeview.selectedvaluepath#System_Windows_Controls_TreeView_SelectedValuePath"
+          RequestNavigate="Hyperlink_RequestNavigate">
+          SelectedValuePath
+        </Hyperlink>
+        properties. They can be used to read (but not write) the current selection.
+      </TextBlock>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml.cs b/src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml.cs
new file mode 100644
index 00000000..6f62d4c5
--- /dev/null
+++ b/src/Samples/Typed/Capabilities/Selection/SelectionScreen.xaml.cs
@@ -0,0 +1,19 @@
+using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+
+namespace Elmish.WPF.Samples.Capabilities;
+
+public partial class SelectionScreen : UserControl
+{
+    public SelectionScreen()
+    {
+        InitializeComponent();
+    }
+
+    private void Hyperlink_RequestNavigate(object _, RequestNavigateEventArgs e)
+    {
+        _ = Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
+        e.Handled = true;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj b/src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs b/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs
new file mode 100644
index 00000000..1fdd7a54
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs
@@ -0,0 +1,92 @@
+module Elmish.WPF.Samples.EventBindingsAndBehaviors.Program
+
+open System.Windows
+open System.Windows.Input
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish.WPF
+
+
+type Position = { X: int; Y: int }
+
+type Model =
+    { Msg1: string
+      Msg2: string
+      ButtonText: string
+      Visibility: Visibility
+      MousePosition: Position }
+
+let visibleButtonText = "Hide text box"
+let hiddenButtonText = "Show text box"
+
+let init () =
+    { Msg1 = ""
+      Msg2 = ""
+      ButtonText = visibleButtonText
+      Visibility = Visibility.Visible
+      MousePosition = { X = 0; Y = 0 } }
+
+type Msg =
+    | GotFocus1
+    | GotFocus2
+    | LostFocus1
+    | LostFocus2
+    | ToggleVisibility
+    | NewMousePosition of Position
+
+let update msg m =
+    match msg with
+    | GotFocus1 -> { m with Msg1 = "Focused" }
+    | GotFocus2 -> { m with Msg2 = "Focused" }
+    | LostFocus1 -> { m with Msg1 = "Not focused" }
+    | LostFocus2 -> { m with Msg2 = "Not focused" }
+    | ToggleVisibility ->
+        if m.Visibility = Visibility.Visible then
+            { m with
+                Visibility = Visibility.Hidden
+                ButtonText = hiddenButtonText }
+        else
+            { m with
+                Visibility = Visibility.Visible
+                ButtonText = visibleButtonText }
+    | NewMousePosition p -> { m with MousePosition = p }
+
+
+let paramToNewMousePositionMsg (p: obj) =
+    let args = p :?> MouseEventArgs
+    let e = args.OriginalSource :?> UIElement
+    let point = args.GetPosition e
+    NewMousePosition { X = int point.X; Y = int point.Y }
+
+type MainViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.Msg1 = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Msg1))
+    member _.Msg2 = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Msg2))
+    member _.GotFocus1 = base.Get() (Binding.CmdT.setAlways GotFocus1)
+    member _.GotFocus2 = base.Get() (Binding.CmdT.setAlways GotFocus2)
+    member _.LostFocus1 = base.Get() (Binding.CmdT.setAlways LostFocus1)
+    member _.LostFocus2 = base.Get() (Binding.CmdT.setAlways LostFocus2)
+    member _.ToggleVisibility = base.Get() (Binding.CmdT.setAlways ToggleVisibility)
+    member _.ButtonText = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.ButtonText))
+    member _.TextBoxVisibility = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Visibility))
+    member _.MouseMoveCommand = 
+        base.Get() (Binding.CmdT.id false (fun p _ -> true) >> Binding.mapMsg paramToNewMousePositionMsg)
+    member _.MousePosition = 
+        base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> sprintf "%dx%d" m.MousePosition.X m.MousePosition.Y))
+
+let designVm = MainViewModel(ViewModelArgs.simple (init ()))
+
+let main window =
+
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkSimpleT init update MainViewModel
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors/App.xaml b/src/Samples/Typed/EventBindingsAndBehaviors/App.xaml
new file mode 100644
index 00000000..0add7189
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.EventBindingsAndBehaviors.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors/App.xaml.cs b/src/Samples/Typed/EventBindingsAndBehaviors/App.xaml.cs
new file mode 100644
index 00000000..7a5e4551
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.EventBindingsAndBehaviors;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj b/src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
new file mode 100644
index 00000000..4bb62004
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EventBindingsAndBehaviors.Core\EventBindingsAndBehaviors.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs b/src/Samples/Typed/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
new file mode 100644
index 00000000..41a5ed59
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors/FocusWhenVisibleBehavior.cs
@@ -0,0 +1,24 @@
+using System.Windows;
+using Microsoft.Xaml.Behaviors;
+
+namespace Elmish.WPF.Samples.EventBindingsAndBehaviors;
+
+public class FocusWhenVisibleBehavior : Behavior<UIElement>
+{
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.IsVisibleChanged += UIElement_IsVisibleChanged;
+    }
+
+    private void UIElement_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (e.NewValue is bool b && b) _ = AssociatedObject.Focus();
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        AssociatedObject.IsVisibleChanged -= UIElement_IsVisibleChanged;
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml b/src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml
new file mode 100644
index 00000000..7d9488dc
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml
@@ -0,0 +1,81 @@
+<Window x:Class="Elmish.WPF.Samples.EventBindingsAndBehaviors.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elmish.WPF.Samples.EventBindingsAndBehaviors"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.EventBindingsAndBehaviors;assembly=EventBindingsAndBehaviors.Core"
+        Title="EventBindings"
+        Height="450"
+        Width="400"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d"
+        d:DataContext="{x:Static vm:Program.designVm}">
+  <Window.InputBindings>
+    <KeyBinding Command="{Binding ToggleVisibility}" Gesture="Ctrl+T" />
+  </Window.InputBindings>
+  <StackPanel Margin="15" HorizontalAlignment="Center">
+    <TextBlock Text="Switch focus between these two inputs." Margin="0,0,0,10" TextAlignment="Center" />
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+      <StackPanel Margin="0,0,25,0">
+        <TextBox Width="100" IsReadOnly="True" IsReadOnlyCaretVisible="True">
+          <i:Interaction.Triggers>
+            <i:EventTrigger EventName="GotFocus">
+              <i:InvokeCommandAction Command="{Binding GotFocus1}" />
+            </i:EventTrigger>
+            <i:EventTrigger EventName="LostFocus">
+              <i:InvokeCommandAction Command="{Binding LostFocus1}" />
+            </i:EventTrigger>
+          </i:Interaction.Triggers>
+        </TextBox>
+        <TextBlock Text="{Binding Msg1}" Margin="0,0,25,0" TextAlignment="Center" />
+      </StackPanel>
+      <StackPanel Margin="0,0,0,0">
+        <TextBox Width="100" IsReadOnly="True" IsReadOnlyCaretVisible="True">
+          <i:Interaction.Triggers>
+            <i:EventTrigger EventName="GotFocus">
+              <i:InvokeCommandAction Command="{Binding GotFocus2}" />
+            </i:EventTrigger>
+            <i:EventTrigger EventName="LostFocus">
+              <i:InvokeCommandAction Command="{Binding LostFocus2}" />
+            </i:EventTrigger>
+          </i:Interaction.Triggers>
+        </TextBox>
+        <TextBlock Text="{Binding Msg2}" Margin="0,0,25,0" TextAlignment="Center" />
+      </StackPanel>
+    </StackPanel>
+    <Button Command="{Binding ToggleVisibility}" Content="{Binding ButtonText}" Width="100" Height="25"
+            Margin="0,20,0,0">
+      <Button.ToolTip>
+        <TextBlock>
+          <Run Text="{Binding ButtonText}" />
+          <Run Text="(Ctrl + T)" />
+        </TextBlock>
+      </Button.ToolTip>
+    </Button>
+    <TextBlock
+      Text="This input will receive focus automatically each time it appears."
+      TextWrapping="Wrap"
+      Margin="0,10,0,10"
+      TextAlignment="Center" />
+    <TextBox Width="100" Margin="0,0,0,0" Visibility="{Binding TextBoxVisibility}" IsReadOnly="True"
+             IsReadOnlyCaretVisible="True">
+      <i:Interaction.Behaviors>
+        <local:FocusWhenVisibleBehavior />
+      </i:Interaction.Behaviors>
+    </TextBox>
+    <Separator Margin="0,16,0,16" />
+    <TextBlock
+      Text="MouseEventArgs given to command as parameter when the MoveMouse event is triggered inside the ellipse."
+      TextWrapping="Wrap" />
+    <TextBlock Text="{Binding MousePosition, StringFormat='Mouse Position is {0}'}" Margin="0,16,0,16" />
+    <Ellipse Fill="LightGray" Stroke="Black" Height="100" Width="300">
+      <i:Interaction.Triggers>
+        <i:EventTrigger EventName="MouseMove">
+          <i:InvokeCommandAction PassEventArgsToCommand="True" Command="{Binding MouseMoveCommand}" />
+        </i:EventTrigger>
+      </i:Interaction.Triggers>
+    </Ellipse>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml.cs b/src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml.cs
new file mode 100644
index 00000000..b5194bca
--- /dev/null
+++ b/src/Samples/Typed/EventBindingsAndBehaviors/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.EventBindingsAndBehaviors;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj b/src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs.Core/Program.fs b/src/Samples/Typed/FileDialogs.Core/Program.fs
new file mode 100644
index 00000000..6590c0e0
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs.Core/Program.fs
@@ -0,0 +1,143 @@
+module Elmish.WPF.Samples.FileDialogs.Program
+
+open System
+open System.IO
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+
+type Model =
+    { CurrentTime: DateTimeOffset
+      Text: string
+      StatusMsg: string }
+
+
+let init () =
+    { CurrentTime = DateTimeOffset.Now
+      Text = ""
+      StatusMsg = "" },
+    []
+
+type Msg =
+    | SetTime of DateTimeOffset
+    | SetText of string
+    | RequestSave
+    | RequestLoad
+    | SaveSuccess
+    | LoadSuccess of string
+    | SaveCanceled
+    | LoadCanceled
+    | SaveFailed of exn
+    | LoadFailed of exn
+
+
+let save text =
+    async {
+        let dlg = Microsoft.Win32.SaveFileDialog()
+        dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+        let result = dlg.ShowDialog()
+
+        if result.HasValue && result.Value then
+            do! File.WriteAllTextAsync(dlg.FileName, text) |> Async.AwaitTask
+            return SaveSuccess
+        else
+            return SaveCanceled
+    }
+
+
+let load () =
+    async {
+        let dlg = Microsoft.Win32.OpenFileDialog()
+        dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+        dlg.DefaultExt <- "txt"
+        let result = dlg.ShowDialog()
+
+        if result.HasValue && result.Value then
+            let! contents = File.ReadAllTextAsync(dlg.FileName) |> Async.AwaitTask
+            return LoadSuccess contents
+        else
+            return LoadCanceled
+    }
+
+
+let update msg m =
+    match msg with
+    | SetTime t -> { m with CurrentTime = t }, Cmd.none
+    | SetText s -> { m with Text = s }, Cmd.none
+    | RequestSave -> m, Cmd.OfAsync.either save m.Text id SaveFailed
+    | RequestLoad -> m, Cmd.OfAsync.either load () id LoadFailed
+    | SaveSuccess ->
+        { m with
+            StatusMsg = sprintf "Successfully saved at %O" DateTimeOffset.Now },
+        Cmd.none
+    | LoadSuccess s ->
+        { m with
+            Text = s
+            StatusMsg = sprintf "Successfully loaded at %O" DateTimeOffset.Now },
+        Cmd.none
+    | SaveCanceled -> { m with StatusMsg = "Saving canceled" }, Cmd.none
+    | LoadCanceled ->
+        { m with
+            StatusMsg = "Loading canceled" },
+        Cmd.none
+    | SaveFailed ex ->
+        { m with
+            StatusMsg = sprintf "Saving failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+        Cmd.none
+    | LoadFailed ex ->
+        { m with
+            StatusMsg = sprintf "Loading failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+        Cmd.none
+
+
+[<AllowNullLiteral>]
+type FileDialogsViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.CurrentTime =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.CurrentTime))
+
+    member _.Text =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.Text)
+             >> Binding.mapMsg SetText)
+
+    member _.StatusMsg =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.StatusMsg))
+
+    member _.Save = base.Get () (Binding.CmdT.setAlways RequestSave)
+    
+    member _.Load = base.Get () (Binding.CmdT.setAlways RequestLoad)
+
+
+let subscriptions (model: Model) : Sub<Msg> =
+    let timerTickSub dispatch =
+        let timer = new Timers.Timer(1000.)
+        let disp = timer.Elapsed.Subscribe(fun _ -> dispatch (SetTime DateTimeOffset.Now))
+        timer.Start()
+        disp
+
+    [ [ nameof timerTickSub ], timerTickSub ]
+
+
+let main window =
+
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = FileDialogsViewModel(args)
+
+    WpfProgram.mkProgramT init update createVm
+    |> WpfProgram.withSubscription subscriptions
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs/App.xaml b/src/Samples/Typed/FileDialogs/App.xaml
new file mode 100644
index 00000000..2646caa7
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.FileDialogs.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs/App.xaml.cs b/src/Samples/Typed/FileDialogs/App.xaml.cs
new file mode 100644
index 00000000..f36fa524
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogs;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs/FileDialogs.csproj b/src/Samples/Typed/FileDialogs/FileDialogs.csproj
new file mode 100644
index 00000000..3fe3ee20
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs/FileDialogs.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FileDialogs.Core\FileDialogs.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs/MainWindow.xaml b/src/Samples/Typed/FileDialogs/MainWindow.xaml
new file mode 100644
index 00000000..5bf7050a
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs/MainWindow.xaml
@@ -0,0 +1,24 @@
+<Window x:Class="Elmish.WPF.Samples.FileDialogs.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="File dialogs (Typed)"
+        Height="400"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
+    <StackPanel>
+      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" Width="200" Height="100" TextWrapping="Wrap"
+               AcceptsReturn="True" Margin="0,5,10,5" />
+      <TextBlock Text="{Binding StatusMsg}" TextWrapping="Wrap" />
+      <TextBlock Text="Clock (to show that dialogs do not block the dispatch loop):" />
+      <TextBlock Text="{Binding CurrentTime}" />
+    </StackPanel>
+    <StackPanel>
+      <Button Command="{Binding Save}" Content="Save" Height="20" Margin="0,5,10,5" Width="50" />
+      <Button Command="{Binding Load}" Content="Load" Height="20" Margin="0,5,10,5" Width="50" />
+    </StackPanel>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogs/MainWindow.xaml.cs b/src/Samples/Typed/FileDialogs/MainWindow.xaml.cs
new file mode 100644
index 00000000..3ec2e61d
--- /dev/null
+++ b/src/Samples/Typed/FileDialogs/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogs;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj b/src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs b/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs
new file mode 100644
index 00000000..70c2ddb7
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs
@@ -0,0 +1,152 @@
+module Elmish.WPF.Samples.FileDialogsCmdMsg.Program
+
+open System
+open System.IO
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+
+type Model =
+    { CurrentTime: DateTimeOffset
+      Text: string
+      StatusMsg: string }
+
+
+type CmdMsg =
+    | Save of string
+    | Load
+
+
+let init () =
+    { CurrentTime = DateTimeOffset.Now
+      Text = ""
+      StatusMsg = "" },
+    []
+
+type Msg =
+    | SetTime of DateTimeOffset
+    | SetText of string
+    | RequestSave
+    | RequestLoad
+    | SaveSuccess
+    | LoadSuccess of string
+    | SaveCanceled
+    | LoadCanceled
+    | SaveFailed of exn
+    | LoadFailed of exn
+
+
+let save text =
+    async {
+        let dlg = Microsoft.Win32.SaveFileDialog()
+        dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+        let result = dlg.ShowDialog()
+
+        if result.HasValue && result.Value then
+            do! File.WriteAllTextAsync(dlg.FileName, text) |> Async.AwaitTask
+            return SaveSuccess
+        else
+            return SaveCanceled
+    }
+
+
+let load () =
+    async {
+        let dlg = Microsoft.Win32.OpenFileDialog()
+        dlg.Filter <- "Text file (*.txt)|*.txt|Markdown file (*.md)|*.md"
+        dlg.DefaultExt <- "txt"
+        let result = dlg.ShowDialog()
+
+        if result.HasValue && result.Value then
+            let! contents = File.ReadAllTextAsync(dlg.FileName) |> Async.AwaitTask
+            return LoadSuccess contents
+        else
+            return LoadCanceled
+    }
+
+
+let toCmd =
+    function
+    | Save text -> Cmd.OfAsync.either save text id SaveFailed
+    | Load -> Cmd.OfAsync.either load () id LoadFailed
+
+
+let update msg m =
+    match msg with
+    | SetTime t -> { m with CurrentTime = t }, []
+    | SetText s -> { m with Text = s }, []
+    | RequestSave -> m, [ Save m.Text ]
+    | RequestLoad -> m, [ Load ]
+    | SaveSuccess ->
+        { m with
+            StatusMsg = sprintf "Successfully saved at %O" DateTimeOffset.Now },
+        []
+    | LoadSuccess s ->
+        { m with
+            Text = s
+            StatusMsg = sprintf "Successfully loaded at %O" DateTimeOffset.Now },
+        []
+    | SaveCanceled -> { m with StatusMsg = "Saving canceled" }, []
+    | LoadCanceled ->
+        { m with
+            StatusMsg = "Loading canceled" },
+        []
+    | SaveFailed ex ->
+        { m with
+            StatusMsg = sprintf "Saving failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+        []
+    | LoadFailed ex ->
+        { m with
+            StatusMsg = sprintf "Loading failed with exception %s: %s" (ex.GetType().Name) ex.Message },
+        []
+
+
+[<AllowNullLiteral>]
+type FileDialogsCmdMsgViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.CurrentTime =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.CurrentTime))
+
+    member _.Text =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.Text)
+             >> Binding.mapMsg SetText)
+
+    member _.StatusMsg =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.StatusMsg))
+
+    member _.Save = base.Get () (Binding.CmdT.setAlways RequestSave)
+    
+    member _.Load = base.Get () (Binding.CmdT.setAlways RequestLoad)
+
+
+let subscriptions (_model: Model) : Sub<Msg> =
+    let timerTickSub (dispatch: Msg -> unit) : IDisposable =
+        let timer = new Timers.Timer(1000.)
+        let disp = timer.Elapsed.Subscribe(fun _ -> dispatch (SetTime DateTimeOffset.Now))
+        timer.Start()
+        disp
+
+    [ [ nameof timerTickSub ], timerTickSub ]
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = FileDialogsCmdMsgViewModel(args)
+
+    WpfProgram.mkProgramWithCmdMsgT init update createVm toCmd
+    |> WpfProgram.withSubscription subscriptions
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg/App.xaml b/src/Samples/Typed/FileDialogsCmdMsg/App.xaml
new file mode 100644
index 00000000..f07889aa
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.FileDialogsCmdMsg.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg/App.xaml.cs b/src/Samples/Typed/FileDialogsCmdMsg/App.xaml.cs
new file mode 100644
index 00000000..c0154cda
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogsCmdMsg;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj b/src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
new file mode 100644
index 00000000..c262f8b4
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FileDialogsCmdMsg.Core\FileDialogsCmdMsg.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml b/src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml
new file mode 100644
index 00000000..dfe21cd9
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml
@@ -0,0 +1,26 @@
+<Window x:Class="Elmish.WPF.Samples.FileDialogsCmdMsg.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.FileDialogsCmdMsg;assembly=FileDialogsCmdMsg.Core"
+        Title="File dialogs"
+        Height="400"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d"
+        d:DataContext="{d:DesignInstance Type=vm:FileDialogsCmdMsgViewModel, IsDesignTimeCreatable=False}">
+  <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
+    <StackPanel>
+      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}" Width="200" Height="100" TextWrapping="Wrap"
+               AcceptsReturn="True" Margin="0,5,10,5" />
+      <TextBlock Text="{Binding StatusMsg}" TextWrapping="Wrap" />
+      <TextBlock Text="Clock (to show that dialogs do not block the dispatch loop):" />
+      <TextBlock Text="{Binding CurrentTime}" />
+    </StackPanel>
+    <StackPanel>
+      <Button Command="{Binding Save}" Content="Save" Height="20" Margin="0,5,10,5" Width="50" />
+      <Button Command="{Binding Load}" Content="Load" Height="20" Margin="0,5,10,5" Width="50" />
+    </StackPanel>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml.cs b/src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml.cs
new file mode 100644
index 00000000..a7a37bd7
--- /dev/null
+++ b/src/Samples/Typed/FileDialogsCmdMsg/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.FileDialogsCmdMsg;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj b/src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect.Core/Program.fs b/src/Samples/Typed/Multiselect.Core/Program.fs
new file mode 100644
index 00000000..91456dd9
--- /dev/null
+++ b/src/Samples/Typed/Multiselect.Core/Program.fs
@@ -0,0 +1,102 @@
+module Elmish.WPF.Samples.Multiselect.Program
+
+open System
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+type Entity =
+    { Id: int
+      Name: string
+      IsSelected: bool }
+
+type Model = { Entities: Entity list }
+
+let init () =
+    { Entities =
+        [ 0..10 ]
+        |> List.map (fun i ->
+            { Id = i
+              Name = sprintf "Entity %i" i
+              IsSelected = i < 5 }) }
+
+type Msg =
+    | SetIsSelected of int * bool
+    | SelectRandom
+    | DeselectAll
+
+let rec update msg m =
+    match msg with
+    | SetIsSelected(entityId, isSelected) ->
+        { m with
+            Entities =
+                m.Entities
+                |> List.map (fun e ->
+                    if e.Id = entityId then
+                        { e with IsSelected = isSelected }
+                    else
+                        e) }
+    | SelectRandom ->
+        if m.Entities.Length > 0 then
+            let id = m.Entities.Item(Random().Next(m.Entities.Length)).Id
+            update (SetIsSelected(id, true)) m
+        else
+            m
+    | DeselectAll ->
+        { m with
+            Entities = m.Entities |> List.map (fun e -> { e with IsSelected = false }) }
+
+[<AllowNullLiteral>]
+type EntityViewModel(args) =
+    inherit ViewModelBase<Entity, int * bool>(args)
+
+    member _.Name =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun e -> e.Name))
+
+    member _.IsSelected =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun e -> e.IsSelected)
+             >> Binding.mapMsgWithModel (fun isSelected e -> (e.Id, isSelected)))
+
+    member _.SelectedLabel =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun e -> if e.IsSelected then " - SELECTED" else ""))
+
+[<AllowNullLiteral>]
+type MainViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    let createEntityVm (args: ViewModelArgs<Entity, int * bool>) = EntityViewModel(args)
+
+    member _.SelectRandom = base.Get () (Binding.CmdT.setAlways SelectRandom)
+
+    member _.Deselect = base.Get () (Binding.CmdT.setAlways DeselectAll)
+
+    member _.Entities =
+        base.Get
+            ()
+            (Binding.SubModelSeqKeyedT.id createEntityVm (fun e -> e.Id)
+             >> Binding.mapModel (fun m -> m.Entities)
+             >> Binding.mapMsg (fun (_, (entityId, isSelected)) -> SetIsSelected(entityId, isSelected)))
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = MainViewModel(args)
+
+    WpfProgram.mkSimpleT init update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect/App.xaml b/src/Samples/Typed/Multiselect/App.xaml
new file mode 100644
index 00000000..33abaf63
--- /dev/null
+++ b/src/Samples/Typed/Multiselect/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.Multiselect.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect/App.xaml.cs b/src/Samples/Typed/Multiselect/App.xaml.cs
new file mode 100644
index 00000000..f91be0d6
--- /dev/null
+++ b/src/Samples/Typed/Multiselect/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Multiselect;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect/MainWindow.xaml b/src/Samples/Typed/Multiselect/MainWindow.xaml
new file mode 100644
index 00000000..8f6571ae
--- /dev/null
+++ b/src/Samples/Typed/Multiselect/MainWindow.xaml
@@ -0,0 +1,44 @@
+<Window x:Class="Elmish.WPF.Samples.Multiselect.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
+        WindowStartupLocation="CenterScreen"
+        Title="SubModelSelectedItem"
+        Height="350"
+        Width="500"
+        mc:Ignorable="d">
+  <Window.Resources>
+    <ObjectDataProvider x:Key="dataFromEnum" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="SelectionMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </Window.Resources>
+  <StackPanel Margin="0,15,0,0">
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Command="{Binding SelectRandom}" Content="Select random" Margin="5 5" Width="100" />
+      <Button Command="{Binding Deselect}" Content="Deselect" Margin="5 5" Width="100" />
+      <ComboBox x:Name="SelectionModeComboBox" ItemsSource="{Binding Source={StaticResource dataFromEnum}}"
+                SelectedIndex="2" />
+    </StackPanel>
+    <ListBox ItemsSource="{Binding Entities}"
+             SelectionMode="{Binding ElementName=SelectionModeComboBox, Path=SelectedItem}"
+             HorizontalContentAlignment="Center">
+      <ListBox.Resources>
+        <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+          <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+        </Style>
+      </ListBox.Resources>
+      <ListBox.ItemTemplate>
+        <DataTemplate>
+          <StackPanel Orientation="Horizontal">
+            <TextBlock Text="{Binding Name}" />
+            <TextBlock Text="{Binding SelectedLabel}" />
+          </StackPanel>
+        </DataTemplate>
+      </ListBox.ItemTemplate>
+    </ListBox>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect/MainWindow.xaml.cs b/src/Samples/Typed/Multiselect/MainWindow.xaml.cs
new file mode 100644
index 00000000..d67a7082
--- /dev/null
+++ b/src/Samples/Typed/Multiselect/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Multiselect;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Multiselect/Multiselect.csproj b/src/Samples/Typed/Multiselect/Multiselect.csproj
new file mode 100644
index 00000000..2c335d3a
--- /dev/null
+++ b/src/Samples/Typed/Multiselect/Multiselect.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Multiselect.Core\Multiselect.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/App.fs b/src/Samples/Typed/NewWindow.Core/App.fs
new file mode 100644
index 00000000..0075f343
--- /dev/null
+++ b/src/Samples/Typed/NewWindow.Core/App.fs
@@ -0,0 +1,77 @@
+module Elmish.WPF.Samples.NewWindow.AppModule
+
+open System.Windows
+open Elmish.WPF
+
+open Window1Module
+open Window2Module
+
+type App =
+    { Window1: WindowState<string>
+      Window2: Window2 option }
+
+type AppMsg =
+    | Window1Show
+    | Window1Hide
+    | Window1Close
+    | Window1SetInput of string
+    | Window2Show
+    | Window2Close
+    | Window2Msg of Window2Msg
+
+module App =
+    module Window1 =
+        let get m = m.Window1
+        let set v m = { m with Window1 = v }
+        let map = map get set
+
+    module Window2 =
+        let get m = m.Window2
+        let set v m = { m with Window2 = v }
+        let map = map get set
+
+        let mapOutMsg =
+            function
+            | Window2OutMsg.Close -> Window2Close
+
+        let mapInOutMsg = InOut.cata Window2Msg mapOutMsg
+
+    let init =
+        { Window1 = WindowState.Closed
+          Window2 = None }
+
+    let update =
+        function
+        | Window1Show -> "" |> WindowState.toVisible |> Window1.map
+        | Window1Hide -> "" |> WindowState.toHidden |> Window1.map
+        | Window1Close -> WindowState.Closed |> Window1.set
+        | Window1SetInput s -> s |> WindowState.set |> Window1.map
+        | Window2Show -> Window2.init |> Some |> Window2.set
+        | Window2Close -> None |> Window2.set
+        | Window2Msg msg -> msg |> Window2.update |> Option.map |> Window2.map
+
+[<AllowNullLiteral>]
+type AppViewModel(args) =
+    inherit ViewModelBase<App, AppMsg>(args)
+
+    let window1Vm (args: ViewModelArgs<string, string>) = Window1ViewModel(args)
+    let window2Vm (args: ViewModelArgs<Window2, InOut<Window2Msg, Window2OutMsg>>) = Window2ViewModel(args)
+
+    member _.Window1Show = base.Get () (Binding.CmdT.setAlways Window1Show)
+    member _.Window1Hide = base.Get () (Binding.CmdT.setAlways Window1Hide)
+    member _.Window1Close = base.Get () (Binding.CmdT.setAlways Window1Close)
+    member _.Window2Show = base.Get () (Binding.CmdT.setAlways Window2Show)
+
+    member _.Window1 =
+        base.Get
+            ()
+            (Binding.SubModelWinT.id window1Vm
+             >> Binding.mapModel (fun m -> m.Window1)
+             >> Binding.mapMsg (fun s -> Window1SetInput s))
+
+    member _.Window2 =
+        base.Get
+            ()
+            (Binding.SubModelWinT.id window2Vm
+             >> Binding.mapModel (fun m -> App.Window2.get m |> WindowState.ofOption)
+             >> Binding.mapMsg App.Window2.mapInOutMsg)
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/AutoOpen.fs b/src/Samples/Typed/NewWindow.Core/AutoOpen.fs
new file mode 100644
index 00000000..d3ce565d
--- /dev/null
+++ b/src/Samples/Typed/NewWindow.Core/AutoOpen.fs
@@ -0,0 +1,31 @@
+[<AutoOpen>]
+module AutoOpen
+
+let flip f b a = f a b
+
+let map get set f a = a |> get |> f |> flip set a
+
+[<RequireQualifiedAccess>]
+module Bool =
+    open System.Windows
+
+    let toVisibilityCollapsed =
+        function
+        | true -> Visibility.Visible
+        | false -> Visibility.Collapsed
+
+[<AutoOpen>]
+module InOutModule =
+
+    [<RequireQualifiedAccess>]
+    type InOut<'a, 'b> =
+        | In of 'a
+        | Out of 'b
+
+    [<RequireQualifiedAccess>]
+    module InOut =
+
+        let cata f g =
+            function
+            | InOut.In msg -> msg |> f
+            | InOut.Out msg -> msg |> g
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj b/src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj
new file mode 100644
index 00000000..d9a8ddbb
--- /dev/null
+++ b/src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="AutoOpen.fs"/>
+    <Compile Include="Window1.fs"/>
+    <Compile Include="Window2.fs"/>
+    <Compile Include="App.fs"/>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/Program.fs b/src/Samples/Typed/NewWindow.Core/Program.fs
new file mode 100644
index 00000000..5e026fa0
--- /dev/null
+++ b/src/Samples/Typed/NewWindow.Core/Program.fs
@@ -0,0 +1,33 @@
+module Elmish.WPF.Samples.NewWindow.Program
+
+open System
+open System.Windows
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+open AppModule
+
+let main mainWindow (createWindow1: Func<#Window>) (createWindow2: Func<#Window>) =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createWindow1 () = createWindow1.Invoke()
+
+    let createWindow2 () =
+        let window = createWindow2.Invoke()
+        window.Owner <- mainWindow
+        window
+
+    let init () = App.init
+    
+    let createVm args = AppViewModel(args)
+
+    WpfProgram.mkSimpleT init App.update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop mainWindow
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/Window1.fs b/src/Samples/Typed/NewWindow.Core/Window1.fs
new file mode 100644
index 00000000..a118a525
--- /dev/null
+++ b/src/Samples/Typed/NewWindow.Core/Window1.fs
@@ -0,0 +1,13 @@
+module Elmish.WPF.Samples.NewWindow.Window1Module
+
+open Elmish.WPF
+
+module Window1 =
+    let init = ""
+
+[<AllowNullLiteral>]
+type Window1ViewModel(args) =
+    inherit ViewModelBase<string, string>(args)
+
+    member _.Input =
+        base.Get () (Binding.TwoWayT.id >> Binding.mapModel id >> Binding.mapMsg id)
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/Window2.fs b/src/Samples/Typed/NewWindow.Core/Window2.fs
new file mode 100644
index 00000000..e54d8712
--- /dev/null
+++ b/src/Samples/Typed/NewWindow.Core/Window2.fs
@@ -0,0 +1,106 @@
+module Elmish.WPF.Samples.NewWindow.Window2Module
+
+open Elmish.WPF
+
+[<RequireQualifiedAccess>]
+type ConfirmState =
+    | Submit
+    | Cancel
+    | Close
+
+type Window2 =
+    { Input: string
+      IsChecked: bool
+      ConfirmState: ConfirmState option }
+
+type Window2Msg =
+    | SetInput of string
+    | SetChecked of bool
+    | Submit
+    | Cancel
+    | Close
+
+[<RequireQualifiedAccess>]
+type Window2OutMsg = | Close
+
+module Window2 =
+    module Input =
+        let get m = m.Input
+        let set v m = { m with Input = v }
+
+    module IsChecked =
+        let get m = m.IsChecked
+        let set v m = { m with IsChecked = v }
+
+    module ConfirmState =
+        let set v m = { m with ConfirmState = v }
+
+    let init =
+        { Input = ""
+          IsChecked = false
+          ConfirmState = None }
+
+    let update =
+        function
+        | SetInput s -> s |> Input.set
+        | SetChecked b -> b |> IsChecked.set
+        | Submit -> ConfirmState.Submit |> Some |> ConfirmState.set
+        | Cancel -> ConfirmState.Cancel |> Some |> ConfirmState.set
+        | Close -> ConfirmState.Close |> Some |> ConfirmState.set
+
+    let private confirmStateToMsg confirmState msg m =
+        if m.ConfirmState = Some confirmState then
+            InOut.Out Window2OutMsg.Close
+        else
+            InOut.In msg
+
+[<AllowNullLiteral>]
+type Window2ViewModel(args) =
+    inherit ViewModelBase<Window2, InOut<Window2Msg, Window2OutMsg>>(args)
+
+    member _.Input =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.mapModel Window2.Input.get
+             >> Binding.mapMsg (SetInput >> InOut.In))
+
+    member _.IsChecked =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.mapModel Window2.IsChecked.get
+             >> Binding.mapMsg (SetChecked >> InOut.In))
+
+    member _.SubmitMsgVisibility =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.mapModel (fun m -> m.ConfirmState = Some ConfirmState.Submit |> Bool.toVisibilityCollapsed))
+
+    member _.CancelMsgVisibility =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.mapModel (fun m -> m.ConfirmState = Some ConfirmState.Cancel |> Bool.toVisibilityCollapsed))
+
+    member _.CloseMsgVisibility =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.mapModel (fun m -> m.ConfirmState = Some ConfirmState.Close |> Bool.toVisibilityCollapsed))
+
+    member _.Submit =
+        base.Get
+            ()
+            (Binding.CmdT.set (fun _ -> true) (Window2.confirmStateToMsg ConfirmState.Submit Submit))
+
+    member _.Cancel =
+        base.Get
+            ()
+            (Binding.CmdT.set (fun _ -> true) (Window2.confirmStateToMsg ConfirmState.Cancel Cancel))
+
+    member _.Close =
+        base.Get
+            ()
+            (Binding.CmdT.set (fun _ -> true) (Window2.confirmStateToMsg ConfirmState.Close Close))
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/App.xaml b/src/Samples/Typed/NewWindow/App.xaml
new file mode 100644
index 00000000..1982a823
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Elmish.WPF.Samples.NewWindow.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml"
+             ShutdownMode="OnMainWindowClose">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/App.xaml.cs b/src/Samples/Typed/NewWindow/App.xaml.cs
new file mode 100644
index 00000000..a6171b85
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow, () => new Window1(), () => new Window2());
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/MainWindow.xaml b/src/Samples/Typed/NewWindow/MainWindow.xaml
new file mode 100644
index 00000000..77fb0fd7
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/MainWindow.xaml
@@ -0,0 +1,30 @@
+<Window x:Class="Elmish.WPF.Samples.NewWindow.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.NewWindow;assembly=NewWindow.Core"
+        Title="Multiple windows"
+        Height="250"
+        Width="300"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d"
+        d:DataContext="{x:Static vm:AppModule.designVm}">
+  <Window.Resources>
+    <ResourceDictionary>
+    </ResourceDictionary>
+  </Window.Resources>
+  <StackPanel VerticalAlignment="Center">
+    <TextBlock HorizontalAlignment="Center" FontWeight="Bold">Window 1</TextBlock>
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Command="{Binding Window1Show}" Content="Show" Width="70" Margin="5" />
+      <Button Command="{Binding Window1Hide}" Content="Hide" Width="70" Margin="5" />
+      <Button Command="{Binding Window1Close}" Content="Close" Width="70" Margin="5" />
+    </StackPanel>
+    <TextBlock HorizontalAlignment="Center" FontWeight="Bold" Margin="0 10 0 0">Window 2</TextBlock>
+    <Button Command="{Binding Window2Show}" Content="Show" Width="70" Margin="0,5,0,5" />
+    <TextBlock Text="{Binding Window1.Input, StringFormat='Window 1 input: {0}'}" />
+    <TextBlock Text="{Binding Window2.Input, StringFormat='Window 2 input: {0}'}" />
+    <TextBlock Text="{Binding Window2.IsChecked, StringFormat='Window 2 checkbox: {0}'}" />
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/MainWindow.xaml.cs b/src/Samples/Typed/NewWindow/MainWindow.xaml.cs
new file mode 100644
index 00000000..5635359e
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/MainWindow.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void CounterWithClock_Loaded(object sender, RoutedEventArgs e)
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/NewWindow.csproj b/src/Samples/Typed/NewWindow/NewWindow.csproj
new file mode 100644
index 00000000..06e7105b
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/NewWindow.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NewWindow.Core\NewWindow.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/Window1.xaml b/src/Samples/Typed/NewWindow/Window1.xaml
new file mode 100644
index 00000000..299183ec
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/Window1.xaml
@@ -0,0 +1,31 @@
+<Window x:Class="Elmish.WPF.Samples.NewWindow.Window1"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.NewWindow;assembly=NewWindow.Core"
+        Width="400"
+        Height="400"
+        Title="Window 1"
+        mc:Ignorable="d"
+        d:DataContext="{x:Static vm:Window1Module.designVm}">
+  <StackPanel VerticalAlignment="Center" Width="300">
+    <TextBlock TextWrapping="Wrap">
+      This window deliberately does not react to external close requests, so
+      Alt+F4, System Menu -> Close, or the Close (X) button does nothing. It can
+      only be opened/closed using the buttons in the main window.
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
+      Note the interplay between the hidden/visible state of this window and the
+      main window's binding to the text entered below. The state is always kept
+      in the model, even after close, but when the window is closed (not just
+      hidden), the submodel binding returns null.
+    </TextBlock>
+    <TextBlock Text="Enter text:" Margin="0 10 0 0" />
+    <TextBox Text="{Binding Input, UpdateSourceTrigger=PropertyChanged}"
+             TextWrapping="Wrap"
+             AcceptsReturn="True"
+             Height="80"
+             Margin="0,5,0,5" />
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/Window1.xaml.cs b/src/Samples/Typed/NewWindow/Window1.xaml.cs
new file mode 100644
index 00000000..fa874aaa
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/Window1.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class Window1 : Window
+{
+    public Window1()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/Window2.xaml b/src/Samples/Typed/NewWindow/Window2.xaml
new file mode 100644
index 00000000..6317824c
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/Window2.xaml
@@ -0,0 +1,64 @@
+<Window x:Class="Elmish.WPF.Samples.NewWindow.Window2"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.NewWindow;assembly=NewWindow.Core"
+        Width="500"
+        Height="500"
+        Title="Window 2"
+        mc:Ignorable="d"
+        d:DataContext="{x:Static vm:Window2Module.designVm}">
+  <i:Interaction.Triggers>
+    <i:EventTrigger EventName="Closing">
+      <i:InvokeCommandAction Command="{Binding Close}" />
+    </i:EventTrigger>
+  </i:Interaction.Triggers>
+  <StackPanel VerticalAlignment="Center" Width="400">
+    <TextBlock TextWrapping="Wrap">
+      This window is shown modally and blocks the main window until it's closed.
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
+      Furthermore, it shows how submit/cancel/close just uses normal messages
+      and how user code can fully control the closing behaviour, for example to
+      show a message to the user (you could, for example, display form
+      validation errors when submit is clicked.)
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
+      The window can be closed in three ways:
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="15 0 0 0">
+      – Clicking Submit (or Enter, since the button has IsDefault=true)
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="15 0 0 0">
+      – Clicking Cancel (or Esc, since the button has IsCancel=true)
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="15 0 0 0">
+      – Externally: Close (X) button, Alt+F4, or System Menu -> Close
+    </TextBlock>
+    <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
+      Note the interplay between the visible/closed state of this window and the
+      main window's binding to the state controlled by the inputs below. The
+      input state in the model is None when the window is closed, so it's reset
+      each time the window is shown.
+    </TextBlock>
+    <TextBlock Text="Input" Margin="0 10 0 0" />
+    <TextBox Text="{Binding Input, UpdateSourceTrigger=PropertyChanged}" Margin="0,5,0,5" />
+    <TextBlock Text="Checkbox:" />
+    <CheckBox IsChecked="{Binding IsChecked}" />
+    <TextBlock Visibility="{Binding SubmitMsgVisibility}" Foreground="Red">
+      Submit clicked, repeat to submit
+    </TextBlock>
+    <TextBlock Visibility="{Binding CancelMsgVisibility}" Foreground="Red">
+      Cancel clicked, repeat to cancel
+    </TextBlock>
+    <TextBlock Visibility="{Binding CloseMsgVisibility}" Foreground="Red">
+      External close requested, repeat to close
+    </TextBlock>
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 10 0 0">
+      <Button Command="{Binding Cancel}" IsCancel="true" Width="60" Margin="0 0 10 0">Cancel</Button>
+      <Button Command="{Binding Submit}" IsDefault="true" Width="60">Submit</Button>
+    </StackPanel>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/Window2.xaml.cs b/src/Samples/Typed/NewWindow/Window2.xaml.cs
new file mode 100644
index 00000000..f718404e
--- /dev/null
+++ b/src/Samples/Typed/NewWindow/Window2.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.NewWindow;
+
+public partial class Window2 : Window
+{
+    public Window2()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj b/src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq.Core/Program.fs b/src/Samples/Typed/OneWaySeq.Core/Program.fs
new file mode 100644
index 00000000..c9b02ee1
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq.Core/Program.fs
@@ -0,0 +1,62 @@
+module Elmish.WPF.Samples.OneWaySeq.Program
+
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+type Model =
+    { OneWaySeqNumbers: int list
+      OneWayNumbers: int list }
+
+let init () =
+    { OneWaySeqNumbers = [ 1000..-1..1 ]
+      OneWayNumbers = [ 1000..-1..1 ] }
+
+type Msg =
+    | AddOneWaySeqNumber
+    | AddOneWayNumber
+
+let update msg m =
+    match msg with
+    | AddOneWaySeqNumber ->
+        { m with
+            OneWaySeqNumbers = m.OneWaySeqNumbers.Head + 1 :: m.OneWaySeqNumbers }
+    | AddOneWayNumber ->
+        { m with
+            OneWayNumbers = m.OneWayNumbers.Head + 1 :: m.OneWayNumbers }
+
+[<AllowNullLiteral>]
+type OneWaySeqViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.OneWaySeqNumbers =
+        base.Get
+            ()
+            (Binding.OneWaySeqT.id (=) id
+             >> Binding.mapModel (fun m -> m.OneWaySeqNumbers))
+
+    member _.OneWayNumbers =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.OneWayNumbers))
+
+    member _.AddOneWaySeqNumber = base.Get () (Binding.CmdT.setAlways AddOneWaySeqNumber)
+    member _.AddOneWayNumber = base.Get () (Binding.CmdT.setAlways AddOneWayNumber)
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = OneWaySeqViewModel(args)
+
+    WpfProgram.mkSimpleT init update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/App.xaml b/src/Samples/Typed/OneWaySeq/App.xaml
new file mode 100644
index 00000000..7170ae13
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.OneWaySeq.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/App.xaml.cs b/src/Samples/Typed/OneWaySeq/App.xaml.cs
new file mode 100644
index 00000000..974ac717
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.OneWaySeq
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/MainWindow.xaml b/src/Samples/Typed/OneWaySeq/MainWindow.xaml
new file mode 100644
index 00000000..255a828e
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq/MainWindow.xaml
@@ -0,0 +1,30 @@
+<Window x:Class="Elmish.WPF.Samples.OneWaySeq.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="OneWaySeq (Typed)"
+        Height="400"
+        Width="400"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <StackPanel>
+    <TextBlock
+      Text="This sample shows the difference between Binding.oneWay and Binding.oneWaySeq. For oneWay, the whole ListView is re-rendered for every change. For oneWaySeq, only the new item is added."
+      Margin="10,20,10,10"
+      TextWrapping="Wrap" />
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+      <StackPanel Margin="0,0,50,0">
+        <TextBlock Text="Binding.oneWay" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,0,0,10" />
+        <Button Command="{Binding AddOneWayNumber}" Content="Add number" Width="150" Margin="0,0,0,20" />
+        <ListView ItemsSource="{Binding OneWayNumbers}" />
+      </StackPanel>
+      <StackPanel>
+        <TextBlock Text="Binding.oneWaySeq" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center"
+                   Margin="0,0,0,10" />
+        <Button Command="{Binding AddOneWaySeqNumber}" Content="Add number" Width="150" Margin="0,0,0,20" />
+        <ListView ItemsSource="{Binding OneWaySeqNumbers}" />
+      </StackPanel>
+    </StackPanel>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs b/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs
new file mode 100644
index 00000000..bc1748a8
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.OneWaySeq
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/OneWaySeq.csproj b/src/Samples/Typed/OneWaySeq/OneWaySeq.csproj
new file mode 100644
index 00000000..58f925c3
--- /dev/null
+++ b/src/Samples/Typed/OneWaySeq/OneWaySeq.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OneWaySeq.Core\OneWaySeq.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky.Core/Program.fs b/src/Samples/Typed/Sticky.Core/Program.fs
new file mode 100644
index 00000000..652a4b97
--- /dev/null
+++ b/src/Samples/Typed/Sticky.Core/Program.fs
@@ -0,0 +1,65 @@
+module Elmish.WPF.Samples.Sticky.Program
+
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+type Model = { Count: int; StepSize: int }
+
+type Msg =
+    | Increment
+    | Decrement
+    | SetStepSize of int
+    | Reset
+
+let init () = { Count = 0; StepSize = 1 }
+
+let canReset m = m <> init ()
+
+let update msg m =
+    match msg with
+    | Increment -> { m with Count = m.Count + m.StepSize }
+    | Decrement -> { m with Count = m.Count - m.StepSize }
+    | SetStepSize x -> { m with StepSize = x }
+    | Reset -> init ()
+
+[<AllowNullLiteral>]
+type StickyViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.CounterValue =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addSticky (fun v -> v % 2 = 0)
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.Count))
+
+    member _.Increment = base.Get () (Binding.CmdT.setAlways Increment)
+    member _.Decrement = base.Get () (Binding.CmdT.setAlways Decrement)
+
+    member _.StepSize =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m: Model) -> float m.StepSize)
+             >> Binding.mapMsg (int >> SetStepSize))
+
+    member _.Reset = base.Get () (Binding.CmdT.set canReset Reset)
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = StickyViewModel(args)
+
+    WpfProgram.mkSimpleT init update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj b/src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/App.xaml b/src/Samples/Typed/Sticky/App.xaml
new file mode 100644
index 00000000..43dbe792
--- /dev/null
+++ b/src/Samples/Typed/Sticky/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.Sticky.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/App.xaml.cs b/src/Samples/Typed/Sticky/App.xaml.cs
new file mode 100644
index 00000000..d7069cb5
--- /dev/null
+++ b/src/Samples/Typed/Sticky/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Sticky
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/MainWindow.xaml b/src/Samples/Typed/Sticky/MainWindow.xaml
new file mode 100644
index 00000000..497f4da0
--- /dev/null
+++ b/src/Samples/Typed/Sticky/MainWindow.xaml
@@ -0,0 +1,23 @@
+<Window x:Class="Elmish.WPF.Samples.Sticky.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="Sticky (Typed)"
+        Height="120"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
+  <StackPanel Orientation="Vertical">
+    <TextBlock Text="The counter value binding is sticky to even numbers" />
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
+      <TextBlock Text="{Binding CounterValue, StringFormat='Counter value: {0}'}" Width="110" Margin="0,5,10,5" />
+      <Button Command="{Binding Decrement}" Content="-" Margin="0,5,10,5" Width="30" />
+      <Button Command="{Binding Increment}" Content="+" Margin="0,5,10,5" Width="30" />
+      <TextBlock Text="{Binding StepSize, StringFormat='Step size: {0}'}" Width="70" Margin="0,5,10,5" />
+      <Slider Value="{Binding StepSize}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True"
+              Width="100" Margin="0,5,10,5" />
+      <Button Command="{Binding Reset}" Content="Reset" Margin="0,5,10,5" Width="50" />
+    </StackPanel>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/MainWindow.xaml.cs b/src/Samples/Typed/Sticky/MainWindow.xaml.cs
new file mode 100644
index 00000000..5a763b9b
--- /dev/null
+++ b/src/Samples/Typed/Sticky/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Sticky
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/Sticky.csproj b/src/Samples/Typed/Sticky/Sticky.csproj
new file mode 100644
index 00000000..821df6af
--- /dev/null
+++ b/src/Samples/Typed/Sticky/Sticky.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Sticky.Core\Sticky.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs b/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
new file mode 100644
index 00000000..5b6d55b5
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
@@ -0,0 +1,82 @@
+module Elmish.WPF.Samples.SubModelSelectedItem.Program
+
+open System
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish
+open Elmish.WPF
+
+type Entity = { Id: int; Name: string }
+
+type Model =
+    { Entities: Entity list
+      Selected: int option }
+
+let init () =
+    { Entities = [ 0..10 ] |> List.map (fun i -> { Id = i; Name = sprintf "Entity %i" i })
+      Selected = Some 4 }
+
+type Msg = Select of int option
+
+let update msg m =
+    match msg with
+    | Select entityId -> { m with Selected = entityId }
+
+[<AllowNullLiteral>]
+type EntityViewModel(args) =
+    inherit ViewModelBase<Model * Entity, unit>(args)
+
+    member _.Name =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun (_, e) -> e.Name))
+
+    member _.SelectedLabel =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (m, e) -> if m.Selected = Some e.Id then " - SELECTED" else ""))
+
+[<AllowNullLiteral>]
+type MainViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    let createEntityVm (args: ViewModelArgs<Model * Entity, unit>) = EntityViewModel(args)
+
+    member _.SelectRandom =
+        base.Get
+            ()
+            (Binding.CmdT.set (fun m -> m.Entities.Length > 0)
+                (fun m ->
+                    m.Entities.Item(Random().Next(m.Entities.Length)).Id
+                    |> Some
+                    |> Select))
+
+    member _.Deselect = base.Get () (Binding.CmdT.setAlways (Select None))
+
+    member _.Entities =
+        base.Get
+            ()
+            (Binding.SubModelSeqKeyedT.id createEntityVm (fun (_, e) -> e.Id)
+             >> Binding.mapModel (fun m -> m.Entities |> List.map (fun e -> (m, e))))
+
+    member _.SelectedEntity =
+        base.Get
+            ()
+            (Binding.SubModelSelectedItem.opt "Entities"
+             >> Binding.mapModel (fun m -> m.Selected)
+             >> Binding.mapMsg Select)
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = MainViewModel(args)
+
+    WpfProgram.mkSimpleT init update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj b/src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem/App.xaml b/src/Samples/Typed/SubModelSelectedItem/App.xaml
new file mode 100644
index 00000000..7aa226ac
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.SubModelSelectedItem.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem/App.xaml.cs b/src/Samples/Typed/SubModelSelectedItem/App.xaml.cs
new file mode 100644
index 00000000..2339da83
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSelectedItem;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml b/src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml
new file mode 100644
index 00000000..73f29955
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml
@@ -0,0 +1,30 @@
+<Window x:Class="Elmish.WPF.Samples.SubModelSelectedItem.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.SubModelSelectedItem;assembly=SubModelSelectedItem.Core"
+        WindowStartupLocation="CenterScreen"
+        Title="SubModelSelectedItem"
+        Height="350"
+        Width="500"
+        mc:Ignorable="d"
+        d:DataContext="{x:Static vm:Program.designVm}">
+  <StackPanel Margin="0,15,0,0">
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Command="{Binding SelectRandom}" Margin="5 5" Width="100">Select random</Button>
+      <Button Command="{Binding Deselect}" Margin="5 5" Width="100">Deselect</Button>
+    </StackPanel>
+    <ListView ItemsSource="{Binding Entities}" SelectedItem="{Binding SelectedEntity}"
+              HorizontalContentAlignment="Center">
+      <ItemsControl.ItemTemplate>
+        <DataTemplate>
+          <StackPanel Orientation="Horizontal">
+            <TextBlock Text="{Binding Name}" />
+            <TextBlock Text="{Binding SelectedLabel}" />
+          </StackPanel>
+        </DataTemplate>
+      </ItemsControl.ItemTemplate>
+    </ListView>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml.cs b/src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml.cs
new file mode 100644
index 00000000..5ccb3f81
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.SubModelSelectedItem;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj b/src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj
new file mode 100644
index 00000000..a2014662
--- /dev/null
+++ b/src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading.Core/Program.fs b/src/Samples/Typed/Threading.Core/Program.fs
new file mode 100644
index 00000000..dbd42cb5
--- /dev/null
+++ b/src/Samples/Typed/Threading.Core/Program.fs
@@ -0,0 +1,92 @@
+module Elmish.WPF.Samples.Threading.Program
+
+open System.Threading
+open System.Windows.Threading
+
+open Serilog
+open Serilog.Extensions.Logging
+
+open Elmish.WPF
+
+
+type Model = { Pings: int; Message: string }
+
+type Msg =
+    | IncrementPings
+    | UpdateMessage of string
+    | AppendPingsToMessage
+
+type Cmd = | DelayThenIncrementPings
+
+
+module Program =
+    module Pings =
+        let get m = m.Pings
+        let set v m = { m with Pings = v }
+        let map f m = m |> get |> f |> set <| m
+
+    module Message =
+        let get m = m.Message
+        let set v m = { m with Message = v }
+
+    let init = { Pings = 0; Message = "" }, [ DelayThenIncrementPings ]
+
+    let update msg m =
+        match msg with
+        | IncrementPings -> m |> Pings.map ((+) 1), [ DelayThenIncrementPings ]
+        | UpdateMessage message -> m |> Message.set message, []
+        | AppendPingsToMessage -> { m with Message = m.Message + string m.Pings }, []
+
+    let toCmd =
+        function
+        | DelayThenIncrementPings ->
+            Elmish.Cmd.OfAsyncImmediate.perform (fun () -> Async.Sleep 1000) () (fun () -> IncrementPings)
+
+
+[<AllowNullLiteral>]
+type ThreadingViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.Pings =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Pings))
+
+    member _.Message =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.Message)
+             >> Binding.mapMsg UpdateMessage)
+
+    member _.AppendPingsToMessage = base.Get () (Binding.CmdT.setAlways AppendPingsToMessage)
+
+
+let designVm = ThreadingViewModel(ViewModelArgs.simple { Pings = 2; Message = "Hello" })
+
+let main window =
+
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = ThreadingViewModel(args)
+
+    let program =
+        WpfProgram.mkProgramWithCmdMsgT (fun () -> Program.init) Program.update createVm Program.toCmd
+        |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+
+    let elmishThread =
+        Thread(
+            ThreadStart(fun () ->
+                WpfProgram.startElmishLoop window program
+                Dispatcher.Run())
+        )
+
+    elmishThread.Name <- "ElmishDispatchThread"
+    elmishThread.Start()
+
+    elmishThread
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading.Core/Threading.Core.fsproj b/src/Samples/Typed/Threading.Core/Threading.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/Threading.Core/Threading.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading/App.xaml b/src/Samples/Typed/Threading/App.xaml
new file mode 100644
index 00000000..6389a2c5
--- /dev/null
+++ b/src/Samples/Typed/Threading/App.xaml
@@ -0,0 +1,6 @@
+<Application x:Class="Threading.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources />
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading/App.xaml.cs b/src/Samples/Typed/Threading/App.xaml.cs
new file mode 100644
index 00000000..d82cf7ae
--- /dev/null
+++ b/src/Samples/Typed/Threading/App.xaml.cs
@@ -0,0 +1,31 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Threading;
+using Elmish.WPF.Samples.Threading;
+
+namespace Threading;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+        Exit += StopElmish;
+    }
+
+    private Thread? ElmishThread { get; set; }
+
+    private void StopElmish(object? sender, ExitEventArgs e)
+    {
+        Dispatcher.FromThread(ElmishThread)?.InvokeShutdown();
+        ElmishThread?.Join();
+    }
+
+    private void StartElmish(object? _1, EventArgs _2)
+    {
+        Activated -= StartElmish;
+        ElmishThread = Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading/MainWindow.xaml b/src/Samples/Typed/Threading/MainWindow.xaml
new file mode 100644
index 00000000..5da8eb49
--- /dev/null
+++ b/src/Samples/Typed/Threading/MainWindow.xaml
@@ -0,0 +1,22 @@
+<Window x:Class="Elmish.WPF.Samples.Threading.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.Threading;assembly=Threading.Core"
+        mc:Ignorable="d"
+        Title="Threading" Height="450" Width="800"
+        >
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="300" />
+    </Grid.ColumnDefinitions>
+    <StackPanel Grid.Column="0" Orientation="Vertical" Margin="12">
+      <TextBlock Text="{Binding Pings, StringFormat='Seconds Since Startup: {0}'}" />
+      <TextBox Text="{Binding Message, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" AcceptsReturn="True"
+               Height="80" />
+      <Button Click="Button_Click" Content="Freeze UI 5 seconds" />
+      <Button Command="{Binding AppendPingsToMessage}" Content="Append number of seconds immediately" />
+    </StackPanel>
+  </Grid>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading/MainWindow.xaml.cs b/src/Samples/Typed/Threading/MainWindow.xaml.cs
new file mode 100644
index 00000000..ef9d5138
--- /dev/null
+++ b/src/Samples/Typed/Threading/MainWindow.xaml.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.Threading;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        Task.Delay(5000).Wait();
+    }
+
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading/Threading.csproj b/src/Samples/Typed/Threading/Threading.csproj
new file mode 100644
index 00000000..e691e4c4
--- /dev/null
+++ b/src/Samples/Typed/Threading/Threading.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Threading.Core\Threading.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs b/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs
new file mode 100644
index 00000000..66944420
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs
@@ -0,0 +1,62 @@
+module Elmish.WPF.Samples.UiBoundCmdParam.Program
+
+open Serilog
+open Serilog.Extensions.Logging
+open Elmish.WPF
+
+type Model =
+    { Numbers: int list
+      EnabledMaxLimit: int }
+
+let init () =
+    { Numbers = [ 0..10 ]
+      EnabledMaxLimit = 5 }
+
+type Msg =
+    | SetLimit of int
+    | Command
+
+let update msg m =
+    match msg with
+    | SetLimit x -> { m with EnabledMaxLimit = x }
+    | Command -> m
+
+[<AllowNullLiteral>]
+type UiBoundCmdParamViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+
+    member _.Numbers =
+        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Numbers))
+
+    member _.Limit =
+        base.Get
+            ()
+            (Binding.TwoWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> float m.EnabledMaxLimit)
+             >> Binding.mapMsg (int >> SetLimit))
+
+    member _.Command =
+        base.Get
+            ()
+            (Binding.CmdT.id 
+                true 
+                (fun (p: obj) m -> not (isNull p) && p :?> int <= m.EnabledMaxLimit)
+             >> Binding.mapMsg (fun _ -> Command))
+
+let designVm = UiBoundCmdParamViewModel(ViewModelArgs.simple (init ()))
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    let createVm args = UiBoundCmdParamViewModel(args)
+
+    WpfProgram.mkSimpleT init update createVm
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj b/src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
new file mode 100644
index 00000000..3160dc51
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam/App.xaml b/src/Samples/Typed/UiBoundCmdParam/App.xaml
new file mode 100644
index 00000000..ebbe7087
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam/App.xaml
@@ -0,0 +1,7 @@
+<Application x:Class="Elmish.WPF.Samples.UiBoundCmdParam.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam/App.xaml.cs b/src/Samples/Typed/UiBoundCmdParam/App.xaml.cs
new file mode 100644
index 00000000..65158bf6
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam/App.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+
+namespace Elmish.WPF.Samples.UiBoundCmdParam;
+
+public partial class App : Application
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml b/src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml
new file mode 100644
index 00000000..e342164c
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml
@@ -0,0 +1,34 @@
+<Window x:Class="Elmish.WPF.Samples.UiBoundCmdParam.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.UiBoundCmdParam;assembly=UiBoundCmdParam.Core"
+        Title="UI-bound CommandParameter"
+        Height="350"
+        Width="500"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d"
+        d:DataContext="{x:Static vm:Program.designVm}">
+  <StackPanel>
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,25,0,0">
+      <Button
+        Command="{Binding Command}"
+        CommandParameter="{Binding SelectedItem, ElementName=List}"
+        Width="210"
+        Margin="0,5,10,5"
+        Padding="5">
+        <TextBlock Text="{Binding Limit, StringFormat='Disabled when selected item is &gt; {0}'}" />
+      </Button>
+      <Slider Value="{Binding Limit}" TickFrequency="1" Maximum="10" Minimum="1" IsSnapToTickEnabled="True" Width="100"
+              Margin="0,5,10,5" />
+    </StackPanel>
+    <ListView x:Name="List" ItemsSource="{Binding Numbers}" HorizontalContentAlignment="Center">
+      <ItemsControl.ItemTemplate>
+        <DataTemplate>
+          <TextBlock Text="{Binding .}" />
+        </DataTemplate>
+      </ItemsControl.ItemTemplate>
+    </ListView>
+  </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml.cs b/src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml.cs
new file mode 100644
index 00000000..bb4d81de
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam/MainWindow.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows;
+
+namespace Elmish.WPF.Samples.UiBoundCmdParam;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj b/src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj
new file mode 100644
index 00000000..2dcd4310
--- /dev/null
+++ b/src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <OutputType>Exe</OutputType>
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\UiBoundCmdParam.Core\UiBoundCmdParam.Core.fsproj"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file

From 5fdd7cc5850ca348518f16bdbfa4c93faffd27cb Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Sun, 20 Jul 2025 21:12:25 +0200
Subject: [PATCH 12/18] Fix Samples/Typed/Capabilities

---
 Elmish.WPF.slnx                               | 22 ++++++++
 .../Typed/Capabilities.Core/Program.fs        |  2 +-
 .../Typed/Capabilities.Core/Selection.fs      | 52 ++++++++++---------
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 8866a874..66a9382e 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -47,14 +47,36 @@
     <Project Path="src/Samples/Dynamic/Validation/Validation.csproj" />
   </Folder>
   <Folder Name="/src/Samples/Typed/">
+    <Project Path="src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj" />
+    <Project Path="src/Samples/Typed/Capabilities/Capabilities.csproj" />
+    <Project Path="src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj" />
+    <Project Path="src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj" />
+    <Project Path="src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj" />
+    <Project Path="src/Samples/Typed/FileDialogs/FileDialogs.csproj" />
+    <Project Path="src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj" />
+    <Project Path="src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
+    <Project Path="src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj" />
+    <Project Path="src/Samples/Typed/Multiselect/Multiselect.csproj" />
+    <Project Path="src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj" />
+    <Project Path="src/Samples/Typed/NewWindow/NewWindow.csproj" />
+    <Project Path="src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
+    <Project Path="src/Samples/Typed/OneWaySeq/OneWaySeq.csproj" />
     <Project Path="src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj" />
     <Project Path="src/Samples/Typed/SingleCounter/SingleCounter.csproj" />
+    <Project Path="src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj" />
+    <Project Path="src/Samples/Typed/Sticky/Sticky.csproj" />
     <Project Path="src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
     <Project Path="src/Samples/Typed/SubModelOpt/SubModelOpt.csproj" />
+    <Project Path="src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj" />
+    <Project Path="src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj" />
     <Project Path="src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
     <Project Path="src/Samples/Typed/SubModelSeq/SubModelSeq.csproj" />
     <Project Path="src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj" />
     <Project Path="src/Samples/Typed/SubModelStatic/SubModelStatic.csproj" />
+    <Project Path="src/Samples/Typed/Threading.Core/Threading.Core.fsproj" />
+    <Project Path="src/Samples/Typed/Threading/Threading.csproj" />
+    <Project Path="src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj" />
+    <Project Path="src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj" />
     <Project Path="src/Samples/Typed/Validation.Core/Validation.Core.fsproj" />
     <Project Path="src/Samples/Typed/Validation/Validation.csproj" />
   </Folder>
diff --git a/src/Samples/Typed/Capabilities.Core/Program.fs b/src/Samples/Typed/Capabilities.Core/Program.fs
index 1e9cf8e1..9f1fadf8 100644
--- a/src/Samples/Typed/Capabilities.Core/Program.fs
+++ b/src/Samples/Typed/Capabilities.Core/Program.fs
@@ -52,7 +52,7 @@ type MainViewModel(args) =
     member _.Selection =
         base.Get
             ()
-            (Binding.SubModelT.required selectionVm
+            (Binding.SubModelT.req selectionVm
              >> Binding.mapModel Program.Selection.get
              >> Binding.mapMsg SelectionMsg)
 
diff --git a/src/Samples/Typed/Capabilities.Core/Selection.fs b/src/Samples/Typed/Capabilities.Core/Selection.fs
index d0cad867..1ab69289 100644
--- a/src/Samples/Typed/Capabilities.Core/Selection.fs
+++ b/src/Samples/Typed/Capabilities.Core/Selection.fs
@@ -58,14 +58,14 @@ type TreeViewModel(args) =
 
     let createTreeVm (args: ViewModelArgs<Tree<string>, unit>) = TreeViewModel(args)
 
-    member _.Data =
-        base.Get () (Binding.OneWayT.id >> Binding.mapModel Tree.Data.get)
+    member _.Data = base.Get () (Binding.OneWayT.id >> Binding.mapModel Tree.Data.get)
 
     member _.SelectedValueChildren =
         base.Get
             ()
-            (Binding.SubModelSeqKeyedT.id createTreeVm (fun t -> t.Data)
-             >> Binding.mapModel (Tree.Children.get))
+            (Binding.SubModelSeqUnkeyedT.id createTreeVm
+             >> Binding.mapModel (Tree.Children.get >> List.ofSeq)
+             >> Binding.mapMsg snd)
 
 [<AllowNullLiteral>]
 type SelectionViewModel(args) =
@@ -73,31 +73,35 @@ type SelectionViewModel(args) =
 
     let createTreeVm (args: ViewModelArgs<Tree<string>, unit>) = TreeViewModel(args)
 
-    member _.SelectedIndex =
-        base.Get
-            ()
-            (Binding.SelectedIndexT.id
-             >> Binding.mapModel Selection.SelectedIndex.get
-             >> Binding.mapMsg SetSelectedIndex)
+    let selectedIndexBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Selection) -> m.SelectedIndex |> Option.defaultValue -1)
+        >> Binding.mapMsg (fun v -> SetSelectedIndex(if v = -1 then None else Some v))
 
-    member _.DeselectIndex =
-        base.Get
-            ()
-            (Binding.CmdT.setIf
-             >> Binding.mapModel (Selection.SelectedIndex.get >> Option.map (fun _ -> SetSelectedIndex None)))
+    let selectedValueBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Selection) -> m.SelectedValue |> Option.defaultValue "")
+        >> Binding.mapMsg (fun v -> SetSelectedValue(if v = "" then None else Some v))
+
+    member this.SelectedIndex 
+        with get() = base.Get() selectedIndexBinding
+        and set(value) = base.Set(value) selectedIndexBinding
+
+    member _.DeselectIndex = 
+        base.Get () (Binding.CmdT.set (fun m -> m.SelectedIndex.IsSome) (SetSelectedIndex None))
 
     member _.SelectedIndexData =
         base.Get () (Binding.OneWayT.id >> Binding.mapModel Selection.SelectedIndexData.get)
 
-    member _.SelectedValue =
-        base.Get
-            ()
-            (Binding.TwoWayOptT.id
-             >> Binding.mapModel Selection.SelectedValue.get
-             >> Binding.mapMsg SetSelectedValue)
+    member this.SelectedValue
+        with get() = base.Get() selectedValueBinding
+        and set(value) = base.Set(value) selectedValueBinding
 
-    member _.SelectedValueData =
+    member _.SelectedValueData = 
         base.Get
             ()
-            (Binding.SubModelSeqKeyedT.id createTreeVm (fun t -> t.Data)
-             >> Binding.mapModel Selection.SelectedValueData.get)
\ No newline at end of file
+            (Binding.SubModelSeqUnkeyedT.id createTreeVm
+             >> Binding.mapModel (Selection.SelectedValueData.get >> List.ofSeq)
+             >> Binding.mapMsg (fun _ -> failwith "TreeViewModel should not send messages"))
\ No newline at end of file

From 05cd252ff9763f48d97bf45831040ddcfb57e2ab Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Mon, 21 Jul 2025 09:49:45 +0200
Subject: [PATCH 13/18] Add missing typed samples

---
 .../Typed/Capabilities.Core/Program.fs        |  1 -
 .../Typed/Capabilities.Core/Selection.fs      | 14 ++---
 .../EventBindingsAndBehaviors.Core/Program.fs | 38 +++++++++-----
 src/Samples/Typed/FileDialogs.Core/Program.fs | 26 +++++++---
 .../Typed/FileDialogsCmdMsg.Core/Program.fs   | 26 +++++++---
 src/Samples/Typed/Multiselect.Core/Program.fs | 17 ++++---
 src/Samples/Typed/NewWindow.Core/App.fs       | 13 +++--
 src/Samples/Typed/NewWindow.Core/Program.fs   |  3 +-
 src/Samples/Typed/NewWindow.Core/Window2.fs   | 14 ++---
 src/Samples/Typed/NewWindow/MainWindow.xaml   |  3 +-
 src/Samples/Typed/OneWaySeq.Core/Program.fs   |  6 +--
 src/Samples/Typed/OneWaySeq/App.xaml          |  4 +-
 src/Samples/Typed/OneWaySeq/App.xaml.cs       | 21 ++++----
 .../Typed/OneWaySeq/MainWindow.xaml.cs        | 11 ++--
 .../Typed/SingleCounter.Core/Program.fs       | 17 ++++---
 src/Samples/Typed/SingleCounter/App.xaml      |  4 +-
 src/Samples/Typed/SingleCounter/App.xaml.cs   | 21 ++++----
 .../Typed/SingleCounter/MainWindow.xaml.cs    | 11 ++--
 src/Samples/Typed/Sticky.Core/Program.fs      | 17 ++++---
 src/Samples/Typed/Sticky/App.xaml             |  4 +-
 src/Samples/Typed/Sticky/App.xaml.cs          | 21 ++++----
 src/Samples/Typed/Sticky/MainWindow.xaml.cs   | 11 ++--
 src/Samples/Typed/SubModelOpt.Core/Program.fs | 51 ++++++++++---------
 src/Samples/Typed/SubModelOpt/App.xaml        |  4 +-
 src/Samples/Typed/SubModelOpt/App.xaml.cs     | 21 ++++----
 src/Samples/Typed/SubModelOpt/Form1.xaml.cs   | 11 ++--
 src/Samples/Typed/SubModelOpt/Form2.xaml.cs   | 11 ++--
 .../Typed/SubModelOpt/MainWindow.xaml.cs      | 11 ++--
 .../SubModelSelectedItem.Core/Program.fs      | 43 +++++++++-------
 src/Samples/Typed/SubModelSeq.Core/Program.fs | 17 ++++---
 src/Samples/Typed/SubModelSeq/App.xaml        |  4 +-
 src/Samples/Typed/SubModelSeq/App.xaml.cs     | 21 ++++----
 src/Samples/Typed/SubModelSeq/Counter.xaml.cs | 11 ++--
 src/Samples/Typed/SubModelSeq/MainWindow.xaml |  3 +-
 .../Typed/SubModelSeq/MainWindow.xaml.cs      | 11 ++--
 src/Samples/Typed/Threading.Core/Program.fs   | 27 ++++++----
 src/Samples/Typed/Threading/MainWindow.xaml   |  4 +-
 .../Typed/Threading/MainWindow.xaml.cs        |  1 -
 .../Typed/UiBoundCmdParam.Core/Program.fs     | 22 ++++----
 src/Samples/Typed/Validation.Core/Program.fs  | 37 +++++++-------
 src/Samples/Typed/Validation/App.xaml         |  4 +-
 src/Samples/Typed/Validation/App.xaml.cs      | 21 ++++----
 src/Samples/Typed/Validation/MainWindow.xaml  |  2 +-
 .../Typed/Validation/MainWindow.xaml.cs       | 11 ++--
 44 files changed, 344 insertions(+), 307 deletions(-)

diff --git a/src/Samples/Typed/Capabilities.Core/Program.fs b/src/Samples/Typed/Capabilities.Core/Program.fs
index 9f1fadf8..5ba4f38d 100644
--- a/src/Samples/Typed/Capabilities.Core/Program.fs
+++ b/src/Samples/Typed/Capabilities.Core/Program.fs
@@ -3,7 +3,6 @@ module Elmish.WPF.Samples.Capabilities.Program
 open System.Windows
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 open Selection
 
diff --git a/src/Samples/Typed/Capabilities.Core/Selection.fs b/src/Samples/Typed/Capabilities.Core/Selection.fs
index 1ab69289..72fa011a 100644
--- a/src/Samples/Typed/Capabilities.Core/Selection.fs
+++ b/src/Samples/Typed/Capabilities.Core/Selection.fs
@@ -85,21 +85,21 @@ type SelectionViewModel(args) =
         >> Binding.mapModel (fun (m: Selection) -> m.SelectedValue |> Option.defaultValue "")
         >> Binding.mapMsg (fun v -> SetSelectedValue(if v = "" then None else Some v))
 
-    member this.SelectedIndex 
-        with get() = base.Get() selectedIndexBinding
-        and set(value) = base.Set(value) selectedIndexBinding
+    member this.SelectedIndex
+        with get () = base.Get () selectedIndexBinding
+        and set (value) = base.Set (value) selectedIndexBinding
 
-    member _.DeselectIndex = 
+    member _.DeselectIndex =
         base.Get () (Binding.CmdT.set (fun m -> m.SelectedIndex.IsSome) (SetSelectedIndex None))
 
     member _.SelectedIndexData =
         base.Get () (Binding.OneWayT.id >> Binding.mapModel Selection.SelectedIndexData.get)
 
     member this.SelectedValue
-        with get() = base.Get() selectedValueBinding
-        and set(value) = base.Set(value) selectedValueBinding
+        with get () = base.Get () selectedValueBinding
+        and set (value) = base.Set (value) selectedValueBinding
 
-    member _.SelectedValueData = 
+    member _.SelectedValueData =
         base.Get
             ()
             (Binding.SubModelSeqUnkeyedT.id createTreeVm
diff --git a/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs b/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs
index 1fdd7a54..9552e6bd 100644
--- a/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs
+++ b/src/Samples/Typed/EventBindingsAndBehaviors.Core/Program.fs
@@ -61,19 +61,31 @@ let paramToNewMousePositionMsg (p: obj) =
 type MainViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
-    member _.Msg1 = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Msg1))
-    member _.Msg2 = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Msg2))
-    member _.GotFocus1 = base.Get() (Binding.CmdT.setAlways GotFocus1)
-    member _.GotFocus2 = base.Get() (Binding.CmdT.setAlways GotFocus2)
-    member _.LostFocus1 = base.Get() (Binding.CmdT.setAlways LostFocus1)
-    member _.LostFocus2 = base.Get() (Binding.CmdT.setAlways LostFocus2)
-    member _.ToggleVisibility = base.Get() (Binding.CmdT.setAlways ToggleVisibility)
-    member _.ButtonText = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.ButtonText))
-    member _.TextBoxVisibility = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Visibility))
-    member _.MouseMoveCommand = 
-        base.Get() (Binding.CmdT.id false (fun p _ -> true) >> Binding.mapMsg paramToNewMousePositionMsg)
-    member _.MousePosition = 
-        base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> sprintf "%dx%d" m.MousePosition.X m.MousePosition.Y))
+    member _.Msg1 = base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Msg1))
+    member _.Msg2 = base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Msg2))
+    member _.GotFocus1 = base.Get () (Binding.CmdT.setAlways GotFocus1)
+    member _.GotFocus2 = base.Get () (Binding.CmdT.setAlways GotFocus2)
+    member _.LostFocus1 = base.Get () (Binding.CmdT.setAlways LostFocus1)
+    member _.LostFocus2 = base.Get () (Binding.CmdT.setAlways LostFocus2)
+    member _.ToggleVisibility = base.Get () (Binding.CmdT.setAlways ToggleVisibility)
+
+    member _.ButtonText =
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.ButtonText))
+
+    member _.TextBoxVisibility =
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Visibility))
+
+    member _.MouseMoveCommand =
+        base.Get
+            ()
+            (Binding.CmdT.id false (fun p _ -> true)
+             >> Binding.mapMsg paramToNewMousePositionMsg)
+
+    member _.MousePosition =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.mapModel (fun m -> sprintf "%dx%d" m.MousePosition.X m.MousePosition.Y))
 
 let designVm = MainViewModel(ViewModelArgs.simple (init ()))
 
diff --git a/src/Samples/Typed/FileDialogs.Core/Program.fs b/src/Samples/Typed/FileDialogs.Core/Program.fs
index 6590c0e0..ba256130 100644
--- a/src/Samples/Typed/FileDialogs.Core/Program.fs
+++ b/src/Samples/Typed/FileDialogs.Core/Program.fs
@@ -96,22 +96,32 @@ let update msg m =
 type FileDialogsViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
-    member _.CurrentTime =
-        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.CurrentTime))
+    let textBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun m -> m.Text)
+        >> Binding.mapMsg SetText
 
-    member _.Text =
+    member _.CurrentTime =
         base.Get
             ()
-            (Binding.TwoWayT.id
+            (Binding.OneWayT.id
              >> Binding.addLazy (=)
-             >> Binding.mapModel (fun m -> m.Text)
-             >> Binding.mapMsg SetText)
+             >> Binding.mapModel (fun m -> m.CurrentTime))
+
+    member this.Text
+        with get () = base.Get () textBinding
+        and set (value) = base.Set (value) textBinding
 
     member _.StatusMsg =
-        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.StatusMsg))
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.StatusMsg))
 
     member _.Save = base.Get () (Binding.CmdT.setAlways RequestSave)
-    
+
     member _.Load = base.Get () (Binding.CmdT.setAlways RequestLoad)
 
 
diff --git a/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs b/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs
index 70c2ddb7..02e668f0 100644
--- a/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs
+++ b/src/Samples/Typed/FileDialogsCmdMsg.Core/Program.fs
@@ -107,22 +107,32 @@ let update msg m =
 type FileDialogsCmdMsgViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
-    member _.CurrentTime =
-        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.CurrentTime))
+    let textBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun m -> m.Text)
+        >> Binding.mapMsg SetText
 
-    member _.Text =
+    member _.CurrentTime =
         base.Get
             ()
-            (Binding.TwoWayT.id
+            (Binding.OneWayT.id
              >> Binding.addLazy (=)
-             >> Binding.mapModel (fun m -> m.Text)
-             >> Binding.mapMsg SetText)
+             >> Binding.mapModel (fun m -> m.CurrentTime))
+
+    member this.Text
+        with get () = base.Get () textBinding
+        and set (value) = base.Set (value) textBinding
 
     member _.StatusMsg =
-        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.StatusMsg))
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun m -> m.StatusMsg))
 
     member _.Save = base.Get () (Binding.CmdT.setAlways RequestSave)
-    
+
     member _.Load = base.Get () (Binding.CmdT.setAlways RequestLoad)
 
 
diff --git a/src/Samples/Typed/Multiselect.Core/Program.fs b/src/Samples/Typed/Multiselect.Core/Program.fs
index 91456dd9..241df8f5 100644
--- a/src/Samples/Typed/Multiselect.Core/Program.fs
+++ b/src/Samples/Typed/Multiselect.Core/Program.fs
@@ -3,7 +3,6 @@ module Elmish.WPF.Samples.Multiselect.Program
 open System
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 type Entity =
@@ -51,16 +50,18 @@ let rec update msg m =
 type EntityViewModel(args) =
     inherit ViewModelBase<Entity, int * bool>(args)
 
+    let isSelectedBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun e -> e.IsSelected)
+        >> Binding.mapMsgWithModel (fun isSelected e -> (e.Id, isSelected))
+
     member _.Name =
         base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun e -> e.Name))
 
-    member _.IsSelected =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun e -> e.IsSelected)
-             >> Binding.mapMsgWithModel (fun isSelected e -> (e.Id, isSelected)))
+    member this.IsSelected
+        with get () = base.Get () isSelectedBinding
+        and set (value) = base.Set (value) isSelectedBinding
 
     member _.SelectedLabel =
         base.Get
diff --git a/src/Samples/Typed/NewWindow.Core/App.fs b/src/Samples/Typed/NewWindow.Core/App.fs
index 0075f343..2782d86b 100644
--- a/src/Samples/Typed/NewWindow.Core/App.fs
+++ b/src/Samples/Typed/NewWindow.Core/App.fs
@@ -65,13 +65,16 @@ type AppViewModel(args) =
     member _.Window1 =
         base.Get
             ()
-            (Binding.SubModelWinT.id window1Vm
-             >> Binding.mapModel (fun m -> m.Window1)
-             >> Binding.mapMsg (fun s -> Window1SetInput s))
+            (Binding.SubModelWinT.id (fun m -> m.Window1) window1Vm (fun _ _ -> Window()) false (fun _ -> ValueNone)
+             >> Binding.mapMsg Window1SetInput)
 
     member _.Window2 =
         base.Get
             ()
-            (Binding.SubModelWinT.id window2Vm
-             >> Binding.mapModel (fun m -> App.Window2.get m |> WindowState.ofOption)
+            (Binding.SubModelWinT.id
+                (fun m -> App.Window2.get m |> WindowState.ofOption)
+                window2Vm
+                (fun _ _ -> Window())
+                true
+                (fun _ -> ValueNone)
              >> Binding.mapMsg App.Window2.mapInOutMsg)
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow.Core/Program.fs b/src/Samples/Typed/NewWindow.Core/Program.fs
index 5e026fa0..0597e731 100644
--- a/src/Samples/Typed/NewWindow.Core/Program.fs
+++ b/src/Samples/Typed/NewWindow.Core/Program.fs
@@ -4,7 +4,6 @@ open System
 open System.Windows
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 open AppModule
 
@@ -25,7 +24,7 @@ let main mainWindow (createWindow1: Func<#Window>) (createWindow2: Func<#Window>
         window
 
     let init () = App.init
-    
+
     let createVm args = AppViewModel(args)
 
     WpfProgram.mkSimpleT init App.update createVm
diff --git a/src/Samples/Typed/NewWindow.Core/Window2.fs b/src/Samples/Typed/NewWindow.Core/Window2.fs
index e54d8712..ac2f6c91 100644
--- a/src/Samples/Typed/NewWindow.Core/Window2.fs
+++ b/src/Samples/Typed/NewWindow.Core/Window2.fs
@@ -48,7 +48,7 @@ module Window2 =
         | Cancel -> ConfirmState.Cancel |> Some |> ConfirmState.set
         | Close -> ConfirmState.Close |> Some |> ConfirmState.set
 
-    let private confirmStateToMsg confirmState msg m =
+    let confirmStateToMsg confirmState msg m =
         if m.ConfirmState = Some confirmState then
             InOut.Out Window2OutMsg.Close
         else
@@ -91,16 +91,10 @@ type Window2ViewModel(args) =
              >> Binding.mapModel (fun m -> m.ConfirmState = Some ConfirmState.Close |> Bool.toVisibilityCollapsed))
 
     member _.Submit =
-        base.Get
-            ()
-            (Binding.CmdT.set (fun _ -> true) (Window2.confirmStateToMsg ConfirmState.Submit Submit))
+        base.Get () (Binding.CmdT.setAlways (InOut.In Submit))
 
     member _.Cancel =
-        base.Get
-            ()
-            (Binding.CmdT.set (fun _ -> true) (Window2.confirmStateToMsg ConfirmState.Cancel Cancel))
+        base.Get () (Binding.CmdT.setAlways (InOut.In Cancel))
 
     member _.Close =
-        base.Get
-            ()
-            (Binding.CmdT.set (fun _ -> true) (Window2.confirmStateToMsg ConfirmState.Close Close))
\ No newline at end of file
+        base.Get () (Binding.CmdT.setAlways (InOut.In Close))
\ No newline at end of file
diff --git a/src/Samples/Typed/NewWindow/MainWindow.xaml b/src/Samples/Typed/NewWindow/MainWindow.xaml
index 77fb0fd7..dece2841 100644
--- a/src/Samples/Typed/NewWindow/MainWindow.xaml
+++ b/src/Samples/Typed/NewWindow/MainWindow.xaml
@@ -11,8 +11,7 @@
         mc:Ignorable="d"
         d:DataContext="{x:Static vm:AppModule.designVm}">
   <Window.Resources>
-    <ResourceDictionary>
-    </ResourceDictionary>
+    <ResourceDictionary />
   </Window.Resources>
   <StackPanel VerticalAlignment="Center">
     <TextBlock HorizontalAlignment="Center" FontWeight="Bold">Window 1</TextBlock>
diff --git a/src/Samples/Typed/OneWaySeq.Core/Program.fs b/src/Samples/Typed/OneWaySeq.Core/Program.fs
index c9b02ee1..d2f6c41c 100644
--- a/src/Samples/Typed/OneWaySeq.Core/Program.fs
+++ b/src/Samples/Typed/OneWaySeq.Core/Program.fs
@@ -2,7 +2,6 @@ module Elmish.WPF.Samples.OneWaySeq.Program
 
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 type Model =
@@ -31,10 +30,7 @@ type OneWaySeqViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
     member _.OneWaySeqNumbers =
-        base.Get
-            ()
-            (Binding.OneWaySeqT.id (=) id
-             >> Binding.mapModel (fun m -> m.OneWaySeqNumbers))
+        base.Get () (Binding.OneWaySeqT.id (=) id >> Binding.mapModel (fun m -> m.OneWaySeqNumbers))
 
     member _.OneWayNumbers =
         base.Get
diff --git a/src/Samples/Typed/OneWaySeq/App.xaml b/src/Samples/Typed/OneWaySeq/App.xaml
index 7170ae13..feb74ca1 100644
--- a/src/Samples/Typed/OneWaySeq/App.xaml
+++ b/src/Samples/Typed/OneWaySeq/App.xaml
@@ -2,6 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-    </Application.Resources>
+  <Application.Resources>
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/App.xaml.cs b/src/Samples/Typed/OneWaySeq/App.xaml.cs
index 974ac717..8e8ffce5 100644
--- a/src/Samples/Typed/OneWaySeq/App.xaml.cs
+++ b/src/Samples/Typed/OneWaySeq/App.xaml.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace Elmish.WPF.Samples.OneWaySeq
+namespace Elmish.WPF.Samples.OneWaySeq;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs b/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs
index bc1748a8..ee542697 100644
--- a/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs
+++ b/src/Samples/Typed/OneWaySeq/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Elmish.WPF.Samples.OneWaySeq
+namespace Elmish.WPF.Samples.OneWaySeq;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter.Core/Program.fs b/src/Samples/Typed/SingleCounter.Core/Program.fs
index ae9c5149..c754311c 100644
--- a/src/Samples/Typed/SingleCounter.Core/Program.fs
+++ b/src/Samples/Typed/SingleCounter.Core/Program.fs
@@ -2,7 +2,6 @@ module Elmish.WPF.Samples.SingleCounter.Program
 
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 module Counter =
@@ -29,19 +28,21 @@ module Counter =
 type CounterViewModel(args) =
     inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
 
+    let stepSizeBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
+        >> Binding.mapMsg (int >> Counter.SetStepSize)
+
     member _.CounterValue =
         base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Count))
 
     member _.Increment = base.Get () (Binding.CmdT.setAlways Counter.Increment)
     member _.Decrement = base.Get () (Binding.CmdT.setAlways Counter.Decrement)
 
-    member _.StepSize =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
-             >> Binding.mapMsg (int >> Counter.SetStepSize))
+    member this.StepSize
+        with get () = base.Get () stepSizeBinding
+        and set (value) = base.Set (value) stepSizeBinding
 
     member _.Reset = base.Get () (Binding.CmdT.set Counter.canReset Counter.Reset)
 
diff --git a/src/Samples/Typed/SingleCounter/App.xaml b/src/Samples/Typed/SingleCounter/App.xaml
index 318b635a..0e1c6c8e 100644
--- a/src/Samples/Typed/SingleCounter/App.xaml
+++ b/src/Samples/Typed/SingleCounter/App.xaml
@@ -2,6 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-    </Application.Resources>
+  <Application.Resources>
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/App.xaml.cs b/src/Samples/Typed/SingleCounter/App.xaml.cs
index c7fea640..5daa1ceb 100644
--- a/src/Samples/Typed/SingleCounter/App.xaml.cs
+++ b/src/Samples/Typed/SingleCounter/App.xaml.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace Elmish.WPF.Samples.SingleCounter
+namespace Elmish.WPF.Samples.SingleCounter;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs b/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs
index 8675ce9d..4b6e2e37 100644
--- a/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs
+++ b/src/Samples/Typed/SingleCounter/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Elmish.WPF.Samples.SingleCounter
+namespace Elmish.WPF.Samples.SingleCounter;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky.Core/Program.fs b/src/Samples/Typed/Sticky.Core/Program.fs
index 652a4b97..44409dc3 100644
--- a/src/Samples/Typed/Sticky.Core/Program.fs
+++ b/src/Samples/Typed/Sticky.Core/Program.fs
@@ -2,7 +2,6 @@ module Elmish.WPF.Samples.Sticky.Program
 
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 type Model = { Count: int; StepSize: int }
@@ -28,6 +27,12 @@ let update msg m =
 type StickyViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
+    let stepSizeBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Model) -> float m.StepSize)
+        >> Binding.mapMsg (int >> SetStepSize)
+
     member _.CounterValue =
         base.Get
             ()
@@ -39,13 +44,9 @@ type StickyViewModel(args) =
     member _.Increment = base.Get () (Binding.CmdT.setAlways Increment)
     member _.Decrement = base.Get () (Binding.CmdT.setAlways Decrement)
 
-    member _.StepSize =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Model) -> float m.StepSize)
-             >> Binding.mapMsg (int >> SetStepSize))
+    member this.StepSize
+        with get () = base.Get () stepSizeBinding
+        and set (value) = base.Set (value) stepSizeBinding
 
     member _.Reset = base.Get () (Binding.CmdT.set canReset Reset)
 
diff --git a/src/Samples/Typed/Sticky/App.xaml b/src/Samples/Typed/Sticky/App.xaml
index 43dbe792..ad939705 100644
--- a/src/Samples/Typed/Sticky/App.xaml
+++ b/src/Samples/Typed/Sticky/App.xaml
@@ -2,6 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-    </Application.Resources>
+  <Application.Resources>
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/App.xaml.cs b/src/Samples/Typed/Sticky/App.xaml.cs
index d7069cb5..6a1976d8 100644
--- a/src/Samples/Typed/Sticky/App.xaml.cs
+++ b/src/Samples/Typed/Sticky/App.xaml.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace Elmish.WPF.Samples.Sticky
+namespace Elmish.WPF.Samples.Sticky;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/Sticky/MainWindow.xaml.cs b/src/Samples/Typed/Sticky/MainWindow.xaml.cs
index 5a763b9b..2233047d 100644
--- a/src/Samples/Typed/Sticky/MainWindow.xaml.cs
+++ b/src/Samples/Typed/Sticky/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Elmish.WPF.Samples.Sticky
+namespace Elmish.WPF.Samples.Sticky;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt.Core/Program.fs b/src/Samples/Typed/SubModelOpt.Core/Program.fs
index b4de941b..37041721 100644
--- a/src/Samples/Typed/SubModelOpt.Core/Program.fs
+++ b/src/Samples/Typed/SubModelOpt.Core/Program.fs
@@ -2,7 +2,6 @@ module Elmish.WPF.Samples.SubModelOpt.Program
 
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 module Form1 =
@@ -23,13 +22,15 @@ module Form1 =
 type Form1ViewModel(args) =
     inherit ViewModelBase<Form1.Model, Form1.Msg>(args)
 
-    member _.Text =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Form1.Model) -> m.Text)
-             >> Binding.mapMsg Form1.SetText)
+    let textBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Form1.Model) -> m.Text)
+        >> Binding.mapMsg Form1.SetText
+
+    member this.Text
+        with get () = base.Get () textBinding
+        and set (value) = base.Set (value) textBinding
 
     member _.Submit = base.Get () (Binding.CmdT.setAlways Form1.Submit)
 
@@ -53,21 +54,25 @@ module Form2 =
 type Form2ViewModel(args) =
     inherit ViewModelBase<Form2.Model, Form2.Msg>(args)
 
-    member _.Text1 =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Form2.Model) -> m.Text1)
-             >> Binding.mapMsg Form2.SetText1)
-
-    member _.Text2 =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Form2.Model) -> m.Text2)
-             >> Binding.mapMsg Form2.SetText2)
+    let text1Binding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Form2.Model) -> m.Text1)
+        >> Binding.mapMsg Form2.SetText1
+
+    let text2Binding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Form2.Model) -> m.Text2)
+        >> Binding.mapMsg Form2.SetText2
+
+    member this.Text1
+        with get () = base.Get () text1Binding
+        and set (value) = base.Set (value) text1Binding
+
+    member this.Text2
+        with get () = base.Get () text2Binding
+        and set (value) = base.Set (value) text2Binding
 
     member _.Submit = base.Get () (Binding.CmdT.setAlways Form2.Submit)
 
diff --git a/src/Samples/Typed/SubModelOpt/App.xaml b/src/Samples/Typed/SubModelOpt/App.xaml
index 8a732a54..86a86ac1 100644
--- a/src/Samples/Typed/SubModelOpt/App.xaml
+++ b/src/Samples/Typed/SubModelOpt/App.xaml
@@ -2,6 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-    </Application.Resources>
+  <Application.Resources>
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/App.xaml.cs b/src/Samples/Typed/SubModelOpt/App.xaml.cs
index 704fab10..b3d7c3f6 100644
--- a/src/Samples/Typed/SubModelOpt/App.xaml.cs
+++ b/src/Samples/Typed/SubModelOpt/App.xaml.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace Elmish.WPF.Samples.SubModelOpt
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/Form1.xaml.cs b/src/Samples/Typed/SubModelOpt/Form1.xaml.cs
index 42ee95a5..61d3d0b8 100644
--- a/src/Samples/Typed/SubModelOpt/Form1.xaml.cs
+++ b/src/Samples/Typed/SubModelOpt/Form1.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows.Controls;
 
-namespace Elmish.WPF.Samples.SubModelOpt
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class Form1 : UserControl
 {
-    public partial class Form1 : UserControl
+    public Form1()
     {
-        public Form1()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/Form2.xaml.cs b/src/Samples/Typed/SubModelOpt/Form2.xaml.cs
index 55854545..6b218368 100644
--- a/src/Samples/Typed/SubModelOpt/Form2.xaml.cs
+++ b/src/Samples/Typed/SubModelOpt/Form2.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows.Controls;
 
-namespace Elmish.WPF.Samples.SubModelOpt
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class Form2 : UserControl
 {
-    public partial class Form2 : UserControl
+    public Form2()
     {
-        public Form2()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs b/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs
index 56844fbb..e74b3420 100644
--- a/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs
+++ b/src/Samples/Typed/SubModelOpt/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Elmish.WPF.Samples.SubModelOpt
+namespace Elmish.WPF.Samples.SubModelOpt;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs b/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
index 5b6d55b5..1cf6ac6f 100644
--- a/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
+++ b/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
@@ -3,7 +3,6 @@ module Elmish.WPF.Samples.SubModelSelectedItem.Program
 open System
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 type Entity = { Id: int; Name: string }
@@ -16,18 +15,31 @@ let init () =
     { Entities = [ 0..10 ] |> List.map (fun i -> { Id = i; Name = sprintf "Entity %i" i })
       Selected = Some 4 }
 
-type Msg = Select of int option
+type Msg = 
+    | Select of int option
+    | SelectRandom
 
 let update msg m =
     match msg with
     | Select entityId -> { m with Selected = entityId }
+    | SelectRandom ->
+        if m.Entities.Length > 0 then
+            let randomIndex = Random().Next(m.Entities.Length)
+            let randomEntity = m.Entities.[randomIndex]
+            { m with Selected = Some randomEntity.Id }
+        else
+            m
 
 [<AllowNullLiteral>]
 type EntityViewModel(args) =
     inherit ViewModelBase<Model * Entity, unit>(args)
 
     member _.Name =
-        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun (_, e) -> e.Name))
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.addLazy (=)
+             >> Binding.mapModel (fun (_, e) -> e.Name))
 
     member _.SelectedLabel =
         base.Get
@@ -42,14 +54,13 @@ type MainViewModel(args) =
 
     let createEntityVm (args: ViewModelArgs<Model * Entity, unit>) = EntityViewModel(args)
 
+    let selectedEntityBinding =
+        Binding.SubModelSelectedItem.opt "Entities"
+        >> Binding.mapModel (fun m -> m.Selected)
+        >> Binding.mapMsg Select
+
     member _.SelectRandom =
-        base.Get
-            ()
-            (Binding.CmdT.set (fun m -> m.Entities.Length > 0)
-                (fun m ->
-                    m.Entities.Item(Random().Next(m.Entities.Length)).Id
-                    |> Some
-                    |> Select))
+        base.Get () (Binding.CmdT.set (fun m -> m.Entities.Length > 0) SelectRandom)
 
     member _.Deselect = base.Get () (Binding.CmdT.setAlways (Select None))
 
@@ -57,14 +68,12 @@ type MainViewModel(args) =
         base.Get
             ()
             (Binding.SubModelSeqKeyedT.id createEntityVm (fun (_, e) -> e.Id)
-             >> Binding.mapModel (fun m -> m.Entities |> List.map (fun e -> (m, e))))
+             >> Binding.mapModel (fun m -> m.Entities |> List.map (fun e -> (m, e)))
+             >> Binding.mapMsg (fun _ -> failwith "EntityViewModel should not dispatch messages"))
 
-    member _.SelectedEntity =
-        base.Get
-            ()
-            (Binding.SubModelSelectedItem.opt "Entities"
-             >> Binding.mapModel (fun m -> m.Selected)
-             >> Binding.mapMsg Select)
+    member this.SelectedEntity
+        with get () = base.Get () selectedEntityBinding
+        and set (value) = base.Set (value) selectedEntityBinding
 
 let main window =
     let logger =
diff --git a/src/Samples/Typed/SubModelSeq.Core/Program.fs b/src/Samples/Typed/SubModelSeq.Core/Program.fs
index 6b77675f..a53ccc04 100644
--- a/src/Samples/Typed/SubModelSeq.Core/Program.fs
+++ b/src/Samples/Typed/SubModelSeq.Core/Program.fs
@@ -3,7 +3,6 @@ module Elmish.WPF.Samples.SubModelSeq.Program
 open System
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 module Counter =
@@ -91,6 +90,12 @@ type InOutMsg<'a, 'b> =
 type CounterWithRemoveViewModel(args) =
     inherit ViewModelBase<Counter.Model, InOutMsg<Counter.Msg, App.CounterOutMsg>>(args)
 
+    let stepSizeBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
+        >> Binding.mapMsg (int >> Counter.SetStepSize >> InMsg)
+
     member _.CounterId =
         base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Id))
 
@@ -100,13 +105,9 @@ type CounterWithRemoveViewModel(args) =
     member _.Increment = base.Get () (Binding.CmdT.setAlways (InMsg Counter.Increment))
     member _.Decrement = base.Get () (Binding.CmdT.setAlways (InMsg Counter.Decrement))
 
-    member _.StepSize =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Counter.Model) -> float m.StepSize)
-             >> Binding.mapMsg (int >> Counter.SetStepSize >> InMsg))
+    member this.StepSize
+        with get () = base.Get () stepSizeBinding
+        and set (value) = base.Set (value) stepSizeBinding
 
     member _.Reset = base.Get () (Binding.CmdT.set Counter.canReset (InMsg Counter.Reset))
 
diff --git a/src/Samples/Typed/SubModelSeq/App.xaml b/src/Samples/Typed/SubModelSeq/App.xaml
index 15d2324c..3ac76001 100644
--- a/src/Samples/Typed/SubModelSeq/App.xaml
+++ b/src/Samples/Typed/SubModelSeq/App.xaml
@@ -2,6 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-    </Application.Resources>
+  <Application.Resources>
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/App.xaml.cs b/src/Samples/Typed/SubModelSeq/App.xaml.cs
index ef8b5d41..62007d3c 100644
--- a/src/Samples/Typed/SubModelSeq/App.xaml.cs
+++ b/src/Samples/Typed/SubModelSeq/App.xaml.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace Elmish.WPF.Samples.SubModelSeq
+namespace Elmish.WPF.Samples.SubModelSeq;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/Counter.xaml.cs b/src/Samples/Typed/SubModelSeq/Counter.xaml.cs
index c03dd94d..efc8a4cf 100644
--- a/src/Samples/Typed/SubModelSeq/Counter.xaml.cs
+++ b/src/Samples/Typed/SubModelSeq/Counter.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows.Controls;
 
-namespace Elmish.WPF.Samples.SubModelSeq
+namespace Elmish.WPF.Samples.SubModelSeq;
+
+public partial class Counter : UserControl
 {
-    public partial class Counter : UserControl
+    public Counter()
     {
-        public Counter()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSeq/MainWindow.xaml b/src/Samples/Typed/SubModelSeq/MainWindow.xaml
index 584cea3b..52f387a3 100644
--- a/src/Samples/Typed/SubModelSeq/MainWindow.xaml
+++ b/src/Samples/Typed/SubModelSeq/MainWindow.xaml
@@ -25,7 +25,8 @@
           <DataTemplate>
             <Border BorderBrush="LightGray" BorderThickness="1" Margin="10,5" Padding="10">
               <StackPanel>
-                <TextBlock Text="{Binding CounterId, StringFormat='Counter ID: {0}'}" Margin="0,0,0,10" FontWeight="Bold" />
+                <TextBlock Text="{Binding CounterId, StringFormat='Counter ID: {0}'}" Margin="0,0,0,10"
+                           FontWeight="Bold" />
                 <local:Counter />
                 <Button Command="{Binding Remove}" Content="Remove" Width="100" Margin="0,10,0,0" />
               </StackPanel>
diff --git a/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs b/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs
index 4ea1fb9b..6af47816 100644
--- a/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs
+++ b/src/Samples/Typed/SubModelSeq/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Elmish.WPF.Samples.SubModelSeq
+namespace Elmish.WPF.Samples.SubModelSeq;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/Threading.Core/Program.fs b/src/Samples/Typed/Threading.Core/Program.fs
index dbd42cb5..e0a80a21 100644
--- a/src/Samples/Typed/Threading.Core/Program.fs
+++ b/src/Samples/Typed/Threading.Core/Program.fs
@@ -35,7 +35,10 @@ module Program =
         match msg with
         | IncrementPings -> m |> Pings.map ((+) 1), [ DelayThenIncrementPings ]
         | UpdateMessage message -> m |> Message.set message, []
-        | AppendPingsToMessage -> { m with Message = m.Message + string m.Pings }, []
+        | AppendPingsToMessage ->
+            { m with
+                Message = m.Message + string m.Pings },
+            []
 
     let toCmd =
         function
@@ -47,21 +50,25 @@ module Program =
 type ThreadingViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
+    let messageBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun m -> m.Message)
+        >> Binding.mapMsg UpdateMessage
+
     member _.Pings =
         base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Pings))
 
-    member _.Message =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun m -> m.Message)
-             >> Binding.mapMsg UpdateMessage)
+    member this.Message
+        with get () = base.Get () messageBinding
+        and set (value) = base.Set (value) messageBinding
 
-    member _.AppendPingsToMessage = base.Get () (Binding.CmdT.setAlways AppendPingsToMessage)
+    member _.AppendPingsToMessage =
+        base.Get () (Binding.CmdT.setAlways AppendPingsToMessage)
 
 
-let designVm = ThreadingViewModel(ViewModelArgs.simple { Pings = 2; Message = "Hello" })
+let designVm =
+    ThreadingViewModel(ViewModelArgs.simple { Pings = 2; Message = "Hello" })
 
 let main window =
 
diff --git a/src/Samples/Typed/Threading/MainWindow.xaml b/src/Samples/Typed/Threading/MainWindow.xaml
index 5da8eb49..af682a6f 100644
--- a/src/Samples/Typed/Threading/MainWindow.xaml
+++ b/src/Samples/Typed/Threading/MainWindow.xaml
@@ -3,10 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:vm="clr-namespace:Elmish.WPF.Samples.Threading;assembly=Threading.Core"
         mc:Ignorable="d"
-        Title="Threading" Height="450" Width="800"
-        >
+        Title="Threading" Height="450" Width="800">
   <Grid>
     <Grid.ColumnDefinitions>
       <ColumnDefinition Width="300" />
diff --git a/src/Samples/Typed/Threading/MainWindow.xaml.cs b/src/Samples/Typed/Threading/MainWindow.xaml.cs
index ef9d5138..8bf40eee 100644
--- a/src/Samples/Typed/Threading/MainWindow.xaml.cs
+++ b/src/Samples/Typed/Threading/MainWindow.xaml.cs
@@ -14,5 +14,4 @@ private void Button_Click(object sender, RoutedEventArgs e)
     {
         Task.Delay(5000).Wait();
     }
-
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs b/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs
index 66944420..6a8c1578 100644
--- a/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs
+++ b/src/Samples/Typed/UiBoundCmdParam.Core/Program.fs
@@ -25,23 +25,27 @@ let update msg m =
 type UiBoundCmdParamViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
 
-    member _.Numbers =
-        base.Get () (Binding.OneWayT.id >> Binding.addLazy (=) >> Binding.mapModel (fun m -> m.Numbers))
+    let limitBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun m -> float m.EnabledMaxLimit)
+        >> Binding.mapMsg (int >> SetLimit)
 
-    member _.Limit =
+    member _.Numbers =
         base.Get
             ()
-            (Binding.TwoWayT.id
+            (Binding.OneWayT.id
              >> Binding.addLazy (=)
-             >> Binding.mapModel (fun m -> float m.EnabledMaxLimit)
-             >> Binding.mapMsg (int >> SetLimit))
+             >> Binding.mapModel (fun m -> m.Numbers))
+
+    member this.Limit
+        with get () = base.Get () limitBinding
+        and set (value) = base.Set (value) limitBinding
 
     member _.Command =
         base.Get
             ()
-            (Binding.CmdT.id 
-                true 
-                (fun (p: obj) m -> not (isNull p) && p :?> int <= m.EnabledMaxLimit)
+            (Binding.CmdT.id true (fun (p: obj) m -> not (isNull p) && p :?> int <= m.EnabledMaxLimit)
              >> Binding.mapMsg (fun _ -> Command))
 
 let designVm = UiBoundCmdParamViewModel(ViewModelArgs.simple (init ()))
diff --git a/src/Samples/Typed/Validation.Core/Program.fs b/src/Samples/Typed/Validation.Core/Program.fs
index c1c656fa..cf760423 100644
--- a/src/Samples/Typed/Validation.Core/Program.fs
+++ b/src/Samples/Typed/Validation.Core/Program.fs
@@ -4,7 +4,6 @@ open System
 open System.Linq
 open Serilog
 open Serilog.Extensions.Logging
-open Elmish
 open Elmish.WPF
 
 module Result =
@@ -83,6 +82,20 @@ module Validation =
 type ValidationViewModel(args) =
     inherit ViewModelBase<Validation.Model, Validation.Msg>(args)
 
+    let valueBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Validation.Model) -> m.Value)
+        >> Binding.mapMsg Validation.NewValue
+        >> Binding.addValidation (fun m -> m.Value |> validateInt42 |> Result.Error.toList)
+
+    let passwordBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun (m: Validation.Model) -> m.Password)
+        >> Binding.mapMsg Validation.NewPassword
+        >> Binding.addValidation (fun m -> m.Password |> validatePassword)
+
     member _.UpdateCount =
         base.Get
             ()
@@ -91,23 +104,13 @@ type ValidationViewModel(args) =
              >> Binding.mapModel (fun (m: Validation.Model) -> m.UpdateCount)
              >> Binding.addValidation Validation.errorOnEven)
 
-    member _.Value =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Validation.Model) -> m.Value)
-             >> Binding.mapMsg Validation.NewValue
-             >> Binding.addValidation (fun m -> m.Value |> validateInt42 |> Result.Error.toList))
+    member this.Value
+        with get () = base.Get () valueBinding
+        and set (value) = base.Set (value) valueBinding
 
-    member _.Password =
-        base.Get
-            ()
-            (Binding.TwoWayT.id
-             >> Binding.addLazy (=)
-             >> Binding.mapModel (fun (m: Validation.Model) -> m.Password)
-             >> Binding.mapMsg Validation.NewPassword
-             >> Binding.addValidation (fun m -> m.Password |> validatePassword))
+    member this.Password
+        with get () = base.Get () passwordBinding
+        and set (value) = base.Set (value) passwordBinding
 
     member _.Submit = base.Get () (Binding.CmdT.set Validation.canSubmit Validation.Submit)
 
diff --git a/src/Samples/Typed/Validation/App.xaml b/src/Samples/Typed/Validation/App.xaml
index 5a7b5bc0..02720d2a 100644
--- a/src/Samples/Typed/Validation/App.xaml
+++ b/src/Samples/Typed/Validation/App.xaml
@@ -2,6 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-    </Application.Resources>
+  <Application.Resources>
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/App.xaml.cs b/src/Samples/Typed/Validation/App.xaml.cs
index f4caa2c4..c1cfb402 100644
--- a/src/Samples/Typed/Validation/App.xaml.cs
+++ b/src/Samples/Typed/Validation/App.xaml.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace Elmish.WPF.Samples.Validation
+namespace Elmish.WPF.Samples.Validation;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Typed/Validation/MainWindow.xaml b/src/Samples/Typed/Validation/MainWindow.xaml
index 2024d48f..74a8bc2c 100644
--- a/src/Samples/Typed/Validation/MainWindow.xaml
+++ b/src/Samples/Typed/Validation/MainWindow.xaml
@@ -35,7 +35,7 @@
   <StackPanel HorizontalAlignment="Center" Margin="0,25,0,0">
     <StackPanel Orientation="Horizontal">
       <TextBlock Text="Update count:         " />
-      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount}" Width="200"
+      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount, Mode=OneWay}" Width="200"
                Margin="0,5,0,25" />
     </StackPanel>
     <StackPanel Orientation="Horizontal">
diff --git a/src/Samples/Typed/Validation/MainWindow.xaml.cs b/src/Samples/Typed/Validation/MainWindow.xaml.cs
index faceea79..30a7f6a9 100644
--- a/src/Samples/Typed/Validation/MainWindow.xaml.cs
+++ b/src/Samples/Typed/Validation/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Elmish.WPF.Samples.Validation
+namespace Elmish.WPF.Samples.Validation;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file

From 5a480df790196d039b9e8333f8ca2543cda2f906 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Mon, 21 Jul 2025 10:48:03 +0200
Subject: [PATCH 14/18] Update documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update README.md to emphasize both Dynamic and Typed ViewModel approaches
Add comprehensive guidance on when to choose each binding approach
Revise getting started section with dual-path examples for both approaches
Add FAQ entries for approach selection and migration between Dynamic/Typed
Significantly expand REFERENCE.md statically-typed ViewModels section
Document proper TwoWay binding patterns for typed ViewModels (getter/setter)
Add new "Choosing Your Binding Approach" section with comparison table
Update all sample references to reflect new Dynamic/Typed folder organization
Add comprehensive examples for typed bindings, validation, and sub-models

This update ensures documentation accurately reflects the complete set of
typed samples and the reorganized project structure, providing users with
clear guidance on both binding approaches and migration paths.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 README.md    | 117 +++++++++++++++-----
 REFERENCE.md | 297 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 363 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 04041f2a..72f43c78 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,20 @@ WPF done the Elmish Way
 [![NuGet version](https://img.shields.io/nuget/v/Elmish.WPF.svg)](https://www.nuget.org/packages/Elmish.WPF) [![NuGet downloads](https://img.shields.io/nuget/dt/Elmish.WPF.svg)](https://www.nuget.org/packages/Elmish.WPF) [![Build status](https://github.com/elmish/Elmish.WPF/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/elmish/Elmish.WPF/actions/workflows/continuous_integration.yml)
 
 **The good parts of MVVM (the data bindings) with the simplicity and robustness of an MVU architecture for the rest of
-your app. Never write an overly-complex ViewModel class again!**
+your app. Choose between dynamic bindings for flexibility or statically-typed ViewModels for safety and tooling support!**
 
 ### Elevator pitch
 
 Elmish.WPF is a **production-ready** library that allows you to write WPF apps with the robust, simple, well-known, and
 battle-tested MVU architecture, while still allowing you to use all your XAML knowledge and tooling to create UIs.
 
-Some benefits of MVU you’ll get with Elmish.WPF include:
+**Two powerful approaches in one library:**
+- **Dynamic Bindings**: Flexible, functional approach with runtime binding definitions
+- **Statically-Typed ViewModels**: Compile-time safety with full IntelliSense and design-time support
+
+Choose **Dynamic Bindings** for rapid prototyping, simple apps, or when you prefer functional composition. Choose **Statically-Typed ViewModels** for large applications, when working with designers, or when you want compile-time validation and superior tooling support.
+
+Some benefits of MVU you'll get with Elmish.WPF include:
 
 * Simple-to-understand, unidirectional data flow
 * Single source of truth for all the state in your app
@@ -51,7 +57,7 @@ Recommended resources
   Elmish.WPF's bindings and library functions for modifying bindings.
 * The [Elmish docs site](https://elmish.github.io/elmish) also explains the general MVU architecture and principles.
 * The [Elmish.WPF samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) provide many concrete usage
-  examples.
+  examples, organized into [Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic) and [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed) approaches.
 * Blog posts:
     * [Getting Elmish in .NET with Elmish.WPF](https://medium.com/swlh/getting-elmish-in-net-with-elmish-wpf-cd44e3eddc27) ("
       getting started" guide by Matt Eland)
@@ -71,8 +77,11 @@ Recommended resources
 Getting started with Elmish.WPF
 -------------------------------
 
-See the [SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) sample for a very simple app. The
-central points are (assuming up-to-date VS2019):
+Elmish.WPF offers two approaches for creating bindings. Choose the one that best fits your needs:
+
+**Quick Start**: See the [Dynamic SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/SingleCounter) or [Typed SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/SingleCounter) samples for very simple apps demonstrating each approach.
+
+The central points are (assuming up-to-date Visual Studio):
 
 1. Create an F# Class Library. If targeting .NET 5 or .NET Core, the project file should look like this:
 
@@ -126,11 +135,15 @@ central points are (assuming up-to-date VS2019):
      | SetStepSize x -> { m with StepSize = x }
    ```
 
-6. Define the “view” function using the `Bindings` module. This is the central public API of Elmish.WPF.
+6. Define your bindings using either the **Dynamic** or **Typed** approach:
+
+### Approach A: Dynamic Bindings
+
+Define the "view" function using the `Bindings` module. This is the central public API of Elmish.WPF.
 
    Normally in Elm/Elmish this function is called `view` and would take a model and a dispatch function (to dispatch new
    messages to the update loop) and return the UI (e.g. a HTML DOM to be rendered), but in Elmish.WPF this function is
-   in general only run once and simply sets up bindings that XAML-defined views can use. Therefore, let’s call it
+   in general only run once and simply sets up bindings that XAML-defined views can use. Therefore, let's call it
    `bindings` instead of `view`.
 
    ```F#
@@ -150,45 +163,59 @@ central points are (assuming up-to-date VS2019):
    The strings identify the binding names to be used in the XAML views. The Binding module has many functions to create
    various types of bindings.
 
-Alternatively, use statically-typed view models in order to get better IDE support in the XAML.
+### Approach B: Statically-Typed ViewModels
+
+Use statically-typed view models to get better IDE support in XAML, compile-time safety, and superior design-time experience.
 
    ```f#
    open Elmish.WPF
 
+   [<AllowNullLiteral>]
    type CounterViewModel(args) =
      inherit ViewModelBase<Model, Msg>(args)
 
-     member _.CounterValue = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
-     member _.Increment = base.Get() (Binding.CmdT.setAlways Counter.Increment)
-     member _.Decrement = base.Get() (Binding.CmdT.setAlways Counter.Decrement)
-     member _.StepSize
-       with get() = base.Get() (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.StepSize))
-       and set(v) = base.Set(v) (Binding.OneWayToSourceT.id >> Binding.mapMsg Counter.Msg.SetStepSize)
+     member _.CounterValue = 
+       base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
+     
+     member _.Increment = 
+       base.Get () (Binding.CmdT.setAlways Increment)
+     
+     member _.Decrement = 
+       base.Get () (Binding.CmdT.setAlways Decrement)
+     
+     let stepSizeBinding =
+       Binding.TwoWayT.id
+       >> Binding.mapModel (fun m -> float m.StepSize)
+       >> Binding.mapMsg (int >> SetStepSize)
+
+     member this.StepSize
+       with get () = base.Get () stepSizeBinding
+       and set (value) = base.Set (value) stepSizeBinding
    ```
 
-7. Create a function that accepts the app’s main window (to be created) and configures and starts the Elmish loop for
-   the window with your `init`, `update` and `bindings`:
+7. Create a function that configures and starts the Elmish loop:
+
+### For Dynamic Bindings:
 
    ```F#
    open Elmish.WPF
 
    let main window =
-     Program.mkSimple init update bindings
-     |> Program.runElmishLoop window
+     WpfProgram.mkSimple init update bindings
+     |> WpfProgram.startElmishLoop window
    ```
 
-   Alternatively, use a statically-typed view model at the top level.
+### For Typed ViewModels:
 
    ```F#
    open Elmish.WPF
 
    let main window =
-     Program.mkSimpleT init update CounterViewModel
-     |> Program.runElmishLoop window
+     WpfProgram.mkSimpleT init update CounterViewModel
+     |> WpfProgram.startElmishLoop window
    ```
 
-   In the code above, `Program.runElmishLoop` will set the window’s `DataContext` to the specified bindings and start
-   the Elmish dispatch loop for the window.
+   In both cases, `WpfProgram.startElmishLoop` will set the window's `DataContext` and start the Elmish dispatch loop.
 
 8. Create a WPF app project (using the Visual Studio template called `WPF App (.NET)`). This will be your entry point
    and contain the XAML views. Add a reference to the F# project, and make the following changes in the `csproj` file:
@@ -243,14 +270,48 @@ Further resources:
 * The [Elmish.WPF tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) provides information on
   general MVU/Elmish concepts and how they apply to Elmish.WPF, as well as the various Elmish.WPF bindings.
 * The [samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) are complete, working mini-apps
-  demonstrating selected aspects of Elmish.WPF.
+  demonstrating selected aspects of Elmish.WPF. Browse the [Dynamic samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic) for traditional functional bindings or the [Typed samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed) for statically-typed ViewModels.
 * If you'd like to contribute, please read and follow
   the [Contributor guidelines](https://github.com/elmish/Elmish.WPF/blob/master/.github/CONTRIBUTING.md).
 
 FAQ
 ---
 
-#### Static views in MVU? Isn’t that just a half-baked solution that only exists due to a lack of better alternatives?
+#### Should I use Dynamic Bindings or Statically-Typed ViewModels?
+
+**Use Dynamic Bindings when:**
+- Rapid prototyping or building simple applications
+- You prefer functional composition over object-oriented patterns
+- Working alone or in small teams familiar with F#
+- You need maximum flexibility in binding definitions
+- Building MVU-style applications where the view layer should be minimal
+
+**Use Statically-Typed ViewModels when:**
+- Building large, complex applications
+- Working with designers who need design-time data and IntelliSense
+- You want compile-time validation of binding names and types
+- Integrating with existing WPF/MVVM codebases
+- Multiple developers need clear contracts between view and model layers
+- You require superior tooling support in Visual Studio
+
+Both approaches use the same underlying MVU architecture and can coexist in the same application.
+
+#### How do I migrate between Dynamic and Typed approaches?
+
+**Dynamic to Typed:**
+1. Create a class inheriting from `ViewModelBase<'model, 'msg>`
+2. Convert each binding in your `bindings()` function to a property
+3. Use `Binding.OneWayT`, `Binding.CmdT`, etc. instead of the non-T variants
+4. For TwoWay bindings, create a binding variable and implement getter/setter properties
+5. Update your program creation to use `WpfProgram.mkSimpleT`
+
+**Typed to Dynamic:**
+1. Extract all properties into a `bindings()` function returning `Binding<'model, 'msg> list`
+2. Convert property names to string-keyed bindings
+3. Use `Binding.oneWay`, `Binding.cmd`, etc. instead of the T variants
+4. Update your program creation to use `WpfProgram.mkSimple`
+
+#### Static views in MVU? Isn't that just a half-baked solution that only exists due to a lack of better alternatives?
 
 Not at all! 🙂
 
@@ -312,7 +373,7 @@ actual commands elsewhere:
   `Program.mkProgramWpfWithCmdMsg` that does this for you (but there’s no magic going on – it’s really easy to do
   yourself).
 
-The [FileDialogsCmdMsg sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) demonstrates this approach.
+The [FileDialogsCmdMsg sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/FileDialogsCmdMsg) demonstrates this approach.
 For more information, see
 the [Fabulous documentation](https://fsprojects.github.io/Fabulous/Fabulous.XamarinForms/update.html#replacing-commands-with-command-messages-for-better-testability).
 For reference, here
@@ -396,14 +457,14 @@ issues with using `Window` as the type).
 Sure! Just use `Binding.subModelWin`. It works like `Binding.subModel`, but has a `WindowState` wrapper around the
 returned model to control whether the window is closed, hidden, or visible. You can use both modal and non-modal
 windows/dialogs, and everything is a part of the Elmish core loop. Check out
-the [NewWindow sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples).
+the [NewWindow sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/NewWindow) ([Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/NewWindow) | [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/NewWindow)).
 
 Note that if you use `App.xaml` startup, you may want to set `ShutdownMode="OnMainWindowClose"` in `App.xaml` if that’s
 the desired behavior.
 
 #### Can I bind to events and use behaviors?
 
-Sure! Check out the [EventBindingsAndBehaviors sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples).
+Sure! Check out the [EventBindingsAndBehaviors sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/EventBindingsAndBehaviors) ([Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/EventBindingsAndBehaviors) | [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/EventBindingsAndBehaviors)).
 Note that you have to install the NuGet package `Microsoft.Xaml.Behaviors.Wpf`.
 
 #### How can I control logging?
diff --git a/REFERENCE.md b/REFERENCE.md
index 88248ac1..8fe5f7ae 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -30,11 +30,19 @@ Table of contents
     + [Mapping bindings](#mapping-bindings)
         - [Example use of `mapModel` and `mapMsg`](#example-use-of-mapModel-and-mapMsg)
         - [Theory behind `mapModel` and `mapMsg`](#theory-behind-mapModel-and-mapMsg)
+* [Choosing Your Binding Approach](#choosing-your-binding-approach)
+    + [Dynamic Bindings vs Statically-Typed ViewModels](#dynamic-bindings-vs-statically-typed-viewmodels)
+    + [Migration Between Approaches](#migration-between-approaches)
 * [Statically-typed view models](#statically-typed-view-models)
     + [Inherit from `ViewModelBase<'model, 'msg>`](#inherit-from-viewmodelbasemodel-msg)
+    + [Advantages of Statically-Typed ViewModels](#advantages-of-statically-typed-viewmodels)
+    + [Basic Typed ViewModel Structure](#basic-typed-viewmodel-structure)
     + [Typed Bindings](#typed-bindings)
         - [Typed One-way Bindings](#typed-one-way-bindings)
+        - [Typed TwoWay Bindings](#typed-twoway-bindings)
+        - [Typed TwoWay Bindings with Validation](#typed-twoway-bindings-with-validation)
         - [Typed SubModel Bindings](#typed-submodel-bindings)
+        - [Typed SubModel Sequence Bindings](#typed-submodel-sequence-bindings)
         - [Typed WpfProgram Bindings](#typed-wpfprogram-bindings)
         - [Mixing and matching bindings](#mixing-and-matching-bindings)
 
@@ -61,8 +69,7 @@ debouncing/throttling etc.
 
 ### One-way bindings
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
-and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 One-way bindings are used when you want to bind to a simple value.
 
@@ -91,8 +98,7 @@ the inner value.
 
 ### Two-way bindings
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
-and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 Two-way bindings are commonly used for any kind of input (textboxes, checkboxes, sliders, etc.). The two-way bindings
 accept two functions: A function `get: 'model -> 'a` just like the one-way binding, and a function
@@ -146,7 +152,7 @@ is used in both `get` and `set`. Elmish.WPF will convert both ways between a pos
 
 #### Using validation with two-way bindings
 
-*Relevant sample: Validation - ([XAML views](src/Samples/Validation) and [F# core](src/Samples/Validation.Core))*
+*Relevant sample: Validation - ([Dynamic](src/Samples/Dynamic/Validation) | [Typed](src/Samples/Typed/Validation))*
 
 You might want to display validation errors when the input is invalid. The best way to do this in WPF is through
 `INotifyDataErrorInfo`. Elmish.WPF supports this directly through the `twoWayValidate` bindings. In addition to `get`
@@ -163,8 +169,7 @@ There are also variants of the two-way validating bindings for option-wrapped va
 
 ### Command bindings
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
-and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 Command bindings are used whenever you use `Command`/`CommandParameter` in XAML, such as for button clicks.
 
@@ -195,8 +200,7 @@ model-accepting function). The above can therefore be written like this:
 
 #### Conditional commands (where you control `CanExecute`)
 
-*Relevant sample: SingleCounter - ([XAML views](src/Samples/SingleCounter)
-and [F# core](src/Samples/SingleCounter.Core))*
+*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 A command may not always be executable. As you might know, WPF’s `ICommand` interface contains a `CanExecute` method
 that, if `false`, will cause WPF to disable the bound control (e.g. the button).
@@ -221,8 +225,7 @@ There are several ways to indicate that a command can‘t execute. The `cmdIf` b
 
 #### Using the `CommandParameter`
 
-*Relevant sample: UiBoundCmdParam - ([XAML views](src/Samples/UiBoundCmdParam)
-and [F# core](src/Samples/UiBoundCmdParam.Core))*
+*Relevant sample: UiBoundCmdParam - ([Dynamic](src/Samples/Dynamic/UiBoundCmdParam) | [Typed](src/Samples/Typed/UiBoundCmdParam))*
 
 There may be times you need to use the XAML `CommandParameter` property. You then need to use Elmish.WPF’s `cmdParam`
 binding, which works exactly like `cmd` but where `exec` function accepts the command parameter as its first parameter.
@@ -231,7 +234,7 @@ There is also `cmdParamIf` which combines `cmdParam` and `cmdIf`, allowing you t
 
 ### Sub-model bindings
 
-*Relevant sample: SubModel - ([XAML views](src/Samples/SubModel) and [F# core](src/Samples/SubModel.Core))*
+*Relevant sample: SubModel - ([Dynamic](src/Samples/Dynamic/SubModel) | [Typed](src/Samples/Typed/SubModelStatic))*
 
 Sub-model bindings are used when you want to bind to a complex object that has its own bindings. In MVVM, this happens
 when one of your view-model properties is another view model with its own properties the UI can bind to.
@@ -369,7 +372,7 @@ and scaling” section, such separation will often do more harm than good.
 
 #### Optional and “sticky” sub-model bindings
 
-*Relevant sample: SubModelOpt - ([XAML views](src/Samples/SubModelOpt) and [F# core](src/Samples/SubModelOpt.Core))*
+*Relevant sample: SubModelOpt - ([Dynamic](src/Samples/Dynamic/SubModelOpt) | [Typed](src/Samples/Typed/SubModelOpt))*
 
 You can also use the `subModelOpt` binding. The signature is the same as the variants described above, except that
 `getSubModel` returns `'subModel option`. The UI will receive `null` when the sub-model is `None`.
@@ -381,7 +384,7 @@ at the start of the animation, which may look weird.
 
 ### Sub-model window bindings
 
-*Relevant sample: NewWindow - ([XAML views](src/Samples/NewWindow) and [F# core](src/Samples/NewWindow.Core))*
+*Relevant sample: NewWindow - ([Dynamic](src/Samples/Dynamic/NewWindow) | [Typed](src/Samples/Typed/NewWindow))*
 
 The `subModelWin` binding is a variant of `subModelOpt` that allows you to control the opening/closing/hiding of new
 windows. It has the same overloads as `subModel` and `subModelOpt`, with two key differences: First, the sub-model is
@@ -421,7 +424,7 @@ Again, check out the `NewWindow` sample to see `subModelWin` in action.
 
 ### Sub-model sequence bindings
 
-*Relevant sample: SubModelSeq - ([XAML views](src/Samples/SubModelSeq) and [F# core](src/Samples/SubModelSeq.Core))*
+*Relevant sample: SubModelSeq - ([Dynamic](src/Samples/Dynamic/SubModelSeq) | [Typed](src/Samples/Typed/SubModelSeq))*
 
 If you understand `subModel`, then `subModelSeq` isn’t much more complex. It has similar overloads, but instead of
 returning a single sub-model, you return `#seq<'subModel>`. Furthermore, all overloads have an additional parameter
@@ -443,8 +446,7 @@ There are two special bindings not yet covered.
 
 #### `subModelSelectedItem`
 
-*Relevant sample: SubModelSelectedItem - ([XAML views](src/Samples/SubModelSelectedItem)
-and [F# core](src/Samples/SubModelSelectedItem.Core))*
+*Relevant sample: SubModelSelectedItem - ([Dynamic](src/Samples/Dynamic/SubModelSelectedItem) | [Typed](src/Samples/Typed/SubModelSelectedItem))*
 
 The section on model normalization made it clear that it’s better to use IDs than complex objects in messages. This
 means that for bindings to the selected value of a `ListBox` or similar, you’ll likely have better luck using
@@ -478,7 +480,7 @@ following:
 
 #### `oneWaySeq`
 
-*Relevant sample: OneWaySeq - ([XAML views](src/Samples/OneWaySeq) and [F# core](src/Samples/OneWaySeq.Core))*
+*Relevant sample: OneWaySeq - ([Dynamic](src/Samples/Dynamic/OneWaySeq) | [Typed](src/Samples/Typed/OneWaySeq))*
 
 In some cases, you might want to have a one-way binding not to a single, simple value, but to a potentially large
 collection of simple values. If you use `oneWay` for this, the entire list will be replaced and re-rendered each time
@@ -610,6 +612,112 @@ that
 - it is a contravariant functor in `'model` with `mapModel` as the corresponding mapping function for this functor and
 - it is a covariant functor in `'msg` with `mapMsg` as the corresponding mapping function for this functor.
 
+Choosing Your Binding Approach
+------------------------------
+
+Elmish.WPF offers two approaches for creating bindings between your F# model and WPF views. Understanding when to use each approach will help you make the best choice for your application.
+
+### Dynamic Bindings vs Statically-Typed ViewModels
+
+| Aspect | Dynamic Bindings | Statically-Typed ViewModels |
+|--------|------------------|----------------------------|
+| **Syntax** | Functional, list-based | Object-oriented, property-based |
+| **Type Safety** | Runtime binding resolution | Compile-time binding validation |
+| **XAML Support** | Basic IntelliSense | Full IntelliSense and auto-completion |
+| **Design-time** | Limited design-time support | Rich design-time experience |
+| **Performance** | Good | Slightly better (direct property access) |
+| **Flexibility** | Very flexible, dynamic composition | More structured, explicit definitions |
+| **Learning Curve** | Familiar to functional programmers | Familiar to WPF/C# developers |
+| **Refactoring** | Manual updates needed | Automatic refactoring support |
+
+### When to Choose Dynamic Bindings
+
+Choose **dynamic bindings** when:
+
+- **Rapid prototyping**: Quick iteration and experimentation
+- **Simple applications**: Small apps with few UI interactions  
+- **Functional preference**: You prefer functional composition over OOP
+- **Dynamic scenarios**: Bindings need to be created or modified at runtime
+- **MVU purists**: You want minimal view layer complexity
+- **Small teams**: Working alone or with F#-experienced developers
+
+### When to Choose Statically-Typed ViewModels
+
+Choose **statically-typed ViewModels** when:
+
+- **Large applications**: Complex apps with many views and interactions
+- **Design collaboration**: Working with UI designers who need design-time data
+- **Type safety**: Compile-time validation is critical
+- **XAML-heavy development**: Extensive use of XAML features and tooling
+- **Mixed teams**: Developers with varying F# experience levels
+- **Legacy integration**: Integrating with existing WPF/MVVM codebases
+- **Third-party tools**: Using tools that expect traditional ViewModels
+
+### Migration Between Approaches
+
+Both approaches use the same underlying MVU architecture, making migration straightforward:
+
+#### From Dynamic to Typed
+
+1. **Create ViewModel class**:
+   ```F#
+   [<AllowNullLiteral>]
+   type MyViewModel(args) =
+       inherit ViewModelBase<Model, Msg>(args)
+       new() = MyViewModel(initialModel |> ViewModelArgs.simple)
+   ```
+
+2. **Convert bindings to properties**:
+   ```F#
+   // From: "CounterValue" |> Binding.oneWay (fun m -> m.Count)
+   // To:
+   member _.CounterValue = 
+       base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
+   ```
+
+3. **Handle TwoWay bindings**:
+   ```F#
+   // From: "StepSize" |> Binding.twoWay((fun m -> float m.StepSize), int >> SetStepSize)
+   // To:
+   let stepSizeBinding =
+       Binding.TwoWayT.id
+       >> Binding.mapModel (fun m -> float m.StepSize)
+       >> Binding.mapMsg (int >> SetStepSize)
+   
+   member this.StepSize
+       with get () = base.Get () stepSizeBinding
+       and set (value) = base.Set (value) stepSizeBinding
+   ```
+
+4. **Update program creation**:
+   ```F#
+   // From: WpfProgram.mkSimple init update bindings
+   // To:   WpfProgram.mkSimpleT init update MyViewModel
+   ```
+
+#### From Typed to Dynamic
+
+1. **Extract properties to binding list**:
+   ```F#
+   let bindings () = [
+       "CounterValue" |> Binding.oneWay (fun m -> m.Count)
+       "StepSize" |> Binding.twoWay((fun m -> float m.StepSize), int >> SetStepSize)
+   ]
+   ```
+
+2. **Update program creation**:
+   ```F#
+   // From: WpfProgram.mkSimpleT init update MyViewModel  
+   // To:   WpfProgram.mkSimple init update bindings
+   ```
+
+### Mixed Approach
+
+You can use both approaches within the same application:
+- Use dynamic bindings for simple, frequently-changing views
+- Use typed ViewModels for complex, stable views
+- Convert between approaches as requirements evolve
+
 Statically-Typed View Models
 ----------------------------
 
@@ -635,6 +743,40 @@ type [<AllowNullLiteral>] CounterViewModel (args) =
   member _.Reset = base.Get() (Binding.CmdT.set Counter.canReset Counter.Reset)
 ```
 
+### Advantages of Statically-Typed ViewModels
+
+Statically-typed ViewModels provide several benefits over dynamic bindings:
+
+- **Compile-time safety**: XAML binding names are validated at compile time
+- **IntelliSense support**: Full auto-completion in XAML editors
+- **Design-time data**: Rich design-time experience in Visual Studio and Blend
+- **Refactoring support**: Reliable refactoring across view and view model
+- **Type safety**: Strongly-typed property access eliminates runtime binding errors
+- **Performance**: Slightly better performance due to direct property access
+
+### Basic Typed ViewModel Structure
+
+A typical typed ViewModel follows this pattern:
+
+```F#
+[<AllowNullLiteral>]
+type MyViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+    
+    // Default constructor for design-time support
+    new() = MyViewModel(initialModel |> ViewModelArgs.simple)
+    
+    // OneWay properties
+    member _.SomeValue = 
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.SomeValue))
+    
+    // Command properties  
+    member _.SomeCommand = 
+        base.Get () (Binding.CmdT.setAlways SomeMessage)
+    
+    // TwoWay properties (see detailed examples below)
+```
+
 ### Typed Bindings
 
 When creating a list of bindings, the output type of each property must be boxed (to `obj`) in order to insert them into
@@ -646,19 +788,128 @@ set of bindings (denoted with the `T` suffix on the function or the containing m
 These bindings work very similarly to their non-`T` counterparts, except they make exclusive use of the composable api.
 
 - `Binding.OneWayT.id`
-- `Binding.OneWayToSource.id`
+- `Binding.OneWayToSourceT.id`
 - `Binding.CmdT.setAlways`
 
+Example usage:
+
+```F#
+// Simple one-way binding
+member _.CounterValue = 
+    base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
+
+// One-way binding with lazy evaluation
+member _.ExpensiveCalculation = 
+    base.Get () (Binding.OneWayT.id 
+                >> Binding.addLazy (=) 
+                >> Binding.mapModel calculateExpensiveValue)
+
+// Command binding
+member _.IncrementCommand = 
+    base.Get () (Binding.CmdT.setAlways Increment)
+
+// Conditional command binding
+member _.ResetCommand = 
+    base.Get () (Binding.CmdT.set (fun m -> m.Count <> 0) Reset)
+```
+
+#### Typed TwoWay Bindings
+
+TwoWay bindings in typed ViewModels require a specific pattern with getter and setter properties. This is crucial for proper WPF data binding:
+
+```F#
+[<AllowNullLiteral>]
+type CounterViewModel(args) =
+    inherit ViewModelBase<Model, Msg>(args)
+    
+    // Define the binding pipeline as a let-bound value
+    let stepSizeBinding =
+        Binding.TwoWayT.id
+        >> Binding.addLazy (=)
+        >> Binding.mapModel (fun m -> float m.StepSize)  // Convert from model type
+        >> Binding.mapMsg (int >> SetStepSize)           // Convert to message type
+    
+    // Implement property with explicit getter and setter
+    member this.StepSize
+        with get () = base.Get () stepSizeBinding
+        and set (value) = base.Set (value) stepSizeBinding
+```
+
+**Important**: The binding variable (`stepSizeBinding`) must be defined as a `let` binding inside the class, and both `get()` and `set()` must be implemented for TwoWay bindings to work correctly.
+
+**Type Conversion**: Notice how we convert between model types (`int`) and WPF types (`float`) in the binding pipeline. This is common when binding to controls like `Slider` that use `float` values.
+
+#### Typed TwoWay Bindings with Validation
+
+You can add validation to TwoWay bindings in typed ViewModels:
+
+```F#
+let emailBinding =
+    Binding.TwoWayT.id
+    >> Binding.addLazy (=)
+    >> Binding.mapModel (fun m -> m.Email)
+    >> Binding.mapMsg SetEmail
+    >> Binding.addValidation (fun m -> 
+        if String.IsNullOrEmpty(m.Email) then ["Email is required"]
+        elif not (m.Email.Contains("@")) then ["Invalid email format"]
+        else [])
+
+member this.Email
+    with get () = base.Get () emailBinding
+    and set (value) = base.Set (value) emailBinding
+```
+
 #### Typed SubModel Bindings
 
 You can create strongly-typed SubModels in much the same way as you can create normal SubModels - simply replace the
 `Binding<'model, 'msg> list` with the constructor for a type that implements `ViewModelBase<'model, 'msg>(args)` and
 takes in that `args` parameter, and use one of the following functions to create the binding:
 
-- `Binding.SubModelT.req`
-- `Binding.SubModelSeqUnkeyedT.id`
-- `Binding.SubModelSeqKeyedT.id`
-- `Binding.SubModelWinT.id`
+- `Binding.SubModelT.req` - Required sub-model
+- `Binding.SubModelT.opt` - Optional sub-model  
+- `Binding.SubModelSeqUnkeyedT.id` - Collection without keys
+- `Binding.SubModelSeqKeyedT.id` - Collection with keys for efficient updates
+- `Binding.SubModelWinT.id` - Sub-model controlling window state
+
+Example of typed sub-model binding:
+
+```F#
+// Child ViewModel
+[<AllowNullLiteral>]
+type CounterViewModel(args) =
+    inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
+    
+    member _.Count = 
+        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
+    
+    member _.Increment = 
+        base.Get () (Binding.CmdT.setAlways Counter.Increment)
+
+// Parent ViewModel
+[<AllowNullLiteral>]  
+type MainViewModel(args) =
+    inherit ViewModelBase<App.Model, App.Msg>(args)
+    
+    member _.Counter = 
+        base.Get () (Binding.SubModelT.req CounterViewModel
+                    >> Binding.mapModel (fun m -> m.Counter)  
+                    >> Binding.mapMsg App.CounterMsg)
+```
+
+#### Typed SubModel Sequence Bindings
+
+For collections of sub-models, use `SubModelSeqKeyedT.id`:
+
+```F#
+[<AllowNullLiteral>]
+type CounterListViewModel(args) =
+    inherit ViewModelBase<CounterList.Model, CounterList.Msg>(args)
+    
+    member _.Counters = 
+        base.Get () (Binding.SubModelSeqKeyedT.id CounterViewModel (fun m -> m.Id)
+                    >> Binding.mapModel (fun m -> m.Counters)
+                    >> Binding.mapMsg (fun (id, msg) -> CounterMsg(id, msg)))
+```
 
 #### Typed WpfProgram Bindings
 

From 3d76eaae89efc0d131f81b9f4a314dca98bbe322 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Wed, 23 Jul 2025 18:09:33 +0200
Subject: [PATCH 15/18] Add typed navigation sample

Add a sample how to create a simple module based navigation using typed
view models.
Fix solution file structure.
---
 Elmish.WPF.sln                                |  80 ++++++---
 Elmish.WPF.slnx                               |   2 +
 src/Samples/Typed/Navigation.Core/Library.fs  | 166 ++++++++++++++++++
 .../Navigation.Core/Navigation.Core.fsproj    |  23 +++
 src/Samples/Typed/Navigation/App.xaml         |   8 +
 src/Samples/Typed/Navigation/App.xaml.cs      |  17 ++
 src/Samples/Typed/Navigation/AssemblyInfo.cs  |  10 ++
 .../Typed/Navigation/CustomerView.xaml        |  17 ++
 .../Typed/Navigation/CustomerView.xaml.cs     |  11 ++
 .../Typed/Navigation/DashboardView.xaml       |  17 ++
 .../Typed/Navigation/DashboardView.xaml.cs    |  11 ++
 src/Samples/Typed/Navigation/MainWindow.xaml  |  38 ++++
 .../Typed/Navigation/MainWindow.xaml.cs       |  23 +++
 .../Typed/Navigation/Navigation.csproj        |  15 ++
 14 files changed, 410 insertions(+), 28 deletions(-)
 create mode 100644 src/Samples/Typed/Navigation.Core/Library.fs
 create mode 100644 src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
 create mode 100644 src/Samples/Typed/Navigation/App.xaml
 create mode 100644 src/Samples/Typed/Navigation/App.xaml.cs
 create mode 100644 src/Samples/Typed/Navigation/AssemblyInfo.cs
 create mode 100644 src/Samples/Typed/Navigation/CustomerView.xaml
 create mode 100644 src/Samples/Typed/Navigation/CustomerView.xaml.cs
 create mode 100644 src/Samples/Typed/Navigation/DashboardView.xaml
 create mode 100644 src/Samples/Typed/Navigation/DashboardView.xaml.cs
 create mode 100644 src/Samples/Typed/Navigation/MainWindow.xaml
 create mode 100644 src/Samples/Typed/Navigation/MainWindow.xaml.cs
 create mode 100644 src/Samples/Typed/Navigation/Navigation.csproj

diff --git a/Elmish.WPF.sln b/Elmish.WPF.sln
index a790a7b7..3a2cf116 100644
--- a/Elmish.WPF.sln
+++ b/Elmish.WPF.sln
@@ -87,8 +87,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelStatic", "src\Sampl
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelStatic.Core", "src\Samples\Typed\SubModelStatic.Core\SubModelStatic.Core.fsproj", "{A7BA896C-1D7E-4336-BE50-032BF8E62D81}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typed Samples", "Typed Samples", "{D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SingleCounter.Core", "src\Samples\Typed\SingleCounter.Core\SingleCounter.Core.fsproj", "{F964D761-6542-4A3C-8ADC-41F5B8F77529}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SingleCounter", "src\Samples\Typed\SingleCounter\SingleCounter.csproj", "{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9}"
@@ -133,14 +131,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Threading.Core", "src\Sampl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Threading", "src\Samples\Typed\Threading\Threading.csproj", "{E6476EE0-71CA-4E5D-BE05-E57825E8AECB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SamplesTyped", "SamplesTyped", "{4CA4C854-E741-1F89-40C8-44936FD249BC}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Multiselect.Core", "src\Samples\Typed\Multiselect.Core\Multiselect.Core.fsproj", "{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Multiselect", "src\Samples\Typed\Multiselect\Multiselect.csproj", "{20D9470B-F39E-4E67-A00D-9714D6E857DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typed", "Typed", "{66D998A7-9C00-98D2-A5B4-91D444794DB6}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SubModelSelectedItem.Core", "src\Samples\Typed\SubModelSelectedItem.Core\SubModelSelectedItem.Core.fsproj", "{5D54DD79-59AA-4C85-8ECA-CAC59D86F251}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubModelSelectedItem", "src\Samples\Typed\SubModelSelectedItem\SubModelSelectedItem.csproj", "{F10A1DEA-545F-4C9F-AFA1-A115726BD415}"
@@ -153,6 +147,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Capabilities.Core", "src\Sa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Capabilities", "src\Samples\Typed\Capabilities\Capabilities.csproj", "{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Navigation", "src\Samples\Typed\Navigation\Navigation.csproj", "{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Navigation.Core", "src\Samples\Typed\Navigation.Core\Navigation.Core.fsproj", "{46397A4D-287C-410E-BDE9-1F09D7E64EF0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -967,6 +965,30 @@ Global
 		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x64.Build.0 = Release|Any CPU
 		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x86.ActiveCfg = Release|Any CPU
 		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8}.Release|x86.Build.0 = Release|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Debug|x86.Build.0 = Debug|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Release|x64.Build.0 = Release|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0}.Release|x86.Build.0 = Release|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Debug|x64.Build.0 = Debug|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Debug|x86.Build.0 = Debug|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x64.ActiveCfg = Release|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x64.Build.0 = Release|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x86.ActiveCfg = Release|Any CPU
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1012,20 +1034,6 @@ Global
 		{1740D47D-DA94-6415-017E-48203BA1C52C} = {D1B4CF99-7947-DD6C-81D0-5B5B3989814C}
 		{2A113076-21F0-4F11-A1CF-D0E4A1D14503} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{A7BA896C-1D7E-4336-BE50-032BF8E62D81} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{F964D761-6542-4A3C-8ADC-41F5B8F77529} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{84AF37C1-52A8-4F3F-8F2C-E7394E789523} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{75110CC0-5A94-4491-BA7E-234ACC39106D} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{A57D4155-3F27-4BDA-900E-1A39B022BE00} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{86E04393-86E7-4BBF-A9EF-9433B91E4988} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{435B3E59-C5B2-412A-86DC-795F1E52C223} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
-		{03FA4F94-962D-4324-B71E-D36E638D13D7} = {D7ABC870-FF0D-D4D3-9CFF-039FA9E62307}
 		{197B01F2-1974-46A1-9C40-7303E405BFA7} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED} = {1740D47D-DA94-6415-017E-48203BA1C52C}
@@ -1034,13 +1042,29 @@ Global
 		{BB30719A-3461-493E-972F-F6CEF534163E} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8} = {4CA4C854-E741-1F89-40C8-44936FD249BC}
-		{20D9470B-F39E-4E67-A00D-9714D6E857DE} = {4CA4C854-E741-1F89-40C8-44936FD249BC}
-		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
-		{F10A1DEA-545F-4C9F-AFA1-A115726BD415} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
-		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
-		{565FC442-5E49-42AD-AC33-14AD14E11961} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
-		{F6BB74C6-971A-44D7-BC10-3B37B74DE264} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
-		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8} = {66D998A7-9C00-98D2-A5B4-91D444794DB6}
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{565FC442-5E49-42AD-AC33-14AD14E11961} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{435B3E59-C5B2-412A-86DC-795F1E52C223} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{75110CC0-5A94-4491-BA7E-234ACC39106D} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{03FA4F94-962D-4324-B71E-D36E638D13D7} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{20D9470B-F39E-4E67-A00D-9714D6E857DE} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 	EndGlobalSection
 EndGlobal
diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 66a9382e..c6ad24d8 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -57,6 +57,8 @@
     <Project Path="src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
     <Project Path="src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj" />
     <Project Path="src/Samples/Typed/Multiselect/Multiselect.csproj" />
+    <Project Path="src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj" />
+    <Project Path="src/Samples/Typed/Navigation/Navigation.csproj" />
     <Project Path="src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj" />
     <Project Path="src/Samples/Typed/NewWindow/NewWindow.csproj" />
     <Project Path="src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
diff --git a/src/Samples/Typed/Navigation.Core/Library.fs b/src/Samples/Typed/Navigation.Core/Library.fs
new file mode 100644
index 00000000..07b17bda
--- /dev/null
+++ b/src/Samples/Typed/Navigation.Core/Library.fs
@@ -0,0 +1,166 @@
+namespace Navigation.Core
+
+
+open System
+open Elmish
+open Elmish.WPF
+open Serilog
+open Serilog.Extensions.Logging
+
+
+[<RequireQualifiedAccess>]
+module Dashboard =
+    type Model = { Title: string }
+
+    module Model =
+        let empty = { Title = "Dashboard" }
+
+    type Message = | Idle
+
+    let init () = Model.empty, Cmd.none
+
+    let update message model = model, Cmd.none
+
+type DashboardViewModel(args) =
+    inherit ViewModelBase<Dashboard.Model, Dashboard.Message>(args)
+
+    member _.Title = base.Get () (Binding.OneWayT.id >> Binding.mapModel _.Title)
+
+[<RequireQualifiedAccess>]
+module Customer =
+    type Model =
+        { Title: string
+          CurrentTime: DateTime option }
+
+    module Model =
+        let empty = { Title = "Kunden"; CurrentTime = None }
+
+    type Message = | GetTime
+
+    let init () = Model.empty, Cmd.none
+
+    let update message model =
+        match message with
+        | GetTime ->
+            { model with
+                CurrentTime = Some(DateTime.Now) },
+            Cmd.none
+
+type CustomerViewModel(args) =
+    inherit ViewModelBase<Customer.Model, Customer.Message>(args)
+
+    member _.Title = base.Get () (Binding.OneWayT.id >> Binding.mapModel _.Title)
+
+    member _.CurrentTime =
+        base.Get () (Binding.OneWayT.opt >> Binding.mapModel _.CurrentTime)
+
+    member _.GetTime = base.Get () (Binding.CmdT.setAlways Customer.GetTime)
+
+[<RequireQualifiedAccess>]
+module Main =
+    type Uri =
+        | Dashboard = 0
+        | Customer = 1
+
+    type Page =
+        | Dashboard of Dashboard.Model
+        | Customer of Customer.Model
+
+    type Model = { Title: string; ActivePage: Page }
+
+    module Model =
+        let empty =
+            { Title = "App Navigation"
+              ActivePage = Dashboard(fst (Dashboard.init ())) }
+
+    type Message =
+        | Navigate of obj
+        | DashboardMessage of Dashboard.Message
+        | CustomerMessage of Customer.Message
+
+    let init () = Model.empty, Cmd.none
+
+    let update message model =
+        match message with
+        | CustomerMessage msg ->
+            match model.ActivePage with
+            | Customer custModel ->
+                let updatedCustModel, cmd = Customer.update msg custModel
+                { model with ActivePage = Customer updatedCustModel },
+                Cmd.map CustomerMessage cmd
+            | _ -> model, Cmd.none
+        | DashboardMessage msg ->
+            match model.ActivePage with
+            | Dashboard dashModel ->
+                let updatedDashModel, cmd = Dashboard.update msg dashModel
+                { model with ActivePage = Dashboard updatedDashModel },
+                Cmd.map DashboardMessage cmd
+            | _ -> model, Cmd.none
+        | Navigate p ->
+            match (p :?> Uri) with
+            | Uri.Dashboard ->
+                { model with
+                    ActivePage = Dashboard(fst (Dashboard.init ())) },
+                Cmd.none
+            | Uri.Customer ->
+                { model with
+                    ActivePage = Customer(fst (Customer.init ())) },
+                Cmd.none
+            | _ -> System.ArgumentOutOfRangeException() |> raise
+
+type MainViewModel(args) as this =
+    inherit ViewModelBase<Main.Model, Main.Message>(args)
+
+    member this.Title = base.Get () (Binding.OneWayT.id >> Binding.mapModel _.Title)
+
+    member this.Dashboard =
+        base.Get
+            ()
+            (Binding.SubModelT.req DashboardViewModel
+             >> Binding.mapModel (fun (m: Main.Model) ->
+                 match m.ActivePage with
+                 | Main.Dashboard mdl -> mdl
+                 | _ -> fst (Dashboard.init ()))
+             >> Binding.mapMsg Main.DashboardMessage
+             >> Binding.boxT)
+
+    member this.Customer =
+        base.Get
+            ()
+            (Binding.SubModelT.req CustomerViewModel
+             >> Binding.mapModel (fun (m: Main.Model) ->
+                 match m.ActivePage with
+                 | Main.Customer mdl -> mdl
+                 | _ -> fst (Customer.init ()))
+             >> Binding.mapMsg Main.CustomerMessage
+             >> Binding.boxT)
+
+    // Map of page types to their ViewModel properties
+    member this.GetViewModelForPage(page: Main.Page) =
+        match page with
+        | Main.Dashboard _ -> this.Dashboard
+        | Main.Customer _ -> this.Customer
+
+    member this.Content =
+        base.Get
+            ()
+            (Binding.OneWayT.id
+             >> Binding.mapModel (fun (m: Main.Model) -> this.GetViewModelForPage(m.ActivePage)))
+
+    member _.Navigate =
+        base.Get () (Binding.CmdT.id true (fun param model -> true) >> Binding.mapMsg Main.Navigate)
+
+[<RequireQualifiedAccess>]
+module Program =
+    let run window =
+        let logger =
+            LoggerConfiguration()
+                .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+                .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+                .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+                .WriteTo.Console()
+                .CreateLogger()
+
+        WpfProgram.mkProgramT Main.init Main.update MainViewModel
+        |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+        |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj b/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
new file mode 100644
index 00000000..0d8617aa
--- /dev/null
+++ b/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <UseWpf>true</UseWpf>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Library.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Samples/Typed/Navigation/App.xaml b/src/Samples/Typed/Navigation/App.xaml
new file mode 100644
index 00000000..fba42ab3
--- /dev/null
+++ b/src/Samples/Typed/Navigation/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Navigation.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+  <Application.Resources>
+
+  </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/App.xaml.cs b/src/Samples/Typed/Navigation/App.xaml.cs
new file mode 100644
index 00000000..b599b21e
--- /dev/null
+++ b/src/Samples/Typed/Navigation/App.xaml.cs
@@ -0,0 +1,17 @@
+using Navigation.Core;
+
+namespace Navigation;
+
+public partial class App
+{
+    public App()
+    {
+        Activated += StartElmish;
+    }
+
+    private void StartElmish(object? sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.run(MainWindow);
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/AssemblyInfo.cs b/src/Samples/Typed/Navigation/AssemblyInfo.cs
new file mode 100644
index 00000000..cc29e7f7
--- /dev/null
+++ b/src/Samples/Typed/Navigation/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly:ThemeInfo(
+    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
+                                                //(used if a resource is not found in the page,
+                                                // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
+                                                //(used if a resource is not found in the page,
+                                                // app, or any theme specific resource dictionaries)
+)]
diff --git a/src/Samples/Typed/Navigation/CustomerView.xaml b/src/Samples/Typed/Navigation/CustomerView.xaml
new file mode 100644
index 00000000..8b6441f5
--- /dev/null
+++ b/src/Samples/Typed/Navigation/CustomerView.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="Navigation.CustomerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:vm="clr-namespace:Navigation.Core;assembly=Navigation.Core"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance vm:CustomerViewModel}"
+             d:DesignHeight="300" d:DesignWidth="300">
+  <DockPanel LastChildFill="True">
+    <TextBlock Text="{Binding Title}" DockPanel.Dock="Top" FontSize="16" Margin="10" />
+    <StackPanel Orientation="Vertical" Margin="10">
+      <Button Content="Get Current Time" Command="{Binding GetTime}" />
+      <TextBlock Text="{Binding CurrentTime, StringFormat='yyyy-MM-dd HH:mm:ss.fffff zzzzz'}" />
+    </StackPanel>
+  </DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/CustomerView.xaml.cs b/src/Samples/Typed/Navigation/CustomerView.xaml.cs
new file mode 100644
index 00000000..89d5413e
--- /dev/null
+++ b/src/Samples/Typed/Navigation/CustomerView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Navigation;
+
+public partial class CustomerView : UserControl
+{
+    public CustomerView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/DashboardView.xaml b/src/Samples/Typed/Navigation/DashboardView.xaml
new file mode 100644
index 00000000..8ebc7eec
--- /dev/null
+++ b/src/Samples/Typed/Navigation/DashboardView.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="Navigation.DashboardView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:vm="clr-namespace:Navigation.Core;assembly=Navigation.Core"
+             d:DataContext="{d:DesignInstance vm:DashboardViewModel}"
+             mc:Ignorable="d"
+             d:DesignHeight="300" d:DesignWidth="300">
+  <DockPanel LastChildFill="True">
+    <TextBlock Text="{Binding Title}" DockPanel.Dock="Top" FontSize="16" Margin="10" />
+    <StackPanel Orientation="Vertical" Margin="10">
+      <Button Content="Get Current Time" Command="{Binding GetTime}" Margin="5" />
+      <TextBox Text="{Binding CurrentTime, Mode=OneWay}" IsReadOnly="True" Margin="5" />
+    </StackPanel>
+  </DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/DashboardView.xaml.cs b/src/Samples/Typed/Navigation/DashboardView.xaml.cs
new file mode 100644
index 00000000..f5a4ce43
--- /dev/null
+++ b/src/Samples/Typed/Navigation/DashboardView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Navigation;
+
+public partial class DashboardView : UserControl
+{
+    public DashboardView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/MainWindow.xaml b/src/Samples/Typed/Navigation/MainWindow.xaml
new file mode 100644
index 00000000..3e3161b5
--- /dev/null
+++ b/src/Samples/Typed/Navigation/MainWindow.xaml
@@ -0,0 +1,38 @@
+<Window x:Class="Navigation.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:Navigation.Core;assembly=Navigation.Core"
+        xmlns:local="clr-namespace:Navigation"
+        mc:Ignorable="d"
+        d:DataContext="{d:DesignInstance vm:MainViewModel}"
+        Title="{Binding Title}"
+        Height="450"
+        Width="800">
+  <DockPanel LastChildFill="True">
+    <Menu DockPanel.Dock="Top">
+      <MenuItem Header="_Datei">
+        <MenuItem Header="_Dashboard"
+                  Command="{Binding Navigate}"
+                  CommandParameter="{x:Static vm:Main+Uri.Dashboard}" />
+        <MenuItem Header="Kunden"
+                  Command="{Binding Navigate}"
+                  CommandParameter="{x:Static vm:Main+Uri.Customer}" />
+        <Separator />
+        <MenuItem Header="B_eenden" />
+      </MenuItem>
+    </Menu>
+    <StatusBar DockPanel.Dock="Bottom" />
+    <ContentControl Content="{Binding Content}">
+      <ContentControl.Resources>
+        <DataTemplate DataType="{x:Type vm:DashboardViewModel}">
+          <local:DashboardView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type vm:CustomerViewModel}">
+          <local:CustomerView />
+        </DataTemplate>
+      </ContentControl.Resources>
+    </ContentControl>
+  </DockPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/MainWindow.xaml.cs b/src/Samples/Typed/Navigation/MainWindow.xaml.cs
new file mode 100644
index 00000000..72fd5580
--- /dev/null
+++ b/src/Samples/Typed/Navigation/MainWindow.xaml.cs
@@ -0,0 +1,23 @@
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Navigation;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/Navigation.csproj b/src/Samples/Typed/Navigation/Navigation.csproj
new file mode 100644
index 00000000..2a909a9d
--- /dev/null
+++ b/src/Samples/Typed/Navigation/Navigation.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Navigation.Core\Navigation.Core.fsproj" />
+  </ItemGroup>
+
+</Project>

From 5b7c9c68ca18fb540db65152033d0ba97aedd2e6 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Wed, 23 Jul 2025 18:14:11 +0200
Subject: [PATCH 16/18] Fix framework version

---
 src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj | 2 +-
 src/Samples/Typed/Navigation/Navigation.csproj           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj b/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
index 0d8617aa..f8664f2c 100644
--- a/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
+++ b/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <UseWpf>true</UseWpf>
   </PropertyGroup>
diff --git a/src/Samples/Typed/Navigation/Navigation.csproj b/src/Samples/Typed/Navigation/Navigation.csproj
index 2a909a9d..c3038f41 100644
--- a/src/Samples/Typed/Navigation/Navigation.csproj
+++ b/src/Samples/Typed/Navigation/Navigation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>

From 7e78e40c9d6af31b82bf8f29af2469ef1632f3c5 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Wed, 23 Jul 2025 21:52:15 +0200
Subject: [PATCH 17/18] Add navigations sample for dynamic bindings

---
 Elmish.WPF.sln                                |  74 ++++++---
 Elmish.WPF.slnx                               |   2 +
 .../Navigation.Core/Navigation.Core.fsproj    |  22 +++
 .../Dynamic/Navigation.Core/Program.fs        | 149 ++++++++++++++++++
 src/Samples/Dynamic/Navigation/App.xaml       |   8 +
 src/Samples/Dynamic/Navigation/App.xaml.cs    |  19 +++
 .../Dynamic/Navigation/CustomerView.xaml      |  15 ++
 .../Dynamic/Navigation/CustomerView.xaml.cs   |  12 ++
 .../Dynamic/Navigation/DashboardView.xaml     |  15 ++
 .../Dynamic/Navigation/DashboardView.xaml.cs  |  12 ++
 .../Dynamic/Navigation/MainWindow.xaml        |  53 +++++++
 .../Dynamic/Navigation/MainWindow.xaml.cs     |  12 ++
 .../Dynamic/Navigation/Navigation.csproj      |  13 ++
 13 files changed, 384 insertions(+), 22 deletions(-)
 create mode 100644 src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj
 create mode 100644 src/Samples/Dynamic/Navigation.Core/Program.fs
 create mode 100644 src/Samples/Dynamic/Navigation/App.xaml
 create mode 100644 src/Samples/Dynamic/Navigation/App.xaml.cs
 create mode 100644 src/Samples/Dynamic/Navigation/CustomerView.xaml
 create mode 100644 src/Samples/Dynamic/Navigation/CustomerView.xaml.cs
 create mode 100644 src/Samples/Dynamic/Navigation/DashboardView.xaml
 create mode 100644 src/Samples/Dynamic/Navigation/DashboardView.xaml.cs
 create mode 100644 src/Samples/Dynamic/Navigation/MainWindow.xaml
 create mode 100644 src/Samples/Dynamic/Navigation/MainWindow.xaml.cs
 create mode 100644 src/Samples/Dynamic/Navigation/Navigation.csproj

diff --git a/Elmish.WPF.sln b/Elmish.WPF.sln
index 3a2cf116..1e82b5d2 100644
--- a/Elmish.WPF.sln
+++ b/Elmish.WPF.sln
@@ -151,6 +151,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Navigation", "src\Samples\T
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Navigation.Core", "src\Samples\Typed\Navigation.Core\Navigation.Core.fsproj", "{46397A4D-287C-410E-BDE9-1F09D7E64EF0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Navigation", "src\Samples\Dynamic\Navigation\Navigation.csproj", "{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Navigation.Core", "src\Samples\Dynamic\Navigation.Core\Navigation.Core.fsproj", "{D6BDA325-9615-42F5-8D42-EEF27F9E7339}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -989,6 +993,30 @@ Global
 		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x64.Build.0 = Release|Any CPU
 		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x86.ActiveCfg = Release|Any CPU
 		{46397A4D-287C-410E-BDE9-1F09D7E64EF0}.Release|x86.Build.0 = Release|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Debug|x64.Build.0 = Debug|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Debug|x86.Build.0 = Debug|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Release|x64.ActiveCfg = Release|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Release|x64.Build.0 = Release|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Release|x86.ActiveCfg = Release|Any CPU
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487}.Release|x86.Build.0 = Release|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Debug|x64.Build.0 = Debug|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Debug|x86.Build.0 = Debug|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Release|x64.ActiveCfg = Release|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Release|x64.Build.0 = Release|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1034,6 +1062,20 @@ Global
 		{1740D47D-DA94-6415-017E-48203BA1C52C} = {D1B4CF99-7947-DD6C-81D0-5B5B3989814C}
 		{2A113076-21F0-4F11-A1CF-D0E4A1D14503} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{A7BA896C-1D7E-4336-BE50-032BF8E62D81} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F964D761-6542-4A3C-8ADC-41F5B8F77529} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{84AF37C1-52A8-4F3F-8F2C-E7394E789523} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{75110CC0-5A94-4491-BA7E-234ACC39106D} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{A57D4155-3F27-4BDA-900E-1A39B022BE00} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{86E04393-86E7-4BBF-A9EF-9433B91E4988} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{435B3E59-C5B2-412A-86DC-795F1E52C223} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{03FA4F94-962D-4324-B71E-D36E638D13D7} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{197B01F2-1974-46A1-9C40-7303E405BFA7} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{0C0BBD9A-1AC7-4B54-B725-03535AE033F1} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{1093E8A9-77C3-43A0-ACA2-E0857EC19AED} = {1740D47D-DA94-6415-017E-48203BA1C52C}
@@ -1042,29 +1084,17 @@ Global
 		{BB30719A-3461-493E-972F-F6CEF534163E} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{9ECB1F3B-3076-4C98-9ECA-6ACE8C8CAB2A} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{E6476EE0-71CA-4E5D-BE05-E57825E8AECB} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{46397A4D-287C-410E-BDE9-1F09D7E64EF0} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{F6BB74C6-971A-44D7-BC10-3B37B74DE264} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{565FC442-5E49-42AD-AC33-14AD14E11961} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{F10A1DEA-545F-4C9F-AFA1-A115726BD415} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{CAD2DE5B-A359-4E51-8138-A02FDCA8E2A6} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{6E4E4453-36C8-42FC-9B8A-C8FEBCC6A643} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{148B26DF-05B6-44D6-890D-8AFBFAD9F7D9} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{F964D761-6542-4A3C-8ADC-41F5B8F77529} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{435B3E59-C5B2-412A-86DC-795F1E52C223} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{B9C9B2A4-562B-45BB-BD91-CE5027F41C3F} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{86E04393-86E7-4BBF-A9EF-9433B91E4988} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{A57D4155-3F27-4BDA-900E-1A39B022BE00} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{8F1471D6-CEFA-4B4F-84C5-FB4B5CB035BD} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{75110CC0-5A94-4491-BA7E-234ACC39106D} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{03FA4F94-962D-4324-B71E-D36E638D13D7} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{A3D2D2D1-413E-4367-B1D5-0AEEB1551240} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{84AF37C1-52A8-4F3F-8F2C-E7394E789523} = {1740D47D-DA94-6415-017E-48203BA1C52C}
-		{6455B74A-6CB8-4DC3-9329-3D9CBB56173A} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{984CD20C-0F0A-4458-A3ED-6CC9BE2A1DC8} = {1740D47D-DA94-6415-017E-48203BA1C52C}
 		{20D9470B-F39E-4E67-A00D-9714D6E857DE} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{5D54DD79-59AA-4C85-8ECA-CAC59D86F251} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F10A1DEA-545F-4C9F-AFA1-A115726BD415} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{0330D3D5-5A97-4F6D-AE22-993256ABDFEE} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{565FC442-5E49-42AD-AC33-14AD14E11961} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{F6BB74C6-971A-44D7-BC10-3B37B74DE264} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{8B54C3E2-5F8B-471B-83DF-26239DF1C5C8} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{1C8C9F58-A63E-4ED6-A185-F26F672EEDE0} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{46397A4D-287C-410E-BDE9-1F09D7E64EF0} = {1740D47D-DA94-6415-017E-48203BA1C52C}
+		{12E352F9-40EE-4C12-BD9D-5B4ABDEB5487} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
+		{D6BDA325-9615-42F5-8D42-EEF27F9E7339} = {D93CAD63-3252-5A7F-9C37-FCA27F08B606}
 	EndGlobalSection
 EndGlobal
diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index c6ad24d8..55851ed4 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -23,6 +23,8 @@
     <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
     <Project Path="src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj" />
     <Project Path="src/Samples/Dynamic/Multiselect/Multiselect.csproj" />
+    <Project Path="src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj" />
+    <Project Path="src/Samples/Dynamic/Navigation/Navigation.csproj" />
     <Project Path="src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj" />
     <Project Path="src/Samples/Dynamic/NewWindow/NewWindow.csproj" />
     <Project Path="src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
diff --git a/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj b/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj
new file mode 100644
index 00000000..1bf5a0e5
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation.Core/Program.fs b/src/Samples/Dynamic/Navigation.Core/Program.fs
new file mode 100644
index 00000000..9f8d348d
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation.Core/Program.fs
@@ -0,0 +1,149 @@
+module Elmish.WPF.Samples.Navigation.Program
+
+open System
+open Elmish
+open Elmish.WPF
+open Serilog
+open Serilog.Extensions.Logging
+
+[<RequireQualifiedAccess>]
+module Dashboard =
+    type Model = { Title: string }
+
+    module Model =
+        let empty = { Title = "Dashboard" }
+
+    type Message = | Idle
+
+    let init () = Model.empty, Cmd.none
+
+    let update message model = model, Cmd.none
+
+    let bindings () : Binding<Model, Message> list =
+        [ "Title" |> Binding.oneWay (fun (m: Model) -> m.Title) ]
+
+    let designVm = ViewModel.designInstance Model.empty (bindings ())
+
+[<RequireQualifiedAccess>]
+module Customer =
+    type Model =
+        { Title: string
+          CurrentTime: DateTime option }
+
+    module Model =
+        let empty = { Title = "Kunden"; CurrentTime = None }
+
+    type Message = | GetTime
+
+    let init () = Model.empty, Cmd.none
+
+    let update message model =
+        match message with
+        | GetTime ->
+            { model with
+                CurrentTime = Some(DateTime.Now) },
+            Cmd.none
+
+    let bindings () : Binding<Model, Message> list =
+        [ "Title" |> Binding.oneWay (fun (m: Model) -> m.Title)
+          "CurrentTime" |> Binding.oneWayOpt (fun (m: Model) -> m.CurrentTime)
+          "GetTime" |> Binding.cmd GetTime ]
+
+    let designVm = ViewModel.designInstance Model.empty (bindings ())
+
+[<RequireQualifiedAccess>]
+module Main =
+    type Uri =
+        | Dashboard = 0
+        | Customer = 1
+
+    type Page =
+        | Dashboard of Dashboard.Model
+        | Customer of Customer.Model
+
+    type Model = { Title: string; ActivePage: Page }
+
+    module Model =
+        let empty =
+            { Title = "App Navigation"
+              ActivePage = Dashboard(fst (Dashboard.init ())) }
+
+    type Message =
+        | Navigate of obj
+        | DashboardMessage of Dashboard.Message
+        | CustomerMessage of Customer.Message
+
+    let init () = Model.empty, Cmd.none
+
+    let update message model =
+        match message with
+        | CustomerMessage msg ->
+            match model.ActivePage with
+            | Customer custModel ->
+                let updatedCustModel, cmd = Customer.update msg custModel
+
+                { model with
+                    ActivePage = Customer updatedCustModel },
+                Cmd.map CustomerMessage cmd
+            | _ -> model, Cmd.none
+        | DashboardMessage msg ->
+            match model.ActivePage with
+            | Dashboard dashModel ->
+                let updatedDashModel, cmd = Dashboard.update msg dashModel
+
+                { model with
+                    ActivePage = Dashboard updatedDashModel },
+                Cmd.map DashboardMessage cmd
+            | _ -> model, Cmd.none
+        | Navigate p ->
+            match (p :?> Uri) with
+            | Uri.Dashboard ->
+                { model with
+                    ActivePage = Dashboard(fst (Dashboard.init ())) },
+                Cmd.none
+            | Uri.Customer ->
+                { model with
+                    ActivePage = Customer(fst (Customer.init ())) },
+                Cmd.none
+            | _ -> System.ArgumentOutOfRangeException() |> raise
+
+    let bindings () : Binding<Model, Message> list =
+        [ "Title" |> Binding.oneWay (fun (m: Model) -> m.Title)
+          "Navigate" |> Binding.cmdParam (fun param _ -> Navigate param)
+
+          "Dashboard"
+          |> Binding.SubModel.required Dashboard.bindings
+          |> Binding.mapModel (fun (m: Model) ->
+              match m.ActivePage with
+              | Dashboard model -> model
+              | _ -> fst (Dashboard.init ()))
+          |> Binding.mapMsg DashboardMessage
+
+          "Customer"
+          |> Binding.SubModel.required Customer.bindings
+          |> Binding.mapModel (fun (m: Model) ->
+              match m.ActivePage with
+              | Customer model -> model
+              | _ -> fst (Customer.init ()))
+          |> Binding.mapMsg CustomerMessage
+
+          "ActivePageName"
+          |> Binding.oneWay (fun (m: Model) ->
+              match m.ActivePage with
+              | Dashboard _ -> "Dashboard"
+              | Customer _ -> "Customer") ]
+
+    let designVm = ViewModel.designInstance Model.empty (bindings ())
+
+let main window =
+    let logger =
+        LoggerConfiguration()
+            .MinimumLevel.Override("Elmish.WPF.Update", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Bindings", Events.LogEventLevel.Verbose)
+            .MinimumLevel.Override("Elmish.WPF.Performance", Events.LogEventLevel.Verbose)
+            .WriteTo.Console()
+            .CreateLogger()
+
+    WpfProgram.mkProgram Main.init Main.update Main.bindings
+    |> WpfProgram.withLogger (new SerilogLoggerFactory(logger))
+    |> WpfProgram.startElmishLoop window
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/App.xaml b/src/Samples/Dynamic/Navigation/App.xaml
new file mode 100644
index 00000000..701e5572
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Navigation.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/App.xaml.cs b/src/Samples/Dynamic/Navigation/App.xaml.cs
new file mode 100644
index 00000000..36f1981e
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/App.xaml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows;
+
+namespace Navigation
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            Activated += StartElmish;
+        }
+
+        private void StartElmish(object sender, EventArgs e)
+        {
+            Activated -= StartElmish;
+            Elmish.WPF.Samples.Navigation.Program.main(MainWindow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/CustomerView.xaml b/src/Samples/Dynamic/Navigation/CustomerView.xaml
new file mode 100644
index 00000000..74db82b1
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/CustomerView.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="Navigation.CustomerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="300" d:DesignWidth="300">
+  <DockPanel LastChildFill="True">
+    <TextBlock Text="{Binding Title}" DockPanel.Dock="Top" FontSize="16" Margin="10" />
+    <StackPanel Orientation="Vertical" Margin="10">
+      <Button Content="Get Current Time" Command="{Binding GetTime}" Margin="5" />
+      <TextBlock Text="{Binding CurrentTime, StringFormat='yyyy-MM-dd HH:mm:ss.fffff zzzzz'}" Margin="5" />
+    </StackPanel>
+  </DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs b/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs
new file mode 100644
index 00000000..9a1dfdee
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows.Controls;
+
+namespace Navigation
+{
+    public partial class CustomerView : UserControl
+    {
+        public CustomerView()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/DashboardView.xaml b/src/Samples/Dynamic/Navigation/DashboardView.xaml
new file mode 100644
index 00000000..980a3d47
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/DashboardView.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="Navigation.DashboardView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="300" d:DesignWidth="300">
+  <DockPanel LastChildFill="True">
+    <TextBlock Text="{Binding Title}" DockPanel.Dock="Top" FontSize="16" Margin="10" />
+    <StackPanel Orientation="Vertical" Margin="10">
+      <TextBlock Text="Welcome to the Dashboard!" FontSize="14" Margin="5" />
+      <TextBlock Text="This is the main dashboard view." FontSize="12" Margin="5" />
+    </StackPanel>
+  </DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs b/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs
new file mode 100644
index 00000000..013f6d82
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows.Controls;
+
+namespace Navigation
+{
+    public partial class DashboardView : UserControl
+    {
+        public DashboardView()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/MainWindow.xaml b/src/Samples/Dynamic/Navigation/MainWindow.xaml
new file mode 100644
index 00000000..4db42208
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/MainWindow.xaml
@@ -0,0 +1,53 @@
+<Window x:Class="Navigation.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Navigation"
+        xmlns:vm="clr-namespace:Elmish.WPF.Samples.Navigation;assembly=Navigation.Core"
+        mc:Ignorable="d"
+        Title="{Binding Title}"
+        Height="450"
+        Width="800">
+  <DockPanel LastChildFill="True">
+    <Menu DockPanel.Dock="Top">
+      <MenuItem Header="_Datei">
+        <MenuItem Header="_Dashboard"
+                  Command="{Binding Navigate}"
+                  CommandParameter="{x:Static vm:Program+Main+Uri.Dashboard}" />
+        <MenuItem Header="Kunden"
+                  Command="{Binding Navigate}"
+                  CommandParameter="{x:Static vm:Program+Main+Uri.Customer}" />
+        <Separator />
+        <MenuItem Header="B_eenden" />
+      </MenuItem>
+    </Menu>
+    <StatusBar DockPanel.Dock="Bottom" />
+    <ContentControl>
+      <ContentControl.Style>
+        <Style TargetType="ContentControl">
+          <Setter Property="Content" Value="{Binding Dashboard}" />
+          <Setter Property="ContentTemplate">
+            <Setter.Value>
+              <DataTemplate>
+                <local:DashboardView />
+              </DataTemplate>
+            </Setter.Value>
+          </Setter>
+          <Style.Triggers>
+            <DataTrigger Binding="{Binding ActivePageName}" Value="Customer">
+              <Setter Property="Content" Value="{Binding Customer}" />
+              <Setter Property="ContentTemplate">
+                <Setter.Value>
+                  <DataTemplate>
+                    <local:CustomerView />
+                  </DataTemplate>
+                </Setter.Value>
+              </Setter>
+            </DataTrigger>
+          </Style.Triggers>
+        </Style>
+      </ContentControl.Style>
+    </ContentControl>
+  </DockPanel>
+</Window>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs b/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs
new file mode 100644
index 00000000..f81bcf03
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Navigation
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/Navigation.csproj b/src/Samples/Dynamic/Navigation/Navigation.csproj
new file mode 100644
index 00000000..ee4dbbbf
--- /dev/null
+++ b/src/Samples/Dynamic/Navigation/Navigation.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <UseWPF>true</UseWPF>
+    <TargetFramework>net8.0-windows</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Navigation.Core\Navigation.Core.fsproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file

From aeeafec45aaedd032db4157fc0ac3e159d854410 Mon Sep 17 00:00:00 2001
From: Tim Rudat <timrudat@gmail.com>
Date: Wed, 23 Jul 2025 21:58:33 +0200
Subject: [PATCH 18/18] House keeping: Code formatting

---
 Elmish.WPF.slnx                               | 158 +++++++++---------
 README.md                                     |  66 +++++---
 REFERENCE.md                                  | 113 +++++++------
 .../Navigation.Core/Navigation.Core.fsproj    |  10 +-
 src/Samples/Dynamic/Navigation/App.xaml       |   6 +-
 src/Samples/Dynamic/Navigation/App.xaml.cs    |  22 +--
 .../Dynamic/Navigation/CustomerView.xaml.cs   |  11 +-
 .../Dynamic/Navigation/DashboardView.xaml.cs  |  11 +-
 .../Dynamic/Navigation/MainWindow.xaml.cs     |  11 +-
 .../Dynamic/Navigation/Navigation.csproj      |   2 +-
 src/Samples/Dynamic/NewWindow/MainWindow.xaml |   3 +-
 src/Samples/Typed/Navigation.Core/Library.fs  |  10 +-
 .../Navigation.Core/Navigation.Core.fsproj    |   6 +-
 src/Samples/Typed/Navigation/AssemblyInfo.cs  |  16 +-
 .../Typed/Navigation/MainWindow.xaml.cs       |  13 +-
 .../Typed/Navigation/Navigation.csproj        |   2 +-
 src/Samples/Typed/NewWindow.Core/Window2.fs   |   9 +-
 .../SubModelSelectedItem.Core/Program.fs      |   6 +-
 src/Samples/Typed/Validation/MainWindow.xaml  |   3 +-
 19 files changed, 249 insertions(+), 229 deletions(-)

diff --git a/Elmish.WPF.slnx b/Elmish.WPF.slnx
index 55851ed4..f9bc0077 100644
--- a/Elmish.WPF.slnx
+++ b/Elmish.WPF.slnx
@@ -1,91 +1,91 @@
 <Solution>
   <Folder Name="/Solution Items/">
-    <File Path="README.md" />
-    <File Path="REFERENCE.md" />
-    <File Path="RELEASE_NOTES.md" />
-    <File Path="TUTORIAL.md" />
-    <File Path=".editorconfig" />
-    <File Path=".gitignore" />
-    <File Path="LICENSE.md" />
+    <File Path="README.md"/>
+    <File Path="REFERENCE.md"/>
+    <File Path="RELEASE_NOTES.md"/>
+    <File Path="TUTORIAL.md"/>
+    <File Path=".editorconfig"/>
+    <File Path=".gitignore"/>
+    <File Path="LICENSE.md"/>
   </Folder>
   <Folder Name="/src/">
-    <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj" />
+    <Project Path="src/Elmish.WPF/Elmish.WPF.fsproj"/>
   </Folder>
-  <Folder Name="/src/Samples/" />
+  <Folder Name="/src/Samples/"/>
   <Folder Name="/src/Samples/Dynamic/">
-    <Project Path="src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/Capabilities/Capabilities.csproj" />
-    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj" />
-    <Project Path="src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/FileDialogs/FileDialogs.csproj" />
-    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
-    <Project Path="src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/Multiselect/Multiselect.csproj" />
-    <Project Path="src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/Navigation/Navigation.csproj" />
-    <Project Path="src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/NewWindow/NewWindow.csproj" />
-    <Project Path="src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj" />
-    <Project Path="src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/SingleCounter/SingleCounter.csproj" />
-    <Project Path="src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/Sticky/Sticky.csproj" />
-    <Project Path="src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/SubModel/SubModel.csproj" />
-    <Project Path="src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj" />
-    <Project Path="src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj" />
-    <Project Path="src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj" />
-    <Project Path="src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/Threading/Threading.csproj" />
-    <Project Path="src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj" />
-    <Project Path="src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj" />
-    <Project Path="src/Samples/Dynamic/Validation/Validation.csproj" />
+    <Project Path="src/Samples/Dynamic/Capabilities.Core/Capabilities.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Capabilities/Capabilities.csproj"/>
+    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogs.Core/FileDialogs.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogs/FileDialogs.csproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj"/>
+    <Project Path="src/Samples/Dynamic/Multiselect.Core/Multiselect.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Multiselect/Multiselect.csproj"/>
+    <Project Path="src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Navigation/Navigation.csproj"/>
+    <Project Path="src/Samples/Dynamic/NewWindow.Core/NewWindow.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/NewWindow/NewWindow.csproj"/>
+    <Project Path="src/Samples/Dynamic/OneWaySeq.Core/OneWaySeq.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/OneWaySeq/OneWaySeq.csproj"/>
+    <Project Path="src/Samples/Dynamic/SingleCounter.Core/SingleCounter.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SingleCounter/SingleCounter.csproj"/>
+    <Project Path="src/Samples/Dynamic/Sticky.Core/Sticky.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Sticky/Sticky.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModel.Core/SubModel.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModel/SubModel.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelOpt.Core/SubModelOpt.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelOpt/SubModelOpt.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSelectedItem/SubModelSelectedItem.csproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSeq.Core/SubModelSeq.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/SubModelSeq/SubModelSeq.csproj"/>
+    <Project Path="src/Samples/Dynamic/Threading.Core/Threading.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Threading/Threading.csproj"/>
+    <Project Path="src/Samples/Dynamic/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/UiBoundCmdParam/UiBoundCmdParam.csproj"/>
+    <Project Path="src/Samples/Dynamic/Validation.Core/Validation.Core.fsproj"/>
+    <Project Path="src/Samples/Dynamic/Validation/Validation.csproj"/>
   </Folder>
   <Folder Name="/src/Samples/Typed/">
-    <Project Path="src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj" />
-    <Project Path="src/Samples/Typed/Capabilities/Capabilities.csproj" />
-    <Project Path="src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj" />
-    <Project Path="src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj" />
-    <Project Path="src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj" />
-    <Project Path="src/Samples/Typed/FileDialogs/FileDialogs.csproj" />
-    <Project Path="src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj" />
-    <Project Path="src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj" />
-    <Project Path="src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj" />
-    <Project Path="src/Samples/Typed/Multiselect/Multiselect.csproj" />
-    <Project Path="src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj" />
-    <Project Path="src/Samples/Typed/Navigation/Navigation.csproj" />
-    <Project Path="src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj" />
-    <Project Path="src/Samples/Typed/NewWindow/NewWindow.csproj" />
-    <Project Path="src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj" />
-    <Project Path="src/Samples/Typed/OneWaySeq/OneWaySeq.csproj" />
-    <Project Path="src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj" />
-    <Project Path="src/Samples/Typed/SingleCounter/SingleCounter.csproj" />
-    <Project Path="src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj" />
-    <Project Path="src/Samples/Typed/Sticky/Sticky.csproj" />
-    <Project Path="src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj" />
-    <Project Path="src/Samples/Typed/SubModelOpt/SubModelOpt.csproj" />
-    <Project Path="src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj" />
-    <Project Path="src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj" />
-    <Project Path="src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj" />
-    <Project Path="src/Samples/Typed/SubModelSeq/SubModelSeq.csproj" />
-    <Project Path="src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj" />
-    <Project Path="src/Samples/Typed/SubModelStatic/SubModelStatic.csproj" />
-    <Project Path="src/Samples/Typed/Threading.Core/Threading.Core.fsproj" />
-    <Project Path="src/Samples/Typed/Threading/Threading.csproj" />
-    <Project Path="src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj" />
-    <Project Path="src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj" />
-    <Project Path="src/Samples/Typed/Validation.Core/Validation.Core.fsproj" />
-    <Project Path="src/Samples/Typed/Validation/Validation.csproj" />
+    <Project Path="src/Samples/Typed/Capabilities.Core/Capabilities.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/Capabilities/Capabilities.csproj"/>
+    <Project Path="src/Samples/Typed/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj"/>
+    <Project Path="src/Samples/Typed/FileDialogs.Core/FileDialogs.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/FileDialogs/FileDialogs.csproj"/>
+    <Project Path="src/Samples/Typed/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj"/>
+    <Project Path="src/Samples/Typed/Multiselect.Core/Multiselect.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/Multiselect/Multiselect.csproj"/>
+    <Project Path="src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/Navigation/Navigation.csproj"/>
+    <Project Path="src/Samples/Typed/NewWindow.Core/NewWindow.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/NewWindow/NewWindow.csproj"/>
+    <Project Path="src/Samples/Typed/OneWaySeq.Core/OneWaySeq.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/OneWaySeq/OneWaySeq.csproj"/>
+    <Project Path="src/Samples/Typed/SingleCounter.Core/SingleCounter.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/SingleCounter/SingleCounter.csproj"/>
+    <Project Path="src/Samples/Typed/Sticky.Core/Sticky.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/Sticky/Sticky.csproj"/>
+    <Project Path="src/Samples/Typed/SubModelOpt.Core/SubModelOpt.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/SubModelOpt/SubModelOpt.csproj"/>
+    <Project Path="src/Samples/Typed/SubModelSelectedItem.Core/SubModelSelectedItem.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/SubModelSelectedItem/SubModelSelectedItem.csproj"/>
+    <Project Path="src/Samples/Typed/SubModelSeq.Core/SubModelSeq.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/SubModelSeq/SubModelSeq.csproj"/>
+    <Project Path="src/Samples/Typed/SubModelStatic.Core/SubModelStatic.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/SubModelStatic/SubModelStatic.csproj"/>
+    <Project Path="src/Samples/Typed/Threading.Core/Threading.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/Threading/Threading.csproj"/>
+    <Project Path="src/Samples/Typed/UiBoundCmdParam.Core/UiBoundCmdParam.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/UiBoundCmdParam/UiBoundCmdParam.csproj"/>
+    <Project Path="src/Samples/Typed/Validation.Core/Validation.Core.fsproj"/>
+    <Project Path="src/Samples/Typed/Validation/Validation.csproj"/>
   </Folder>
   <Folder Name="/tests/">
-    <Project Path="tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj" />
-    <Project Path="tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj" />
+    <Project Path="tests/Elmish.WPF.Benchmarks/Elmish.WPF.Benchmarks.fsproj"/>
+    <Project Path="tests/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj"/>
   </Folder>
 </Solution>
\ No newline at end of file
diff --git a/README.md b/README.md
index 72f43c78..afe21462 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@ WPF done the Elmish Way
 [![NuGet version](https://img.shields.io/nuget/v/Elmish.WPF.svg)](https://www.nuget.org/packages/Elmish.WPF) [![NuGet downloads](https://img.shields.io/nuget/dt/Elmish.WPF.svg)](https://www.nuget.org/packages/Elmish.WPF) [![Build status](https://github.com/elmish/Elmish.WPF/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/elmish/Elmish.WPF/actions/workflows/continuous_integration.yml)
 
 **The good parts of MVVM (the data bindings) with the simplicity and robustness of an MVU architecture for the rest of
-your app. Choose between dynamic bindings for flexibility or statically-typed ViewModels for safety and tooling support!**
+your app. Choose between dynamic bindings for flexibility or statically-typed ViewModels for safety and tooling support!
+**
 
 ### Elevator pitch
 
@@ -14,10 +15,13 @@ Elmish.WPF is a **production-ready** library that allows you to write WPF apps w
 battle-tested MVU architecture, while still allowing you to use all your XAML knowledge and tooling to create UIs.
 
 **Two powerful approaches in one library:**
+
 - **Dynamic Bindings**: Flexible, functional approach with runtime binding definitions
 - **Statically-Typed ViewModels**: Compile-time safety with full IntelliSense and design-time support
 
-Choose **Dynamic Bindings** for rapid prototyping, simple apps, or when you prefer functional composition. Choose **Statically-Typed ViewModels** for large applications, when working with designers, or when you want compile-time validation and superior tooling support.
+Choose **Dynamic Bindings** for rapid prototyping, simple apps, or when you prefer functional composition. Choose *
+*Statically-Typed ViewModels** for large applications, when working with designers, or when you want compile-time
+validation and superior tooling support.
 
 Some benefits of MVU you'll get with Elmish.WPF include:
 
@@ -57,7 +61,8 @@ Recommended resources
   Elmish.WPF's bindings and library functions for modifying bindings.
 * The [Elmish docs site](https://elmish.github.io/elmish) also explains the general MVU architecture and principles.
 * The [Elmish.WPF samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) provide many concrete usage
-  examples, organized into [Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic) and [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed) approaches.
+  examples, organized into [Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic)
+  and [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed) approaches.
 * Blog posts:
     * [Getting Elmish in .NET with Elmish.WPF](https://medium.com/swlh/getting-elmish-in-net-with-elmish-wpf-cd44e3eddc27) ("
       getting started" guide by Matt Eland)
@@ -68,18 +73,21 @@ Recommended resources
     * [Official Elm guide](https://guide.elm-lang.org)
     * Two talks: [Summarising Elm scaling strategy](https://dev.to/elmupdate/summarising-elm-scaling-strategy-1bjn)
     *
-    Reddit: [Resources regarding scaling Elm apps](https://www.reddit.com/r/elm/comments/65s0g4/resources_regarding_scaling_elm_apps/)
+  Reddit: [Resources regarding scaling Elm apps](https://www.reddit.com/r/elm/comments/65s0g4/resources_regarding_scaling_elm_apps/)
     *
-    Reddit: [How to structure Elm with multiple models](https://www.reddit.com/r/elm/comments/5jd2xn/how_to_structure_elm_with_multiple_models/dbuu0m4/)
+  Reddit: [How to structure Elm with multiple models](https://www.reddit.com/r/elm/comments/5jd2xn/how_to_structure_elm_with_multiple_models/dbuu0m4/)
     *
-    Reddit: [Elm Architecture with a Redux-like store pattern](https://www.reddit.com/r/elm/comments/5xdl9z/elm_architecture_with_a_reduxlike_store_pattern/)
+  Reddit: [Elm Architecture with a Redux-like store pattern](https://www.reddit.com/r/elm/comments/5xdl9z/elm_architecture_with_a_reduxlike_store_pattern/)
 
 Getting started with Elmish.WPF
 -------------------------------
 
 Elmish.WPF offers two approaches for creating bindings. Choose the one that best fits your needs:
 
-**Quick Start**: See the [Dynamic SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/SingleCounter) or [Typed SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/SingleCounter) samples for very simple apps demonstrating each approach.
+**Quick Start**: See
+the [Dynamic SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/SingleCounter)
+or [Typed SingleCounter](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/SingleCounter) samples for
+very simple apps demonstrating each approach.
 
 The central points are (assuming up-to-date Visual Studio):
 
@@ -141,10 +149,10 @@ The central points are (assuming up-to-date Visual Studio):
 
 Define the "view" function using the `Bindings` module. This is the central public API of Elmish.WPF.
 
-   Normally in Elm/Elmish this function is called `view` and would take a model and a dispatch function (to dispatch new
-   messages to the update loop) and return the UI (e.g. a HTML DOM to be rendered), but in Elmish.WPF this function is
-   in general only run once and simply sets up bindings that XAML-defined views can use. Therefore, let's call it
-   `bindings` instead of `view`.
+Normally in Elm/Elmish this function is called `view` and would take a model and a dispatch function (to dispatch new
+messages to the update loop) and return the UI (e.g. a HTML DOM to be rendered), but in Elmish.WPF this function is
+in general only run once and simply sets up bindings that XAML-defined views can use. Therefore, let's call it
+`bindings` instead of `view`.
 
    ```F#
    open Elmish.WPF
@@ -160,12 +168,13 @@ Define the "view" function using the `Bindings` module. This is the central publ
      ]
    ```
 
-   The strings identify the binding names to be used in the XAML views. The Binding module has many functions to create
-   various types of bindings.
+The strings identify the binding names to be used in the XAML views. The Binding module has many functions to create
+various types of bindings.
 
 ### Approach B: Statically-Typed ViewModels
 
-Use statically-typed view models to get better IDE support in XAML, compile-time safety, and superior design-time experience.
+Use statically-typed view models to get better IDE support in XAML, compile-time safety, and superior design-time
+experience.
 
    ```f#
    open Elmish.WPF
@@ -174,15 +183,15 @@ Use statically-typed view models to get better IDE support in XAML, compile-time
    type CounterViewModel(args) =
      inherit ViewModelBase<Model, Msg>(args)
 
-     member _.CounterValue = 
+     member _.CounterValue =
        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
-     
-     member _.Increment = 
+
+     member _.Increment =
        base.Get () (Binding.CmdT.setAlways Increment)
-     
-     member _.Decrement = 
+
+     member _.Decrement =
        base.Get () (Binding.CmdT.setAlways Decrement)
-     
+
      let stepSizeBinding =
        Binding.TwoWayT.id
        >> Binding.mapModel (fun m -> float m.StepSize)
@@ -215,7 +224,7 @@ Use statically-typed view models to get better IDE support in XAML, compile-time
      |> WpfProgram.startElmishLoop window
    ```
 
-   In both cases, `WpfProgram.startElmishLoop` will set the window's `DataContext` and start the Elmish dispatch loop.
+In both cases, `WpfProgram.startElmishLoop` will set the window's `DataContext` and start the Elmish dispatch loop.
 
 8. Create a WPF app project (using the Visual Studio template called `WPF App (.NET)`). This will be your entry point
    and contain the XAML views. Add a reference to the F# project, and make the following changes in the `csproj` file:
@@ -270,7 +279,10 @@ Further resources:
 * The [Elmish.WPF tutorial](https://github.com/elmish/Elmish.WPF/blob/master/TUTORIAL.md) provides information on
   general MVU/Elmish concepts and how they apply to Elmish.WPF, as well as the various Elmish.WPF bindings.
 * The [samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples) are complete, working mini-apps
-  demonstrating selected aspects of Elmish.WPF. Browse the [Dynamic samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic) for traditional functional bindings or the [Typed samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed) for statically-typed ViewModels.
+  demonstrating selected aspects of Elmish.WPF. Browse
+  the [Dynamic samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic) for traditional functional
+  bindings or the [Typed samples](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed) for
+  statically-typed ViewModels.
 * If you'd like to contribute, please read and follow
   the [Contributor guidelines](https://github.com/elmish/Elmish.WPF/blob/master/.github/CONTRIBUTING.md).
 
@@ -280,6 +292,7 @@ FAQ
 #### Should I use Dynamic Bindings or Statically-Typed ViewModels?
 
 **Use Dynamic Bindings when:**
+
 - Rapid prototyping or building simple applications
 - You prefer functional composition over object-oriented patterns
 - Working alone or in small teams familiar with F#
@@ -287,6 +300,7 @@ FAQ
 - Building MVU-style applications where the view layer should be minimal
 
 **Use Statically-Typed ViewModels when:**
+
 - Building large, complex applications
 - Working with designers who need design-time data and IntelliSense
 - You want compile-time validation of binding names and types
@@ -299,6 +313,7 @@ Both approaches use the same underlying MVU architecture and can coexist in the
 #### How do I migrate between Dynamic and Typed approaches?
 
 **Dynamic to Typed:**
+
 1. Create a class inheriting from `ViewModelBase<'model, 'msg>`
 2. Convert each binding in your `bindings()` function to a property
 3. Use `Binding.OneWayT`, `Binding.CmdT`, etc. instead of the non-T variants
@@ -306,6 +321,7 @@ Both approaches use the same underlying MVU architecture and can coexist in the
 5. Update your program creation to use `WpfProgram.mkSimpleT`
 
 **Typed to Dynamic:**
+
 1. Extract all properties into a `bindings()` function returning `Binding<'model, 'msg> list`
 2. Convert property names to string-keyed bindings
 3. Use `Binding.oneWay`, `Binding.cmd`, etc. instead of the T variants
@@ -373,7 +389,8 @@ actual commands elsewhere:
   `Program.mkProgramWpfWithCmdMsg` that does this for you (but there’s no magic going on – it’s really easy to do
   yourself).
 
-The [FileDialogsCmdMsg sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/FileDialogsCmdMsg) demonstrates this approach.
+The [FileDialogsCmdMsg sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/FileDialogsCmdMsg)
+demonstrates this approach.
 For more information, see
 the [Fabulous documentation](https://fsprojects.github.io/Fabulous/Fabulous.XamarinForms/update.html#replacing-commands-with-command-messages-for-better-testability).
 For reference, here
@@ -464,7 +481,8 @@ the desired behavior.
 
 #### Can I bind to events and use behaviors?
 
-Sure! Check out the [EventBindingsAndBehaviors sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/EventBindingsAndBehaviors) ([Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/EventBindingsAndBehaviors) | [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/EventBindingsAndBehaviors)).
+Sure! Check out
+the [EventBindingsAndBehaviors sample](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/EventBindingsAndBehaviors) ([Dynamic](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Dynamic/EventBindingsAndBehaviors) | [Typed](https://github.com/elmish/Elmish.WPF/tree/master/src/Samples/Typed/EventBindingsAndBehaviors)).
 Note that you have to install the NuGet package `Microsoft.Xaml.Behaviors.Wpf`.
 
 #### How can I control logging?
diff --git a/REFERENCE.md b/REFERENCE.md
index 8fe5f7ae..d9a3aa18 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -69,7 +69,8 @@ debouncing/throttling etc.
 
 ### One-way bindings
 
-*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
+*Relevant sample:
+SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 One-way bindings are used when you want to bind to a simple value.
 
@@ -98,7 +99,8 @@ the inner value.
 
 ### Two-way bindings
 
-*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
+*Relevant sample:
+SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 Two-way bindings are commonly used for any kind of input (textboxes, checkboxes, sliders, etc.). The two-way bindings
 accept two functions: A function `get: 'model -> 'a` just like the one-way binding, and a function
@@ -169,7 +171,8 @@ There are also variants of the two-way validating bindings for option-wrapped va
 
 ### Command bindings
 
-*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
+*Relevant sample:
+SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 Command bindings are used whenever you use `Command`/`CommandParameter` in XAML, such as for button clicks.
 
@@ -200,7 +203,8 @@ model-accepting function). The above can therefore be written like this:
 
 #### Conditional commands (where you control `CanExecute`)
 
-*Relevant sample: SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
+*Relevant sample:
+SingleCounter - ([Dynamic](src/Samples/Dynamic/SingleCounter) | [Typed](src/Samples/Typed/SingleCounter))*
 
 A command may not always be executable. As you might know, WPF’s `ICommand` interface contains a `CanExecute` method
 that, if `false`, will cause WPF to disable the bound control (e.g. the button).
@@ -225,7 +229,8 @@ There are several ways to indicate that a command can‘t execute. The `cmdIf` b
 
 #### Using the `CommandParameter`
 
-*Relevant sample: UiBoundCmdParam - ([Dynamic](src/Samples/Dynamic/UiBoundCmdParam) | [Typed](src/Samples/Typed/UiBoundCmdParam))*
+*Relevant sample:
+UiBoundCmdParam - ([Dynamic](src/Samples/Dynamic/UiBoundCmdParam) | [Typed](src/Samples/Typed/UiBoundCmdParam))*
 
 There may be times you need to use the XAML `CommandParameter` property. You then need to use Elmish.WPF’s `cmdParam`
 binding, which works exactly like `cmd` but where `exec` function accepts the command parameter as its first parameter.
@@ -446,7 +451,8 @@ There are two special bindings not yet covered.
 
 #### `subModelSelectedItem`
 
-*Relevant sample: SubModelSelectedItem - ([Dynamic](src/Samples/Dynamic/SubModelSelectedItem) | [Typed](src/Samples/Typed/SubModelSelectedItem))*
+*Relevant sample:
+SubModelSelectedItem - ([Dynamic](src/Samples/Dynamic/SubModelSelectedItem) | [Typed](src/Samples/Typed/SubModelSelectedItem))*
 
 The section on model normalization made it clear that it’s better to use IDs than complex objects in messages. This
 means that for bindings to the selected value of a `ListBox` or similar, you’ll likely have better luck using
@@ -615,27 +621,28 @@ that
 Choosing Your Binding Approach
 ------------------------------
 
-Elmish.WPF offers two approaches for creating bindings between your F# model and WPF views. Understanding when to use each approach will help you make the best choice for your application.
+Elmish.WPF offers two approaches for creating bindings between your F# model and WPF views. Understanding when to use
+each approach will help you make the best choice for your application.
 
 ### Dynamic Bindings vs Statically-Typed ViewModels
 
-| Aspect | Dynamic Bindings | Statically-Typed ViewModels |
-|--------|------------------|----------------------------|
-| **Syntax** | Functional, list-based | Object-oriented, property-based |
-| **Type Safety** | Runtime binding resolution | Compile-time binding validation |
-| **XAML Support** | Basic IntelliSense | Full IntelliSense and auto-completion |
-| **Design-time** | Limited design-time support | Rich design-time experience |
-| **Performance** | Good | Slightly better (direct property access) |
-| **Flexibility** | Very flexible, dynamic composition | More structured, explicit definitions |
-| **Learning Curve** | Familiar to functional programmers | Familiar to WPF/C# developers |
-| **Refactoring** | Manual updates needed | Automatic refactoring support |
+| Aspect             | Dynamic Bindings                   | Statically-Typed ViewModels              |
+|--------------------|------------------------------------|------------------------------------------|
+| **Syntax**         | Functional, list-based             | Object-oriented, property-based          |
+| **Type Safety**    | Runtime binding resolution         | Compile-time binding validation          |
+| **XAML Support**   | Basic IntelliSense                 | Full IntelliSense and auto-completion    |
+| **Design-time**    | Limited design-time support        | Rich design-time experience              |
+| **Performance**    | Good                               | Slightly better (direct property access) |
+| **Flexibility**    | Very flexible, dynamic composition | More structured, explicit definitions    |
+| **Learning Curve** | Familiar to functional programmers | Familiar to WPF/C# developers            |
+| **Refactoring**    | Manual updates needed              | Automatic refactoring support            |
 
 ### When to Choose Dynamic Bindings
 
 Choose **dynamic bindings** when:
 
 - **Rapid prototyping**: Quick iteration and experimentation
-- **Simple applications**: Small apps with few UI interactions  
+- **Simple applications**: Small apps with few UI interactions
 - **Functional preference**: You prefer functional composition over OOP
 - **Dynamic scenarios**: Bindings need to be created or modified at runtime
 - **MVU purists**: You want minimal view layer complexity
@@ -671,7 +678,7 @@ Both approaches use the same underlying MVU architecture, making migration strai
    ```F#
    // From: "CounterValue" |> Binding.oneWay (fun m -> m.Count)
    // To:
-   member _.CounterValue = 
+   member _.CounterValue =
        base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
    ```
 
@@ -683,7 +690,7 @@ Both approaches use the same underlying MVU architecture, making migration strai
        Binding.TwoWayT.id
        >> Binding.mapModel (fun m -> float m.StepSize)
        >> Binding.mapMsg (int >> SetStepSize)
-   
+
    member this.StepSize
        with get () = base.Get () stepSizeBinding
        and set (value) = base.Set (value) stepSizeBinding
@@ -707,13 +714,14 @@ Both approaches use the same underlying MVU architecture, making migration strai
 
 2. **Update program creation**:
    ```F#
-   // From: WpfProgram.mkSimpleT init update MyViewModel  
+   // From: WpfProgram.mkSimpleT init update MyViewModel
    // To:   WpfProgram.mkSimple init update bindings
    ```
 
 ### Mixed Approach
 
 You can use both approaches within the same application:
+
 - Use dynamic bindings for simple, frequently-changing views
 - Use typed ViewModels for complex, stable views
 - Convert between approaches as requirements evolve
@@ -762,18 +770,18 @@ A typical typed ViewModel follows this pattern:
 [<AllowNullLiteral>]
 type MyViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
-    
+
     // Default constructor for design-time support
     new() = MyViewModel(initialModel |> ViewModelArgs.simple)
-    
+
     // OneWay properties
-    member _.SomeValue = 
+    member _.SomeValue =
         base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.SomeValue))
-    
-    // Command properties  
-    member _.SomeCommand = 
+
+    // Command properties
+    member _.SomeCommand =
         base.Get () (Binding.CmdT.setAlways SomeMessage)
-    
+
     // TwoWay properties (see detailed examples below)
 ```
 
@@ -795,49 +803,52 @@ Example usage:
 
 ```F#
 // Simple one-way binding
-member _.CounterValue = 
+member _.CounterValue =
     base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
 
 // One-way binding with lazy evaluation
-member _.ExpensiveCalculation = 
-    base.Get () (Binding.OneWayT.id 
-                >> Binding.addLazy (=) 
+member _.ExpensiveCalculation =
+    base.Get () (Binding.OneWayT.id
+                >> Binding.addLazy (=)
                 >> Binding.mapModel calculateExpensiveValue)
 
 // Command binding
-member _.IncrementCommand = 
+member _.IncrementCommand =
     base.Get () (Binding.CmdT.setAlways Increment)
 
 // Conditional command binding
-member _.ResetCommand = 
+member _.ResetCommand =
     base.Get () (Binding.CmdT.set (fun m -> m.Count <> 0) Reset)
 ```
 
 #### Typed TwoWay Bindings
 
-TwoWay bindings in typed ViewModels require a specific pattern with getter and setter properties. This is crucial for proper WPF data binding:
+TwoWay bindings in typed ViewModels require a specific pattern with getter and setter properties. This is crucial for
+proper WPF data binding:
 
 ```F#
 [<AllowNullLiteral>]
 type CounterViewModel(args) =
     inherit ViewModelBase<Model, Msg>(args)
-    
+
     // Define the binding pipeline as a let-bound value
     let stepSizeBinding =
         Binding.TwoWayT.id
         >> Binding.addLazy (=)
         >> Binding.mapModel (fun m -> float m.StepSize)  // Convert from model type
         >> Binding.mapMsg (int >> SetStepSize)           // Convert to message type
-    
+
     // Implement property with explicit getter and setter
     member this.StepSize
         with get () = base.Get () stepSizeBinding
         and set (value) = base.Set (value) stepSizeBinding
 ```
 
-**Important**: The binding variable (`stepSizeBinding`) must be defined as a `let` binding inside the class, and both `get()` and `set()` must be implemented for TwoWay bindings to work correctly.
+**Important**: The binding variable (`stepSizeBinding`) must be defined as a `let` binding inside the class, and both
+`get()` and `set()` must be implemented for TwoWay bindings to work correctly.
 
-**Type Conversion**: Notice how we convert between model types (`int`) and WPF types (`float`) in the binding pipeline. This is common when binding to controls like `Slider` that use `float` values.
+**Type Conversion**: Notice how we convert between model types (`int`) and WPF types (`float`) in the binding pipeline.
+This is common when binding to controls like `Slider` that use `float` values.
 
 #### Typed TwoWay Bindings with Validation
 
@@ -849,7 +860,7 @@ let emailBinding =
     >> Binding.addLazy (=)
     >> Binding.mapModel (fun m -> m.Email)
     >> Binding.mapMsg SetEmail
-    >> Binding.addValidation (fun m -> 
+    >> Binding.addValidation (fun m ->
         if String.IsNullOrEmpty(m.Email) then ["Email is required"]
         elif not (m.Email.Contains("@")) then ["Invalid email format"]
         else [])
@@ -866,7 +877,7 @@ You can create strongly-typed SubModels in much the same way as you can create n
 takes in that `args` parameter, and use one of the following functions to create the binding:
 
 - `Binding.SubModelT.req` - Required sub-model
-- `Binding.SubModelT.opt` - Optional sub-model  
+- `Binding.SubModelT.opt` - Optional sub-model
 - `Binding.SubModelSeqUnkeyedT.id` - Collection without keys
 - `Binding.SubModelSeqKeyedT.id` - Collection with keys for efficient updates
 - `Binding.SubModelWinT.id` - Sub-model controlling window state
@@ -878,21 +889,21 @@ Example of typed sub-model binding:
 [<AllowNullLiteral>]
 type CounterViewModel(args) =
     inherit ViewModelBase<Counter.Model, Counter.Msg>(args)
-    
-    member _.Count = 
+
+    member _.Count =
         base.Get () (Binding.OneWayT.id >> Binding.mapModel (fun m -> m.Count))
-    
-    member _.Increment = 
+
+    member _.Increment =
         base.Get () (Binding.CmdT.setAlways Counter.Increment)
 
 // Parent ViewModel
-[<AllowNullLiteral>]  
+[<AllowNullLiteral>]
 type MainViewModel(args) =
     inherit ViewModelBase<App.Model, App.Msg>(args)
-    
-    member _.Counter = 
+
+    member _.Counter =
         base.Get () (Binding.SubModelT.req CounterViewModel
-                    >> Binding.mapModel (fun m -> m.Counter)  
+                    >> Binding.mapModel (fun m -> m.Counter)
                     >> Binding.mapMsg App.CounterMsg)
 ```
 
@@ -904,8 +915,8 @@ For collections of sub-models, use `SubModelSeqKeyedT.id`:
 [<AllowNullLiteral>]
 type CounterListViewModel(args) =
     inherit ViewModelBase<CounterList.Model, CounterList.Msg>(args)
-    
-    member _.Counters = 
+
+    member _.Counters =
         base.Get () (Binding.SubModelSeqKeyedT.id CounterViewModel (fun m -> m.Id)
                     >> Binding.mapModel (fun m -> m.Counters)
                     >> Binding.mapMsg (fun (id, msg) -> CounterMsg(id, msg)))
diff --git a/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj b/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj
index 1bf5a0e5..f9e1c622 100644
--- a/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj
+++ b/src/Samples/Dynamic/Navigation.Core/Navigation.Core.fsproj
@@ -6,17 +6,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="Program.fs"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.11.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/App.xaml b/src/Samples/Dynamic/Navigation/App.xaml
index 701e5572..fba42ab3 100644
--- a/src/Samples/Dynamic/Navigation/App.xaml
+++ b/src/Samples/Dynamic/Navigation/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
+  <Application.Resources>
+
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/App.xaml.cs b/src/Samples/Dynamic/Navigation/App.xaml.cs
index 36f1981e..591cfc9d 100644
--- a/src/Samples/Dynamic/Navigation/App.xaml.cs
+++ b/src/Samples/Dynamic/Navigation/App.xaml.cs
@@ -1,19 +1,19 @@
 using System;
 using System.Windows;
+using Elmish.WPF.Samples.Navigation;
 
-namespace Navigation
+namespace Navigation;
+
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            Activated += StartElmish;
-        }
+        Activated += StartElmish;
+    }
 
-        private void StartElmish(object sender, EventArgs e)
-        {
-            Activated -= StartElmish;
-            Elmish.WPF.Samples.Navigation.Program.main(MainWindow);
-        }
+    private void StartElmish(object sender, EventArgs e)
+    {
+        Activated -= StartElmish;
+        Program.main(MainWindow);
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs b/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs
index 9a1dfdee..89d5413e 100644
--- a/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs
+++ b/src/Samples/Dynamic/Navigation/CustomerView.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows.Controls;
 
-namespace Navigation
+namespace Navigation;
+
+public partial class CustomerView : UserControl
 {
-    public partial class CustomerView : UserControl
+    public CustomerView()
     {
-        public CustomerView()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs b/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs
index 013f6d82..f5a4ce43 100644
--- a/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs
+++ b/src/Samples/Dynamic/Navigation/DashboardView.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows.Controls;
 
-namespace Navigation
+namespace Navigation;
+
+public partial class DashboardView : UserControl
 {
-    public partial class DashboardView : UserControl
+    public DashboardView()
     {
-        public DashboardView()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs b/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs
index f81bcf03..d8296fd5 100644
--- a/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs
+++ b/src/Samples/Dynamic/Navigation/MainWindow.xaml.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace Navigation
+namespace Navigation;
+
+public partial class MainWindow : Window
 {
-    public partial class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Dynamic/Navigation/Navigation.csproj b/src/Samples/Dynamic/Navigation/Navigation.csproj
index ee4dbbbf..34ac211d 100644
--- a/src/Samples/Dynamic/Navigation/Navigation.csproj
+++ b/src/Samples/Dynamic/Navigation/Navigation.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Navigation.Core\Navigation.Core.fsproj" />
+    <ProjectReference Include="..\Navigation.Core\Navigation.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Samples/Dynamic/NewWindow/MainWindow.xaml b/src/Samples/Dynamic/NewWindow/MainWindow.xaml
index 77fb0fd7..dece2841 100644
--- a/src/Samples/Dynamic/NewWindow/MainWindow.xaml
+++ b/src/Samples/Dynamic/NewWindow/MainWindow.xaml
@@ -11,8 +11,7 @@
         mc:Ignorable="d"
         d:DataContext="{x:Static vm:AppModule.designVm}">
   <Window.Resources>
-    <ResourceDictionary>
-    </ResourceDictionary>
+    <ResourceDictionary />
   </Window.Resources>
   <StackPanel VerticalAlignment="Center">
     <TextBlock HorizontalAlignment="Center" FontWeight="Bold">Window 1</TextBlock>
diff --git a/src/Samples/Typed/Navigation.Core/Library.fs b/src/Samples/Typed/Navigation.Core/Library.fs
index 07b17bda..a942912e 100644
--- a/src/Samples/Typed/Navigation.Core/Library.fs
+++ b/src/Samples/Typed/Navigation.Core/Library.fs
@@ -86,14 +86,18 @@ module Main =
             match model.ActivePage with
             | Customer custModel ->
                 let updatedCustModel, cmd = Customer.update msg custModel
-                { model with ActivePage = Customer updatedCustModel },
+
+                { model with
+                    ActivePage = Customer updatedCustModel },
                 Cmd.map CustomerMessage cmd
             | _ -> model, Cmd.none
         | DashboardMessage msg ->
             match model.ActivePage with
             | Dashboard dashModel ->
                 let updatedDashModel, cmd = Dashboard.update msg dashModel
-                { model with ActivePage = Dashboard updatedDashModel },
+
+                { model with
+                    ActivePage = Dashboard updatedDashModel },
                 Cmd.map DashboardMessage cmd
             | _ -> model, Cmd.none
         | Navigate p ->
@@ -108,7 +112,7 @@ module Main =
                 Cmd.none
             | _ -> System.ArgumentOutOfRangeException() |> raise
 
-type MainViewModel(args) as this =
+type MainViewModel(args) =
     inherit ViewModelBase<Main.Model, Main.Message>(args)
 
     member this.Title = base.Get () (Binding.OneWayT.id >> Binding.mapModel _.Title)
diff --git a/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj b/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
index f8664f2c..8298762b 100644
--- a/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
+++ b/src/Samples/Typed/Navigation.Core/Navigation.Core.fsproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Library.fs" />
+    <Compile Include="Library.fs"/>
   </ItemGroup>
 
   <ItemGroup>
@@ -15,9 +15,9 @@
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
   </ItemGroup>
-  
+
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj" />
+    <ProjectReference Include="..\..\..\Elmish.WPF\Elmish.WPF.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Typed/Navigation/AssemblyInfo.cs b/src/Samples/Typed/Navigation/AssemblyInfo.cs
index cc29e7f7..4a05c7d4 100644
--- a/src/Samples/Typed/Navigation/AssemblyInfo.cs
+++ b/src/Samples/Typed/Navigation/AssemblyInfo.cs
@@ -1,10 +1,10 @@
 using System.Windows;
 
-[assembly:ThemeInfo(
-    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
-                                                //(used if a resource is not found in the page,
-                                                // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
-                                                //(used if a resource is not found in the page,
-                                                // app, or any theme specific resource dictionaries)
-)]
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page,
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page,
+    // app, or any theme specific resource dictionaries)
+)]
\ No newline at end of file
diff --git a/src/Samples/Typed/Navigation/MainWindow.xaml.cs b/src/Samples/Typed/Navigation/MainWindow.xaml.cs
index 72fd5580..7cceb974 100644
--- a/src/Samples/Typed/Navigation/MainWindow.xaml.cs
+++ b/src/Samples/Typed/Navigation/MainWindow.xaml.cs
@@ -1,18 +1,9 @@
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace Navigation;
 
 /// <summary>
-/// Interaction logic for MainWindow.xaml
+///     Interaction logic for MainWindow.xaml
 /// </summary>
 public partial class MainWindow : Window
 {
diff --git a/src/Samples/Typed/Navigation/Navigation.csproj b/src/Samples/Typed/Navigation/Navigation.csproj
index c3038f41..9953169f 100644
--- a/src/Samples/Typed/Navigation/Navigation.csproj
+++ b/src/Samples/Typed/Navigation/Navigation.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Navigation.Core\Navigation.Core.fsproj" />
+    <ProjectReference Include="..\Navigation.Core\Navigation.Core.fsproj"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Typed/NewWindow.Core/Window2.fs b/src/Samples/Typed/NewWindow.Core/Window2.fs
index ac2f6c91..51d3ac58 100644
--- a/src/Samples/Typed/NewWindow.Core/Window2.fs
+++ b/src/Samples/Typed/NewWindow.Core/Window2.fs
@@ -90,11 +90,8 @@ type Window2ViewModel(args) =
             (Binding.OneWayT.id
              >> Binding.mapModel (fun m -> m.ConfirmState = Some ConfirmState.Close |> Bool.toVisibilityCollapsed))
 
-    member _.Submit =
-        base.Get () (Binding.CmdT.setAlways (InOut.In Submit))
+    member _.Submit = base.Get () (Binding.CmdT.setAlways (InOut.In Submit))
 
-    member _.Cancel =
-        base.Get () (Binding.CmdT.setAlways (InOut.In Cancel))
+    member _.Cancel = base.Get () (Binding.CmdT.setAlways (InOut.In Cancel))
 
-    member _.Close =
-        base.Get () (Binding.CmdT.setAlways (InOut.In Close))
\ No newline at end of file
+    member _.Close = base.Get () (Binding.CmdT.setAlways (InOut.In Close))
\ No newline at end of file
diff --git a/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs b/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
index 1cf6ac6f..c21ee7cb 100644
--- a/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
+++ b/src/Samples/Typed/SubModelSelectedItem.Core/Program.fs
@@ -15,7 +15,7 @@ let init () =
     { Entities = [ 0..10 ] |> List.map (fun i -> { Id = i; Name = sprintf "Entity %i" i })
       Selected = Some 4 }
 
-type Msg = 
+type Msg =
     | Select of int option
     | SelectRandom
 
@@ -26,7 +26,9 @@ let update msg m =
         if m.Entities.Length > 0 then
             let randomIndex = Random().Next(m.Entities.Length)
             let randomEntity = m.Entities.[randomIndex]
-            { m with Selected = Some randomEntity.Id }
+
+            { m with
+                Selected = Some randomEntity.Id }
         else
             m
 
diff --git a/src/Samples/Typed/Validation/MainWindow.xaml b/src/Samples/Typed/Validation/MainWindow.xaml
index 74a8bc2c..a933c06e 100644
--- a/src/Samples/Typed/Validation/MainWindow.xaml
+++ b/src/Samples/Typed/Validation/MainWindow.xaml
@@ -35,7 +35,8 @@
   <StackPanel HorizontalAlignment="Center" Margin="0,25,0,0">
     <StackPanel Orientation="Horizontal">
       <TextBlock Text="Update count:         " />
-      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount, Mode=OneWay}" Width="200"
+      <TextBox IsEnabled="false" Style="{StaticResource textBoxInError}" Text="{Binding UpdateCount, Mode=OneWay}"
+               Width="200"
                Margin="0,5,0,25" />
     </StackPanel>
     <StackPanel Orientation="Horizontal">