diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/CanvasWPFView.xaml b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/CanvasWPFView.xaml
index 08912881e..729c4f9b5 100644
--- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/CanvasWPFView.xaml
+++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/CanvasWPFView.xaml
@@ -2,6 +2,7 @@
         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:s="clr-namespace:System;assembly=mscorlib"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CanvasWPF2_ItemTemplateSelector"
         xmlns:mvvm="clr-namespace:CanvasWPF2_ItemTemplateSelector.ViewModel" 
@@ -131,7 +132,7 @@
         </DataTemplate>
         <ds:RessourceSelector x:Key="dsResourceSelector">
             <ds:RessourceSelector.ItemKeys>
-                <ds:KeyString Key="dtRectangle"/>
+                <s:String>dtRectangle</s:String>
                 <ds:KeyString Key="dtCircle"/>
                 <ds:KeyString Key="dtHexagon"/>
                 <ds:KeyString Key="dtTorus"/>
@@ -161,7 +162,6 @@
                     <Style TargetType="ContentPresenter">
                         <Setter Property="Canvas.Left" Value="{Binding X}"/>
                         <Setter Property="Canvas.Top" Value="{Binding Y}"/>
-                        
                     </Style>
                 </ItemsControl.ItemContainerStyle>
                 <ItemsControl.ItemsPanel>
diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs
index 876e942a9..5e54f54fe 100644
--- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs
+++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs
@@ -43,6 +43,7 @@ public class KeyString
         /// </summary>
         /// <value>The key.</value>
         public string Key { get; set; } = "";
+        override public string ToString() => Key;
     }
 
     /// <summary>
@@ -56,7 +57,7 @@ public class RessourceSelector : DataTemplateSelector
         /// Gets or sets the item keys.
         /// </summary>
         /// <value>The item keys.</value>
-        public List<KeyString> ItemKeys { get; set; } = new List<KeyString>();
+        public List<object> ItemKeys { get; set; } = new List<object>();
         /// <summary>
         /// When overridden in a derived class, returns a <see cref="T:System.Windows.DataTemplate" /> based on custom logic.
         /// </summary>
@@ -67,7 +68,7 @@ public class RessourceSelector : DataTemplateSelector
         {
             if (container is FrameworkElement element && item is IVisualObject op && op.sType < ItemKeys.Count)
             {
-                return element.FindResource(ItemKeys[op.sType].Key) as DataTemplate;
+                return element.FindResource(ItemKeys[op.sType].ToString()) as DataTemplate;
             }
             else return null;
         }
diff --git a/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj b/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj
index 0b77f7fba..997ede009 100644
--- a/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj
+++ b/CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj
@@ -37,4 +37,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+  </ItemGroup>
+
 </Project>
diff --git a/CSharpBible/Graphics/Graphics.sln b/CSharpBible/Graphics/Graphics.sln
index 1f7fe2223..3d63a3173 100644
--- a/CSharpBible/Graphics/Graphics.sln
+++ b/CSharpBible/Graphics/Graphics.sln
@@ -69,7 +69,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_ImageHandling_net", "M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_ImgGrid2", "MVVM_Converter_ImgGrid2\MVVM_Converter_ImgGrid2.csproj", "{F2CA5A63-D15B-4DE8-96B9-2089E64E5571}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "All_Graphics_net", "All_Graphics\All_Graphics_net.csproj", "{D9D4BDBD-9473-40DD-804E-92A63643D5DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "All_Graphics_net", "All_Graphics\All_Graphics_net.csproj", "{D9D4BDBD-9473-40DD-804E-92A63643D5DF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polyline", "Polyline\Polyline.csproj", "{26EC1A76-255A-42E5-9CF5-FC735660858D}"
 EndProject
@@ -77,6 +77,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Polyline2", "Polyline\Polyl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polyline_net", "Polyline\Polyline_net.csproj", "{F82089E3-517C-47E9-B56E-656EC4047C97}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlotgraphWPF", "PlotgraphWPF\PlotgraphWPF.csproj", "{023EEB88-190E-4F3D-A887-D3C39517DBCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Lines_on_Grid", "MVVM_Lines_on_Grid\MVVM_Lines_on_Grid.csproj", "{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TitleGen", "TitleGen\TitleGen.csproj", "{3C1358B1-9405-4891-BF70-3E6C2116C356}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TitleGen2", "TitleGen2\TitleGen2.csproj", "{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_DrawGrid3_NonLin", "MVVM_Converter_DrawGrid3_NonLin\MVVM_Converter_DrawGrid3_NonLin.csproj", "{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_Grid3_NonLin", "MVVM_Converter_Grid3_NonLin\MVVM_Converter_Grid3_NonLin.csproj", "{90581608-341A-4117-A12F-096D92977548}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_DynamicShape", "MVVM_DynamicShape\MVVM_DynamicShape.csproj", "{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolySpline", "PolySpline\PolySpline.csproj", "{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolySpline_net", "PolySpline\PolySpline_net.csproj", "{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -195,6 +213,42 @@ Global
 		{F82089E3-517C-47E9-B56E-656EC4047C97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F82089E3-517C-47E9-B56E-656EC4047C97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F82089E3-517C-47E9-B56E-656EC4047C97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C1358B1-9405-4891-BF70-3E6C2116C356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C1358B1-9405-4891-BF70-3E6C2116C356}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C1358B1-9405-4891-BF70-3E6C2116C356}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C1358B1-9405-4891-BF70-3E6C2116C356}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90581608-341A-4117-A12F-096D92977548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90581608-341A-4117-A12F-096D92977548}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90581608-341A-4117-A12F-096D92977548}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90581608-341A-4117-A12F-096D92977548}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Images.Designer.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Images.Designer.cs
similarity index 84%
rename from CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Images.Designer.cs
rename to CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Images.Designer.cs
index a3a3f5d0d..ac2ceb2d8 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Images.Designer.cs
+++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Images.Designer.cs
@@ -1,73 +1,63 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
-//
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MVVM_Converter_DrawGrid3_NonLin.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    /// </summary>
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Images {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Images() {
-        }
-        
-        /// <summary>
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MVVM_Converter_DrawGrid3_NonLin.Properties.Images", typeof(Images).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
-        internal static byte[] BIG_original {
-            get {
-                object obj = ResourceManager.GetObject("BIG_original", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MVVM_Converter_CTDrawGrid.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Images {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Images() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MVVM_Converter_CTDrawGrid.Properties.Images", typeof(Images).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Images.resx b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Images.resx
new file mode 100644
index 000000000..48489871d
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Properties/Images.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModel/MainWindowViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModel/MainWindowViewModel.cs
new file mode 100644
index 000000000..ead35f71c
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/ViewModel/MainWindowViewModel.cs
@@ -0,0 +1,55 @@
+using CommunityToolkit.Mvvm.Input;
+using MVVM.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MVVM_Converter_CTDrawGrid.ViewModel
+{
+    /// <summary>
+    /// Class MainWindowViewModel.
+    /// Implements the <see cref="BaseViewModel" />
+    /// </summary>
+    /// <seealso cref="BaseViewModel" />
+    public partial class MainWindowViewModel:BaseViewModelCT
+    {
+        /// <summary>
+        /// Gets or sets the show client.
+        /// </summary>
+        /// <value>The show client.</value>
+        public Func<string, BaseViewModel?>? ShowClient { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainWindowViewModel"/> class.
+        /// </summary>
+        public MainWindowViewModel()
+        {
+
+        }
+
+        /// <summary>
+        /// Gets or sets the load level command.
+        /// </summary>
+        /// <value>The load level command.</value>
+        [RelayCommand]
+        private void LoadLevel() 
+            => Model.Model.LoadLevel();
+        /// <summary>
+        /// Gets or sets the next level command.
+        /// </summary>
+        /// <value>The next level command.</value>
+        [RelayCommand]
+        private void NextLevel() 
+            => Model.Model.NextLevel();
+        /// <summary>
+        /// Gets or sets the previous level command.
+        /// </summary>
+        /// <value>The previous level command.</value>
+        [RelayCommand]
+        private void PrevLevel() 
+            => Model.Model.PrevLevel();
+
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/Properties/Images.Designer.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/Properties/Images.Designer.cs
new file mode 100644
index 000000000..a9f8094a6
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/Properties/Images.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MVVM_Converter_CTDrawGrid2.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Images {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Images() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MVVM_Converter_CTDrawGrid2.Properties.Images", typeof(Images).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Images.resx b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/Properties/Images.resx
similarity index 95%
rename from CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Images.resx
rename to CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/Properties/Images.resx
index 43ef4ed7f..e0762f49a 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Images.resx
+++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/Properties/Images.resx
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="BIG_original" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\big_original.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="BIG_original" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BIG_original.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/ViewModel/MainWindowViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/ViewModel/MainWindowViewModel.cs
new file mode 100644
index 000000000..d908497a2
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid2/ViewModel/MainWindowViewModel.cs
@@ -0,0 +1,65 @@
+// ***********************************************************************
+// Assembly         : MVVM_Converter_CTDrawGrid2
+// Author           : Mir
+// Created          : 08-21-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 09-09-2022
+// ***********************************************************************
+// <copyright file="MainWindowViewModel.cs" company="JC-Soft">
+//     (c) by Joe Care 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using CommunityToolkit.Mvvm.Input;
+using MVVM.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MVVM_Converter_CTDrawGrid2.ViewModel
+{
+    /// <summary>
+    /// Class MainWindowViewModel.
+    /// Implements the <see cref="BaseViewModel" />
+    /// </summary>
+    /// <seealso cref="BaseViewModel" />
+    public partial class MainWindowViewModel : BaseViewModelCT
+    {
+        /// <summary>
+        /// Gets or sets the show client.
+        /// </summary>
+        /// <value>The show client.</value>
+        public Func<string, BaseViewModel?>? ShowClient { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainWindowViewModel" /> class.
+        /// </summary>
+        public MainWindowViewModel()
+        { }
+
+        /// <summary>
+        /// Gets or sets the load level command.
+        /// </summary>
+        /// <value>The load level command.</value>
+        [RelayCommand]
+        private void LoadLevel()
+            => Model.Model.LoadLevel();
+        /// <summary>
+        /// Gets or sets the next level command.
+        /// </summary>
+        /// <value>The next level command.</value>
+        [RelayCommand]
+        private void NextLevel()
+            => Model.Model.NextLevel();
+        /// <summary>
+        /// Gets or sets the previous level command.
+        /// </summary>
+        /// <value>The previous level command.</value>
+        [RelayCommand]
+        private void PrevLevel()
+            => Model.Model.PrevLevel();
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/ViewModel/MainWindowViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/ViewModel/MainWindowViewModel.cs
new file mode 100644
index 000000000..ae416855d
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_CTImgGrid/ViewModel/MainWindowViewModel.cs
@@ -0,0 +1,23 @@
+using CommunityToolkit.Mvvm.Input;
+using MVVM.ViewModel;
+using System;
+
+namespace MVVM_Converter_CTImgGrid.ViewModel
+{
+    public partial class MainWindowViewModel:BaseViewModelCT
+    {
+        public Func<string, BaseViewModel?>? ShowClient { get; set; }
+
+        public MainWindowViewModel()
+        { }
+
+        [RelayCommand]
+        private void LoadLevel() => Model.Model.LoadLevel();
+
+        [RelayCommand]
+        private void NextLevel() => Model.Model.NextLevel();
+
+        [RelayCommand]
+        private void PrevLevel() => Model.Model.PrevLevel();
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MVVM_Converter_DrawGrid3_NonLin.csproj b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MVVM_Converter_DrawGrid3_NonLin.csproj
index ea5ee6953..99621304e 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MVVM_Converter_DrawGrid3_NonLin.csproj
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MVVM_Converter_DrawGrid3_NonLin.csproj
@@ -10,8 +10,8 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 	<ItemGroup>
 	  <None Remove="Resources\BIG_original.png" />
-	  <None Remove="View\BIG_original.png" />
-	  <None Remove="View\WernerTiles.png" />
+	  <None Remove="Views\BIG_original.png" />
+	  <None Remove="Views\WernerTiles.png" />
 	</ItemGroup>
 	<ItemGroup>
 	  <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
@@ -24,16 +24,16 @@
 	  <ProjectReference Include="$(UpDir)\Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Update="Properties\Images.Designer.cs">
+	  <Compile Update="Properties\Resources.Designer.cs">
+	    <DependentUpon>Resources.resx</DependentUpon>
 	    <DesignTime>True</DesignTime>
 	    <AutoGen>True</AutoGen>
-	    <DependentUpon>Images.resx</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 	<ItemGroup>
-	  <EmbeddedResource Update="Properties\Images.resx">
-	    <Generator>ResXFileCodeGenerator</Generator>
-	    <LastGenOutput>Images.Designer.cs</LastGenOutput>
+	  <EmbeddedResource Update="Properties\Resources.resx">
+	    <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+	    <Generator>PublicResXFileCodeGenerator</Generator>
 	  </EmbeddedResource>
 	</ItemGroup>
 
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml
index a43ac157c..4ad91a519 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml
@@ -6,29 +6,8 @@
         xmlns:local="clr-namespace:MVVM_Converter_DrawGrid3_NonLin"
         xmlns:mvvm="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.ViewModel"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800"
-        Loaded="Window_Loaded">
-    <Window.DataContext>
-        <mvvm:MainWindowViewModel/>
-    </Window.DataContext>
+        Title="MainWindow" Height="450" Width="800">
     <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="10*"/>
-            <ColumnDefinition Width="640*"/>
-            <ColumnDefinition Width="10*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="480*"/>
-            <RowDefinition Height="80*"/>
-        </Grid.RowDefinitions>
-        <Viewbox Grid.Row="1" Grid.Column="1"  >
-            <Frame x:Name="Client" Width="640" Height="480" NavigationUIVisibility="Hidden" Loaded="Frame_Loaded" Source="/View/PlotFrame.xaml" />
-        </Viewbox>
-        <WrapPanel Grid.Row="2" Grid.ColumnSpan="3" Margin="2">
-            <Button Content="Load Level" Height="40" Width="200" Margin="5" Command="{Binding LoadLevelCommand}"/>
-            <Button Content="Pevious Level" Height="40" Width="200" Margin="5" Command="{Binding PrevLevelCommand}"/>
-            <Button Content="Next Level" Height="40" Width="200" Margin="5" Command="{Binding NextLevelCommand}"/>
-        </WrapPanel>
+        <Frame NavigationUIVisibility="Hidden" Source="/Views/DrawGridView.xaml" />
     </Grid>
 </Window>
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml.cs
index d67541aa9..4e0078171 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml.cs
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/MainWindow.xaml.cs
@@ -30,49 +30,5 @@ public MainWindow()
         {
             InitializeComponent();
         }
-
-        /// <summary>
-        /// Handles the Loaded event of the Window control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (DataContext is MainWindowViewModel vm)
-            {
-                vm.ShowClient = ShowClientinFrame;
-            }
-        }
-
-        /// <summary>
-        /// Handles the Loaded event of the Frame control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
-        private void Frame_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (DataContext is MainWindowViewModel vm)
-            {
-//                vm.FrameDataContext = e.Source as Frame
-            }
-        }
-
-        /// <summary>
-        /// Shows the clientin frame.
-        /// </summary>
-        /// <param name="arg">The argument.</param>
-        /// <returns>BaseViewModel.</returns>
-        private BaseViewModel? ShowClientinFrame(string arg)
-        {
-            try
-            {
-                this.Client.Source = new Uri(arg);
-                return Client.DataContext as BaseViewModel;
-            }
-            catch(Exception) 
-            {
-                return null;
-            };
-        }
     }
 }
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.Designer.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..94e512fa6
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.Designer.cs
@@ -0,0 +1,139 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MVVM_Converter_DrawGrid3_NonLin.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MVVM_Converter_DrawGrid3_NonLin.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Example: orthogonal grid of drawings-tiles for Sokoban ähnelt.
+        /// </summary>
+        public static string Description {
+            get {
+                return ResourceManager.GetString("Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die &lt;Page x:Class=&quot;MVVM_Converter_DrawGrid3_NonLin.Views.PlotFrame&quot;
+        ///      xmlns=&quot;http://schemas.microsoft.com/winfx/2006/xaml/presentation&quot;
+        ///      xmlns:x=&quot;http://schemas.microsoft.com/winfx/2006/xaml&quot;
+        ///      xmlns:mc=&quot;http://schemas.openxmlformats.org/markup-compatibility/2006&quot; 
+        ///      xmlns:d=&quot;http://schemas.microsoft.com/expression/blend/2008&quot; 
+        ///      xmlns:local=&quot;clr-namespace:MVVM_Converter_DrawGrid3_NonLin.Views&quot;
+        ///      xmlns:vc=&quot;clr-namespace:MVVM_Converter_DrawGrid3_NonLin.Views.Converter&quot;
+        ///      xmlns [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
+        /// </summary>
+        public static string PlotFrameView {
+            get {
+                return ResourceManager.GetString("PlotFrameView", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die // ***********************************************************************
+        ///// Assembly         : MVVM_Converter_DrawGrid3_NonLin
+        ///// Author           : Mir
+        ///// Created          : 09-02-2022
+        /////
+        ///// Last Modified By : Mir
+        ///// Last Modified On : 09-04-2022
+        ///// ***********************************************************************
+        ///// &lt;copyright file=&quot;PlotFrameViewModel.cs&quot; company=&quot;JC-Soft&quot;&gt;
+        /////     (c) by Joe Care 2022
+        ///// &lt;/copyright&gt;
+        ///// &lt;summary&gt;&lt;/summary&gt;
+        ///// ******************************************* [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
+        /// </summary>
+        public static string PlotFrameViewModel {
+            get {
+                return ResourceManager.GetString("PlotFrameViewModel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die MVVM Graphics: Draw-grid ähnelt.
+        /// </summary>
+        public static string Title {
+            get {
+                return ResourceManager.GetString("Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die // ***********************************************************************
+        ///// Assembly         : MVVM_Converter_DrawGrid3_NonLin
+        ///// Author           : Mir
+        ///// Created          : 09-02-2022
+        /////
+        ///// Last Modified By : Mir
+        ///// Last Modified On : 09-04-2022
+        ///// ***********************************************************************
+        ///// &lt;copyright file=&quot;WindowPortToTileDisplay.cs&quot; company=&quot;JC-Soft&quot;&gt;
+        /////     (c) by Joe Care 2022
+        ///// &lt;/copyright&gt;
+        ///// &lt;summary&gt;&lt;/summary&gt;
+        ///// ************************************** [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
+        /// </summary>
+        public static string WindowPortToTileDisplayConverter {
+            get {
+                return ResourceManager.GetString("WindowPortToTileDisplayConverter", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx
new file mode 100644
index 000000000..618b2c0cf
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Properties/Resources.resx
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Description" xml:space="preserve">
+    <value>Example: orthogonal grid of drawings-tiles for Sokoban</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="PlotFrameView" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Views\PlotFrame.xaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="PlotFrameViewModel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\ViewModel\PlotFrameViewModel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>MVVM Graphics: Draw-grid</value>
+  </data>
+  <data name="WindowPortToTileDisplayConverter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Views\Converter\WindowPortToTileDisplay.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/MainWindowViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/DrawGridViewModel.cs
similarity index 77%
rename from CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/MainWindowViewModel.cs
rename to CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/DrawGridViewModel.cs
index 99d83de52..5d1491894 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/MainWindowViewModel.cs
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/DrawGridViewModel.cs
@@ -1,59 +1,64 @@
-// ***********************************************************************
-// Assembly         : MVVM_Converter_DrawGrid3_NonLin
-// Author           : Mir
-// Created          : 09-02-2022
-//
-// Last Modified By : Mir
-// Last Modified On : 09-04-2022
-// ***********************************************************************
-// <copyright file="MainWindowViewModel.cs" company="JC-Soft">
-//     (c) by Joe Care 2022
-// </copyright>
-// <summary></summary>
-// ***********************************************************************
-using MVVM.ViewModel;
-using System;
-
-namespace MVVM_Converter_DrawGrid3_NonLin.ViewModel
-{
-    /// <summary>
-    /// Class MainWindowViewModel.
-    /// Implements the <see cref="BaseViewModel" />
-    /// </summary>
-    /// <seealso cref="BaseViewModel" />
-    public class MainWindowViewModel:BaseViewModel
-    {
-        /// <summary>
-        /// Gets or sets the show client.
-        /// </summary>
-        /// <value>The show client.</value>
-        public Func<string, BaseViewModel?>? ShowClient { get; set; }
-
-        /// <summary>
-        /// Gets or sets the load level command.
-        /// </summary>
-        /// <value>The load level command.</value>
-        public DelegateCommand LoadLevelCommand { get; set; } = new DelegateCommand((o) => Model.Model.LoadLevel());
-        /// <summary>
-        /// Gets or sets the next level command.
-        /// </summary>
-        /// <value>The next level command.</value>
-        public DelegateCommand NextLevelCommand { get; set; } = new DelegateCommand((o) => Model.Model.NextLevel());
-        /// <summary>
-        /// Gets or sets the previous level command.
-        /// </summary>
-        /// <value>The previous level command.</value>
-        public DelegateCommand PrevLevelCommand { get; set; } = new DelegateCommand((o) => Model.Model.PrevLevel());
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MainWindowViewModel"/> class.
-        /// </summary>
-        public MainWindowViewModel()
-        {
-
-        }
-
-
-
-    }
-}
+// ***********************************************************************
+// Assembly         : MVVM_Converter_DrawGrid3_NonLin
+// Author           : Mir
+// Created          : 09-02-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 09-04-2022
+// ***********************************************************************
+// <copyright file="DrawGridViewModel.cs" company="JC-Soft">
+//     (c) by Joe Care 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using MVVM.ViewModel;
+using System;
+using System.Reflection;
+
+namespace MVVM_Converter_DrawGrid3_NonLin.ViewModel
+{
+    /// <summary>
+    /// Class DrawGridViewModel.
+    /// Implements the <see cref="BaseViewModel" />
+    /// </summary>
+    /// <seealso cref="BaseViewModel" />
+    public class DrawGridViewModel:BaseViewModel
+    {
+        /// <summary>
+        /// Gets or sets the show client.
+        /// </summary>
+        /// <value>The show client.</value>
+        public Func<string, BaseViewModel?>? ShowClient { get; set; }
+
+        /// <summary>
+        /// Gets or sets the load level command.
+        /// </summary>
+        /// <value>The load level command.</value>
+        public DelegateCommand LoadLevelCommand { get; set; } = new DelegateCommand((o) => Model.Model.LoadLevel());
+        /// <summary>
+        /// Gets or sets the next level command.
+        /// </summary>
+        /// <value>The next level command.</value>
+        public DelegateCommand NextLevelCommand { get; set; } = new DelegateCommand((o) => Model.Model.NextLevel());
+        /// <summary>
+        /// Gets or sets the previous level command.
+        /// </summary>
+        /// <value>The previous level command.</value>
+        public DelegateCommand PrevLevelCommand { get; set; } = new DelegateCommand((o) => Model.Model.PrevLevel());
+
+        /// <summary>Gets the plot frame source.</summary>
+        /// <value>The plot frame source.</value>
+        public string PlotFrameSource => $"/{Assembly.GetExecutingAssembly().GetName().Name};component/Views/PlotFrame.xaml";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DrawGridViewModel"/> class.
+        /// </summary>
+        public DrawGridViewModel()
+        {
+
+        }
+
+
+
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/PlotFrameViewModel.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/PlotFrameViewModel.cs
index d115fadf6..380bab2c0 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/PlotFrameViewModel.cs
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/ViewModel/PlotFrameViewModel.cs
@@ -124,12 +124,12 @@ private void ModelPropertyChanged(object? sender, (string, object, object) e)
                         result[i].destination = new Point(i % ld.lSize.Width, i / ld.lSize.Width);
                     result[i].tileType = (ld.fields[i])switch {
                         FieldDef.Player =>1,
-                        FieldDef.Stone => 4,
-                        FieldDef.StoneInDest => 5,
-                        FieldDef.Destination =>6,
-                        FieldDef.Wall =>7,
-                        FieldDef.Empty =>8,
-                        _ =>8
+                        FieldDef.Stone => 5,
+                        FieldDef.StoneInDest => 6,
+                        FieldDef.Destination =>7,
+                        FieldDef.Wall =>8,
+                        FieldDef.Empty =>0,
+                        _ =>0
                     };
                 }
                 Tiles = result;
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/Converter/WindowPortToTileDisplay.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/Converter/WindowPortToTileDisplay.cs
similarity index 94%
rename from CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/Converter/WindowPortToTileDisplay.cs
rename to CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/Converter/WindowPortToTileDisplay.cs
index b0cd64b7e..80f408ff8 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/Converter/WindowPortToTileDisplay.cs
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/Converter/WindowPortToTileDisplay.cs
@@ -1,110 +1,109 @@
-// ***********************************************************************
-// Assembly         : MVVM_Converter_DrawGrid3_NonLin
-// Author           : Mir
-// Created          : 09-02-2022
-//
-// Last Modified By : Mir
-// Last Modified On : 09-04-2022
-// ***********************************************************************
-// <copyright file="WindowPortToTileDisplay.cs" company="JC-Soft">
-//     (c) by Joe Care 2022
-// </copyright>
-// <summary></summary>
-// ***********************************************************************
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Windows.Media;
-using System.Windows.Data;
-using MVVM_Converter_DrawGrid3_NonLin.ViewModel;
-using System.Collections.ObjectModel;
-using System.Windows;
-
-namespace MVVM_Converter_DrawGrid3_NonLin.View.Converter
-{
-    /// <summary>
-    /// Class WindowPortToTileDisplay.
-    /// Implements the <see cref="IValueConverter" />
-    /// </summary>
-    /// <seealso cref="IValueConverter" />
-    public class WindowPortToTileDisplay : IValueConverter
-    {
-        /// <summary>
-        /// Gets or sets the size of the window.
-        /// </summary>
-        /// <value>The size of the window.</value>
-        public System.Windows.Size WindowSize { get; set; } = new System.Windows.Size(600,600);
-        /// <summary>
-        /// Gets or sets the brushes.
-        /// </summary>
-        /// <value>The brushes.</value>
-        public List<Brush> brushes { get; set; } = new List<Brush> {};
-        /// <summary>
-        /// Gets or sets the background.
-        /// </summary>
-        /// <value>The background.</value>
-        public Brush background { get; set; } = Brushes.DarkBlue;
-        /// <summary>
-        /// Gets or sets the size of the tile.
-        /// </summary>
-        /// <value>The size of the tile.</value>
-        public System.Windows.Size TileSize { get; set; } = new System.Windows.Size(32, 32);
-
-        /// <summary>
-        /// Converts a value.
-        /// </summary>
-        /// <param name="value">The value produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value. If the method returns <see langword="null" />, the valid null value is used.</returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            //int w;
-            switch (value)
-            {
-                case SWindowPort c when parameter is string s:
-                    System.Drawing.Size dSize = System.Drawing.Size.Empty;
-                    if (int.TryParse(s, out var w))
-                        dSize = new System.Drawing.Size(w, w);
-                    else if (s.Contains(";"))
-                    {
-                        var aS = s.Split(";");
-                        if (int.TryParse(aS[0], out var x) && int.TryParse(aS[1], out var y))
-                            dSize = new System.Drawing.Size(x, y);
-                    }
-                        
-                    ObservableCollection<FrameworkElement> result = new ObservableCollection<FrameworkElement>();
-
-
-                    for (var i = 0; i < c.tiles.Length; i++)
-                    {
-                        FrameworkElement l = new System.Windows.Shapes.Rectangle()
-                        {
-                            Width = TileSize.Width,
-                            Height = TileSize.Height,
-                            RenderTransform = new TranslateTransform(c.tiles[i].position.X * dSize.Width, c.tiles[i].position.Y * dSize.Height),
-                            Fill = brushes[c.tiles.Length == 0? i % brushes.Count: c.tiles[i].tileType]
-                        };
-                        result.Add(l);
-                    }
-                    return result;
-                default: return new ObservableCollection<FrameworkElement>();
-            }
-        }
-
-        /// <summary>
-        /// Converts a value.
-        /// </summary>
-        /// <param name="value">The value that is produced by the binding target.</param>
-        /// <param name="targetType">The type to convert to.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>A converted value. If the method returns <see langword="null" />, the valid null value is used.</returns>
-        /// <exception cref="System.NotImplementedException"></exception>
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
+// ***********************************************************************
+// Assembly         : MVVM_Converter_DrawGrid3_NonLin
+// Author           : Mir
+// Created          : 09-02-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 09-04-2022
+// ***********************************************************************
+// <copyright file="WindowPortToTileDisplay.cs" company="JC-Soft">
+//     (c) by Joe Care 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Media;
+using System.Windows.Data;
+using MVVM_Converter_DrawGrid3_NonLin.ViewModel;
+using System.Collections.ObjectModel;
+using System.Windows;
+
+namespace MVVM_Converter_DrawGrid3_NonLin.Views.Converter
+{
+    /// <summary>
+    /// Class WindowPortToTileDisplay.
+    /// Implements the <see cref="IValueConverter" />
+    /// </summary>
+    /// <seealso cref="IValueConverter" />
+    public class WindowPortToTileDisplay : IValueConverter
+    {
+        /// <summary>
+        /// Gets or sets the size of the window.
+        /// </summary>
+        /// <value>The size of the window.</value>
+        public System.Windows.Size WindowSize { get; set; } = new System.Windows.Size(600,600);
+        /// <summary>
+        /// Gets or sets the brushes.
+        /// </summary>
+        /// <value>The brushes.</value>
+        public List<Brush> brushes { get; set; } = new List<Brush> {};
+        /// <summary>
+        /// Gets or sets the background.
+        /// </summary>
+        /// <value>The background.</value>
+        public Brush background { get; set; } = Brushes.DarkBlue;
+        /// <summary>
+        /// Gets or sets the size of the tile.
+        /// </summary>
+        /// <value>The size of the tile.</value>
+        public System.Windows.Size TileSize { get; set; } = new System.Windows.Size(32, 32);
+
+        /// <summary>
+        /// Converts a value.
+        /// </summary>
+        /// <param name="value">The value produced by the binding source.</param>
+        /// <param name="targetType">The type of the binding target property.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>A converted value. If the method returns <see langword="null" />, the valid null value is used.</returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            //int w;
+            switch (value)
+            {
+                case SWindowPort c when parameter is string s:
+                    System.Drawing.Size dSize = System.Drawing.Size.Empty;
+                    if (int.TryParse(s, out var w))
+                        dSize = new System.Drawing.Size(w, w);
+                    else if (s.Contains(";"))
+                    {
+                        var aS = s.Split(';');
+                        if (int.TryParse(aS[0], out var x) && int.TryParse(aS[1], out var y))
+                            dSize = new System.Drawing.Size(x, y);
+                    }
+                        
+                    ObservableCollection<FrameworkElement> result = new ObservableCollection<FrameworkElement>();
+
+                    for (var i = 0; i < c.tiles.Length; i++)
+                    {
+                        FrameworkElement l = new System.Windows.Shapes.Rectangle()
+                        {
+                            Width = TileSize.Width,
+                            Height = TileSize.Height,
+                            RenderTransform = new TranslateTransform((c.tiles[i].position.X*2 + (c.tiles[i].position.Y % 2)) * (dSize.Width /2), c.tiles[i].position.Y * dSize.Height),
+                            Fill = brushes[c.tiles.Length == 0? i % brushes.Count: c.tiles[i].tileType]
+                        };
+                        result.Add(l);
+                    }
+                    return result;
+                default: return new ObservableCollection<FrameworkElement>();
+            }
+        }
+
+        /// <summary>
+        /// Converts a value.
+        /// </summary>
+        /// <param name="value">The value that is produced by the binding target.</param>
+        /// <param name="targetType">The type to convert to.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>A converted value. If the method returns <see langword="null" />, the valid null value is used.</returns>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/DrawGridView.xaml b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/DrawGridView.xaml
new file mode 100644
index 000000000..3539c94cc
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/DrawGridView.xaml
@@ -0,0 +1,34 @@
+<Page x:Class="MVVM_Converter_DrawGrid3_NonLin.Views.DrawGridView"
+        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:MVVM_Converter_DrawGrid3_NonLin"
+        xmlns:mvvm="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.ViewModel"
+        mc:Ignorable="d"
+        Title="MainWindow" d:Height="450" d:Width="800"
+        Loaded="Page_Loaded">
+    <Page.DataContext>
+        <mvvm:DrawGridViewModel/>
+    </Page.DataContext>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="640*"/>
+            <ColumnDefinition Width="10*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="480*"/>
+            <RowDefinition Height="80*"/>
+        </Grid.RowDefinitions>
+        <Viewbox Grid.Row="1" Grid.Column="1"  >
+            <Frame x:Name="Client" Width="640" Height="480" NavigationUIVisibility="Hidden" Loaded="Frame_Loaded" Source="{Binding PlotFrameSource}" />
+        </Viewbox>
+        <WrapPanel Grid.Row="2" Grid.ColumnSpan="3" Margin="2">
+            <Button Content="Load Level" Height="40" Width="200" Margin="5" Command="{Binding LoadLevelCommand}"/>
+            <Button Content="Pevious Level" Height="40" Width="200" Margin="5" Command="{Binding PrevLevelCommand}"/>
+            <Button Content="Next Level" Height="40" Width="200" Margin="5" Command="{Binding NextLevelCommand}"/>
+        </WrapPanel>
+    </Grid>
+</Page>
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/DrawGridView.xaml.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/DrawGridView.xaml.cs
new file mode 100644
index 000000000..50b2edd4c
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/DrawGridView.xaml.cs
@@ -0,0 +1,78 @@
+// ***********************************************************************
+// Assembly         : MVVM_Converter_DrawGrid3_NonLin
+// Author           : Mir
+// Created          : 09-02-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 09-04-2022
+// ***********************************************************************
+// <copyright file="DrawGridView.xaml.cs" company="JC-Soft">
+//     (c) by Joe Care 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using MVVM.ViewModel;
+using MVVM_Converter_DrawGrid3_NonLin.ViewModel;
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace MVVM_Converter_DrawGrid3_NonLin.Views;
+
+/// <summary>
+/// Interaction logic for DrawGridView.xaml
+/// </summary>
+public partial class DrawGridView : Page
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DrawGridView"/> class.
+    /// </summary>
+    public DrawGridView()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Handles the Loaded event of the Window control.
+    /// </summary>
+    /// <param name="sender">The source of the event.</param>
+    /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
+    private void Page_Loaded(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is DrawGridViewModel vm)
+        {
+            vm.ShowClient = ShowClientinFrame;
+        }
+    }
+
+    /// <summary>
+    /// Handles the Loaded event of the Frame control.
+    /// </summary>
+    /// <param name="sender">The source of the event.</param>
+    /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
+    private void Frame_Loaded(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is DrawGridViewModel vm)
+        {
+//                vm.FrameDataContext = e.Source as Frame
+        }
+    }
+
+    /// <summary>
+    /// Shows the clientin frame.
+    /// </summary>
+    /// <param name="arg">The argument.</param>
+    /// <returns>BaseViewModel.</returns>
+    private BaseViewModel? ShowClientinFrame(string arg)
+    {
+        try
+        {
+            this.Client.Source = new Uri(arg);
+            return Client.DataContext as BaseViewModel;
+        }
+        catch(Exception) 
+        {
+            return null;
+        };
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/PlotFrame.xaml b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/PlotFrame.xaml
similarity index 94%
rename from CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/PlotFrame.xaml
rename to CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/PlotFrame.xaml
index 575b570c2..ced8c0d30 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/PlotFrame.xaml
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/PlotFrame.xaml
@@ -1,423 +1,418 @@
-<Page x:Class="MVVM_Converter_DrawGrid3_NonLin.View.PlotFrame"
-      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:local="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.View"
-      xmlns:vc="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.View.Converter"
-      xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-      xmlns:mvvm="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.ViewModel"
-      mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
-      Title="PlotFrame" >
-    <Page.DataContext>
-        <mvvm:PlotFrameViewModel/>
-    </Page.DataContext>
-    <Page.Resources>
-        <vc:WindowPortToTileDisplay x:Key="vcPortGrid" d:TileSize="144,96" TileSize="48,32">
-            <vc:WindowPortToTileDisplay.brushes>
-                <SolidColorBrush Color="Transparent"/>
-                <ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="0,0,96,64" ViewboxUnits="Absolute"/>
-                <ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="96,0,96,64" ViewboxUnits="Absolute"/>
-                <ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="192,0,96,64" ViewboxUnits="Absolute"/>
-                <ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="288,0,96,64" ViewboxUnits="Absolute"/>
-                <DrawingBrush  x:Name="Box">
-                    <DrawingBrush.Drawing>
-                        <DrawingGroup>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <!--ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="96,64,96,64" ViewboxUnits="Absolute"/-->
-                                    <SolidColorBrush Color="Transparent"/>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <RectangleGeometry Rect="0,0,96,64" />
-                                </GeometryDrawing.Geometry>
-                            </GeometryDrawing>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <SolidColorBrush Color="DarkCyan"/>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <RectangleGeometry Rect="32,16,62,46" RadiusX="10" RadiusY="10" />
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing Brush="DarkCyan">
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <PathGeometry>
-                                            <PathGeometry.Figures>
-                                                <PathFigure StartPoint="22,53">
-                                                    <PathFigure.Segments>
-                                                        <LineSegment Point="22,53"/>
-                                                        <LineSegment Point="38,63"/>
-                                                        <LineSegment Point="85,63"/>
-                                                        <LineSegment Point="56,50"/>
-                                                        <LineSegment Point="22,53"/>
-                                                    </PathFigure.Segments>
-
-                                                </PathFigure>
-                                                <PathFigure StartPoint="72,10">
-                                                    <PathFigure.Segments>
-                                                        <LineSegment Point="72,10"/>
-                                                        <LineSegment Point="92,19"/>
-                                                        <LineSegment Point="95,22"/>
-                                                        <LineSegment Point="95,52"/>
-                                                        <LineSegment Point="66,40"/>
-                                                        <LineSegment Point="72,10"/>
-                                                    </PathFigure.Segments>
-
-                                                </PathFigure>
-                                            </PathGeometry.Figures>
-                                        </PathGeometry>
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                        <GradientStop Color="Cyan" Offset="0"/>
-                                        <GradientStop Color="LightCyan" Offset="0.2"/>
-                                        <GradientStop Color="LightCyan" Offset="0.25"/>
-                                        <GradientStop Color="Black" Offset="0.25"/>
-                                        <GradientStop Color="Black" Offset="0.30"/>
-                                        <GradientStop Color="LightCyan" Offset="0.30"/>
-                                        <GradientStop Color="LightCyan" Offset="0.475"/>
-                                        <GradientStop Color="Black" Offset="0.475"/>
-                                        <GradientStop Color="Black" Offset="0.525"/>
-                                        <GradientStop Color="LightCyan" Offset="0.525"/>
-                                        <GradientStop Color="LightCyan" Offset="0.7"/>
-                                        <GradientStop Color="Black" Offset="0.7"/>
-                                        <GradientStop Color="Black" Offset="0.75"/>
-                                        <GradientStop Color="LightCyan" Offset="0.75"/>
-                                        <GradientStop Color="LightCyan" Offset="0.8"/>
-                                        <GradientStop Color="Cyan" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <RectangleGeometry Rect="20,10,62,46" RadiusX="10" RadiusY="10" />
-                                        <!--RectangleGeometry Rect="45,2,42,24" />
-                                        <RectangleGeometry Rect="22,26,42,24" />
-                                        <RectangleGeometry Rect="65,26,22,24" /-->
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
-                                        <GradientStop Color="LightCyan" Offset="0.25"/>
-                                        <GradientStop Color="Cyan" Offset="0.45"/>
-                                        <GradientStop Color="Black" Offset="0.45"/>
-                                        <GradientStop Color="Black" Offset="0.55"/>
-                                        <GradientStop Color="Cyan" Offset="0.55"/>
-                                        <GradientStop Color="LightCyan" Offset="0.75"/>
-                                    </LinearGradientBrush>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <RectangleGeometry Rect="40,20,20,20" >
-                                            <RectangleGeometry.Transform>
-                                                <RotateTransform CenterX="48" CenterY="32" Angle="45"/>
-                                            </RectangleGeometry.Transform>
-                                        </RectangleGeometry>
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3"  >
-                                        <Pen.Brush>
-                                            <RadialGradientBrush Center="0.5,0.5">
-                                                <GradientStop Color="Cyan" Offset="0"/>
-                                                <GradientStop Color="Cyan" Offset="0.65"/>
-                                                <GradientStop Color="Black" Offset="0.75"/>
-                                                <GradientStop Color="Black" Offset="0.8"/>
-                                                <GradientStop Color="Cyan" Offset="0.9"/>
-                                                <GradientStop Color="White" Offset="1"/>
-                                            </RadialGradientBrush>
-                                        </Pen.Brush>
-                                    </Pen>
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                        </DrawingGroup>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-                <DrawingBrush  x:Name="BoxInDestination">
-                    <DrawingBrush.Drawing>
-                        <DrawingGroup>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <!--ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="96,64,96,64" ViewboxUnits="Absolute"/-->
-                                    <SolidColorBrush Color="Transparent"/>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <RectangleGeometry Rect="0,0,96,64" />
-                                </GeometryDrawing.Geometry>
-                            </GeometryDrawing>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <SolidColorBrush Color="DarkMagenta"/>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <RectangleGeometry Rect="32,16,62,46" RadiusX="10" RadiusY="10" />
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing Brush="DarkMagenta">
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <PathGeometry>
-                                            <PathGeometry.Figures>
-                                                <PathFigure StartPoint="22,53">
-                                                    <PathFigure.Segments>
-                                                        <LineSegment Point="22,53"/>
-                                                        <LineSegment Point="38,63"/>
-                                                        <LineSegment Point="85,63"/>
-                                                        <LineSegment Point="56,50"/>
-                                                        <LineSegment Point="22,53"/>
-                                                    </PathFigure.Segments>
-
-                                                </PathFigure>
-                                                <PathFigure StartPoint="72,10">
-                                                    <PathFigure.Segments>
-                                                        <LineSegment Point="72,10"/>
-                                                        <LineSegment Point="92,19"/>
-                                                        <LineSegment Point="95,22"/>
-                                                        <LineSegment Point="95,52"/>
-                                                        <LineSegment Point="66,40"/>
-                                                        <LineSegment Point="72,10"/>
-                                                    </PathFigure.Segments>
-
-                                                </PathFigure>
-                                            </PathGeometry.Figures>
-                                        </PathGeometry>
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                        <GradientStop Color="Magenta" Offset="0"/>
-                                        <GradientStop Color="White" Offset="0.2"/>
-                                        <GradientStop Color="White" Offset="0.25"/>
-                                        <GradientStop Color="Black" Offset="0.25"/>
-                                        <GradientStop Color="Black" Offset="0.30"/>
-                                        <GradientStop Color="White" Offset="0.30"/>
-                                        <GradientStop Color="White" Offset="0.475"/>
-                                        <GradientStop Color="Black" Offset="0.475"/>
-                                        <GradientStop Color="Black" Offset="0.525"/>
-                                        <GradientStop Color="White" Offset="0.525"/>
-                                        <GradientStop Color="White" Offset="0.7"/>
-                                        <GradientStop Color="Black" Offset="0.7"/>
-                                        <GradientStop Color="Black" Offset="0.75"/>
-                                        <GradientStop Color="White" Offset="0.75"/>
-                                        <GradientStop Color="White" Offset="0.8"/>
-                                        <GradientStop Color="Magenta" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <RectangleGeometry Rect="20,10,62,46" RadiusX="10" RadiusY="10" />
-                                        <!--RectangleGeometry Rect="45,2,42,24" />
-                                        <RectangleGeometry Rect="22,26,42,24" />
-                                        <RectangleGeometry Rect="65,26,22,24" /-->
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing>
-                                <GeometryDrawing.Brush>
-                                    <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
-                                        <GradientStop Color="White" Offset="0.25"/>
-                                        <GradientStop Color="Magenta" Offset="0.45"/>
-                                        <GradientStop Color="Black" Offset="0.45"/>
-                                        <GradientStop Color="Black" Offset="0.55"/>
-                                        <GradientStop Color="Magenta" Offset="0.55"/>
-                                        <GradientStop Color="White" Offset="0.75"/>
-                                    </LinearGradientBrush>
-                                </GeometryDrawing.Brush>
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <RectangleGeometry Rect="40,20,20,20" >
-                                            <RectangleGeometry.Transform>
-                                                <RotateTransform CenterX="48" CenterY="32" Angle="45"/>
-                                            </RectangleGeometry.Transform>
-                                        </RectangleGeometry>
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3"  >
-                                        <Pen.Brush>
-                                            <RadialGradientBrush Center="0.5,0.5">
-                                                <GradientStop Color="Magenta" Offset="0"/>
-                                                <GradientStop Color="Magenta" Offset="0.65"/>
-                                                <GradientStop Color="Black" Offset="0.775"/>
-                                                <GradientStop Color="Black" Offset="0.8"/>
-                                                <GradientStop Color="Magenta" Offset="0.9"/>
-                                                <GradientStop Color="White" Offset="1"/>
-                                            </RadialGradientBrush>
-                                        </Pen.Brush>
-                                    </Pen>
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-
-                        </DrawingGroup>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-                <DrawingBrush  x:Name="Destination">
-                    <DrawingBrush.Drawing>
-                        <DrawingGroup>
-                            <GeometryDrawing Brush="Transparent">
-                                <GeometryDrawing.Geometry>
-                                    <RectangleGeometry Rect="0,0,96,64" />
-                                </GeometryDrawing.Geometry>
-                            </GeometryDrawing>
-                            <GeometryDrawing Brush="Transparent">
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                    <RectangleGeometry Rect="48,16,32,32" >
-                                        <RectangleGeometry.Transform>
-                                            <RotateTransform CenterX="48" CenterY="32" Angle="45"/>
-                                        </RectangleGeometry.Transform>
-                                    </RectangleGeometry>
-                                </GeometryGroup>
-                            </GeometryDrawing.Geometry>
-                            <GeometryDrawing.Pen>
-                                <Pen Thickness="3" Brush="Black" />
-                            </GeometryDrawing.Pen>
-                        </GeometryDrawing>
-                        </DrawingGroup>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-                <DrawingBrush x:Name="Wall">
-                    <DrawingBrush.Drawing>
-                        <DrawingGroup>
-                            <GeometryDrawing Brush="Transparent">
-                                <GeometryDrawing.Geometry>
-                                    <RectangleGeometry Rect="0,0,96,64" />
-                                </GeometryDrawing.Geometry>
-                            </GeometryDrawing>
-                            <GeometryDrawing Brush="Magenta">
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <RectangleGeometry Rect="1,1,25,25" />
-                                        <RectangleGeometry Rect="25,1,40,25" />
-                                        <RectangleGeometry Rect="1,26,40,25" />
-                                        <RectangleGeometry Rect="42,26,24,25" />
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                            <GeometryDrawing Brush="DarkMagenta">
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <PathGeometry>
-                                            <PathGeometry.Figures>
-                                                <PathFigure StartPoint="1,51">
-                                                    <PathFigure.Segments>
-                                                        <LineSegment Point="31,63"/>
-                                                        <LineSegment Point="95,63"/>
-                                                        <LineSegment Point="65,51"/>
-                                                        <LineSegment Point="1,51"/>
-                                                    </PathFigure.Segments>
-
-                                                </PathFigure>
-                                                <PathFigure StartPoint="65,1">
-                                                    <PathFigure.Segments>
-                                                        <LineSegment Point="95,13"/>
-                                                        <LineSegment Point="95,63"/>
-                                                        <LineSegment Point="65,51"/>
-                                                        <LineSegment Point="65,26"/>
-                                                        <LineSegment Point="95,39"/>
-                                                        <LineSegment Point="65,26"/>
-                                                        <LineSegment Point="65,1"/>
-                                                    </PathFigure.Segments>
-
-                                                </PathFigure>
-                                            </PathGeometry.Figures>
-                                        </PathGeometry>
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                                <GeometryDrawing.Pen>
-                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
-                                </GeometryDrawing.Pen>
-                            </GeometryDrawing>
-                        </DrawingGroup>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-                <ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="288,64,96,64" ViewboxUnits="Absolute"/>
-            </vc:WindowPortToTileDisplay.brushes>
-        </vc:WindowPortToTileDisplay>
-        <LinearGradientBrush x:Key="brLandsape" StartPoint="0.5,0" EndPoint="0.5,1">
-            <GradientStop Color="Blue" Offset="0.0" />
-            <!--GradientStop Color="Yellow" Offset="0.25" /-->
-            <!--GradientStop Color="Red" Offset="0.25" /-->
-            <GradientStop Color="LightBlue" Offset="0.61" />
-            <GradientStop Color="DarkGreen" Offset="0.61" />
-            <GradientStop Color="LimeGreen" Offset="0.851" />
-            <GradientStop Color="Lime" Offset="1.0" />
-        </LinearGradientBrush>
-        <LinearGradientBrush x:Key="brLinearGrad" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="Transparent" Offset="0.25" />
-            <GradientStop Color="DarkRed" Offset="0.25" />
-            <GradientStop Color="Red" Offset="0.29" />
-            <GradientStop Color="Wheat" Offset="0.3" />
-            <GradientStop Color="Wheat" Offset="0.31" />
-            <GradientStop Color="Red" Offset="0.32" />
-            <GradientStop Color="Yellow" Offset="0.45" />
-            <GradientStop Color="DarkGreen" Offset="0.75" />
-            <GradientStop Color="Black" Offset="0.75" />
-            <GradientStop Color="#00000000" Offset="0.78" />
-        </LinearGradientBrush>
-        <RadialGradientBrush x:Key="brRadialGradient" 
-      GradientOrigin="0.5,0.5" Center="0.5,0.5" 
-      RadiusX="0.5" RadiusY="0.5" SpreadMethod="Pad">
-            <GradientStop Color="Yellow" Offset="0" />
-            <GradientStop Color="Blue" Offset="0.25" />
-            <GradientStop Color="Red" Offset="0.75" />
-            <GradientStop Color="LimeGreen" Offset="1" />
-        </RadialGradientBrush>
-        <LinearGradientBrush x:Key="brLinearGradBlue" StartPoint="0,0">
-
-            <!-- This gradient stop is partially transparent. -->
-            <GradientStop Color="#200000FF" Offset="0.0" />
-
-            <!-- This gradient stop is fully opaque. -->
-            <GradientStop Color="#FF0000FF" Offset="1.0" />
-        </LinearGradientBrush>
-    </Page.Resources>
-    <Grid>
-        <Rectangle Fill="{StaticResource brLandsape}"/>
-        <ItemsControl Grid.Row="0" ItemsSource="{Binding WindowPort, ConverterParameter=32;24, Converter={StaticResource vcPortGrid}}">
-            <ItemsControl.ItemContainerStyle>
-                <Style TargetType="ContentPresenter">
-                    <Setter Property="Canvas.Left" Value="{Binding X}"/>
-                    <Setter Property="Canvas.Top" Value="{Binding Y}"/>
-                </Style>
-            </ItemsControl.ItemContainerStyle>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <Canvas>
-                    </Canvas>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-
-    </Grid>
-</Page>
+<Page x:Class="MVVM_Converter_DrawGrid3_NonLin.Views.PlotFrame"
+      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:local="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.Views"
+      xmlns:vc="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.Views.Converter"
+      xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+      xmlns:mvvm="clr-namespace:MVVM_Converter_DrawGrid3_NonLin.ViewModel"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="PlotFrame" >
+    <Page.DataContext>
+        <mvvm:PlotFrameViewModel/>
+    </Page.DataContext>
+    <Page.Resources>
+        <ImageSource x:Key="imgTile">pack://application:,,,/MVVM_Converter_DrawGrid3_NonLin;component/Resources/BIG_original.png</ImageSource>
+        <vc:WindowPortToTileDisplay x:Key="vcPortGrid" d:TileSize="144,96" TileSize="48,32">
+            <vc:WindowPortToTileDisplay.brushes>
+                <SolidColorBrush Color="Transparent"/>
+                <ImageBrush ImageSource="{StaticResource imgTile}" Stretch="Uniform" Viewbox="0,0,96,64" ViewboxUnits="Absolute"/>
+                <ImageBrush ImageSource="{StaticResource imgTile}" Stretch="Uniform" Viewbox="96,0,96,64" ViewboxUnits="Absolute"/>
+                <ImageBrush ImageSource="{StaticResource imgTile}" Stretch="Uniform" Viewbox="192,0,96,64" ViewboxUnits="Absolute"/>
+                <ImageBrush ImageSource="{StaticResource imgTile}" Stretch="Uniform" Viewbox="288,0,96,64" ViewboxUnits="Absolute"/>
+                <DrawingBrush  x:Name="Box">
+                    <DrawingBrush.Drawing>
+                        <DrawingGroup>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <!--ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="96,64,96,64" ViewboxUnits="Absolute"/-->
+                                    <SolidColorBrush Color="Transparent"/>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <RectangleGeometry Rect="0,0,96,64" />
+                                </GeometryDrawing.Geometry>
+                            </GeometryDrawing>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <SolidColorBrush Color="DarkCyan"/>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <RectangleGeometry Rect="32,16,62,46" RadiusX="10" RadiusY="10" />
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing Brush="DarkCyan">
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <PathGeometry>
+                                            <PathGeometry.Figures>
+                                                <PathFigure StartPoint="22,53">
+                                                    <PathFigure.Segments>
+                                                        <LineSegment Point="22,53"/>
+                                                        <LineSegment Point="38,63"/>
+                                                        <LineSegment Point="85,63"/>
+                                                        <LineSegment Point="56,50"/>
+                                                        <LineSegment Point="22,53"/>
+                                                    </PathFigure.Segments>
+
+                                                </PathFigure>
+                                                <PathFigure StartPoint="72,10">
+                                                    <PathFigure.Segments>
+                                                        <LineSegment Point="72,10"/>
+                                                        <LineSegment Point="92,19"/>
+                                                        <LineSegment Point="95,22"/>
+                                                        <LineSegment Point="95,52"/>
+                                                        <LineSegment Point="66,40"/>
+                                                        <LineSegment Point="72,10"/>
+                                                    </PathFigure.Segments>
+
+                                                </PathFigure>
+                                            </PathGeometry.Figures>
+                                        </PathGeometry>
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                        <GradientStop Color="Cyan" Offset="0"/>
+                                        <GradientStop Color="LightCyan" Offset="0.2"/>
+                                        <GradientStop Color="LightCyan" Offset="0.25"/>
+                                        <GradientStop Color="Black" Offset="0.25"/>
+                                        <GradientStop Color="Black" Offset="0.30"/>
+                                        <GradientStop Color="LightCyan" Offset="0.30"/>
+                                        <GradientStop Color="LightCyan" Offset="0.475"/>
+                                        <GradientStop Color="Black" Offset="0.475"/>
+                                        <GradientStop Color="Black" Offset="0.525"/>
+                                        <GradientStop Color="LightCyan" Offset="0.525"/>
+                                        <GradientStop Color="LightCyan" Offset="0.7"/>
+                                        <GradientStop Color="Black" Offset="0.7"/>
+                                        <GradientStop Color="Black" Offset="0.75"/>
+                                        <GradientStop Color="LightCyan" Offset="0.75"/>
+                                        <GradientStop Color="LightCyan" Offset="0.8"/>
+                                        <GradientStop Color="Cyan" Offset="1"/>
+                                    </LinearGradientBrush>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <RectangleGeometry Rect="20,10,62,46" RadiusX="10" RadiusY="10" />
+                                        <!--RectangleGeometry Rect="45,2,42,24" />
+                                        <RectangleGeometry Rect="22,26,42,24" />
+                                        <RectangleGeometry Rect="65,26,22,24" /-->
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
+                                        <GradientStop Color="LightCyan" Offset="0.25"/>
+                                        <GradientStop Color="Cyan" Offset="0.45"/>
+                                        <GradientStop Color="Black" Offset="0.45"/>
+                                        <GradientStop Color="Black" Offset="0.55"/>
+                                        <GradientStop Color="Cyan" Offset="0.55"/>
+                                        <GradientStop Color="LightCyan" Offset="0.75"/>
+                                    </LinearGradientBrush>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <RectangleGeometry Rect="40,20,20,20" >
+                                            <RectangleGeometry.Transform>
+                                                <RotateTransform CenterX="48" CenterY="32" Angle="45"/>
+                                            </RectangleGeometry.Transform>
+                                        </RectangleGeometry>
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3"  >
+                                        <Pen.Brush>
+                                            <RadialGradientBrush Center="0.5,0.5">
+                                                <GradientStop Color="Cyan" Offset="0"/>
+                                                <GradientStop Color="Cyan" Offset="0.65"/>
+                                                <GradientStop Color="Black" Offset="0.75"/>
+                                                <GradientStop Color="Black" Offset="0.8"/>
+                                                <GradientStop Color="Cyan" Offset="0.9"/>
+                                                <GradientStop Color="White" Offset="1"/>
+                                            </RadialGradientBrush>
+                                        </Pen.Brush>
+                                    </Pen>
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                        </DrawingGroup>
+                    </DrawingBrush.Drawing>
+                </DrawingBrush>
+                <DrawingBrush  x:Name="BoxInDestination">
+                    <DrawingBrush.Drawing>
+                        <DrawingGroup>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <!--ImageBrush ImageSource="/Resources/BIG_original.png" Stretch="Uniform" Viewbox="96,64,96,64" ViewboxUnits="Absolute"/-->
+                                    <SolidColorBrush Color="Transparent"/>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <RectangleGeometry Rect="0,0,96,64" />
+                                </GeometryDrawing.Geometry>
+                            </GeometryDrawing>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <SolidColorBrush Color="DarkMagenta"/>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <RectangleGeometry Rect="32,16,62,46" RadiusX="10" RadiusY="10" />
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing Brush="DarkMagenta">
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <PathGeometry>
+                                            <PathGeometry.Figures>
+                                                <PathFigure StartPoint="22,53">
+                                                    <PathFigure.Segments>
+                                                        <LineSegment Point="22,53"/>
+                                                        <LineSegment Point="38,63"/>
+                                                        <LineSegment Point="85,63"/>
+                                                        <LineSegment Point="56,50"/>
+                                                        <LineSegment Point="22,53"/>
+                                                    </PathFigure.Segments>
+
+                                                </PathFigure>
+                                                <PathFigure StartPoint="72,10">
+                                                    <PathFigure.Segments>
+                                                        <LineSegment Point="72,10"/>
+                                                        <LineSegment Point="92,19"/>
+                                                        <LineSegment Point="95,22"/>
+                                                        <LineSegment Point="95,52"/>
+                                                        <LineSegment Point="66,40"/>
+                                                        <LineSegment Point="72,10"/>
+                                                    </PathFigure.Segments>
+
+                                                </PathFigure>
+                                            </PathGeometry.Figures>
+                                        </PathGeometry>
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                        <GradientStop Color="Magenta" Offset="0"/>
+                                        <GradientStop Color="White" Offset="0.2"/>
+                                        <GradientStop Color="White" Offset="0.25"/>
+                                        <GradientStop Color="Black" Offset="0.25"/>
+                                        <GradientStop Color="Black" Offset="0.30"/>
+                                        <GradientStop Color="White" Offset="0.30"/>
+                                        <GradientStop Color="White" Offset="0.475"/>
+                                        <GradientStop Color="Black" Offset="0.475"/>
+                                        <GradientStop Color="Black" Offset="0.525"/>
+                                        <GradientStop Color="White" Offset="0.525"/>
+                                        <GradientStop Color="White" Offset="0.7"/>
+                                        <GradientStop Color="Black" Offset="0.7"/>
+                                        <GradientStop Color="Black" Offset="0.75"/>
+                                        <GradientStop Color="White" Offset="0.75"/>
+                                        <GradientStop Color="White" Offset="0.8"/>
+                                        <GradientStop Color="Magenta" Offset="1"/>
+                                    </LinearGradientBrush>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <RectangleGeometry Rect="20,10,62,46" RadiusX="10" RadiusY="10" />
+                                        <!--RectangleGeometry Rect="45,2,42,24" />
+                                        <RectangleGeometry Rect="22,26,42,24" />
+                                        <RectangleGeometry Rect="65,26,22,24" /-->
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing>
+                                <GeometryDrawing.Brush>
+                                    <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
+                                        <GradientStop Color="White" Offset="0.25"/>
+                                        <GradientStop Color="Magenta" Offset="0.45"/>
+                                        <GradientStop Color="Black" Offset="0.45"/>
+                                        <GradientStop Color="Black" Offset="0.55"/>
+                                        <GradientStop Color="Magenta" Offset="0.55"/>
+                                        <GradientStop Color="White" Offset="0.75"/>
+                                    </LinearGradientBrush>
+                                </GeometryDrawing.Brush>
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <RectangleGeometry Rect="40,20,20,20" >
+                                            <RectangleGeometry.Transform>
+                                                <RotateTransform CenterX="48" CenterY="32" Angle="45"/>
+                                            </RectangleGeometry.Transform>
+                                        </RectangleGeometry>
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3"  >
+                                        <Pen.Brush>
+                                            <RadialGradientBrush Center="0.5,0.5">
+                                                <GradientStop Color="Magenta" Offset="0"/>
+                                                <GradientStop Color="Magenta" Offset="0.65"/>
+                                                <GradientStop Color="Black" Offset="0.775"/>
+                                                <GradientStop Color="Black" Offset="0.8"/>
+                                                <GradientStop Color="Magenta" Offset="0.9"/>
+                                                <GradientStop Color="White" Offset="1"/>
+                                            </RadialGradientBrush>
+                                        </Pen.Brush>
+                                    </Pen>
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+
+                        </DrawingGroup>
+                    </DrawingBrush.Drawing>
+                </DrawingBrush>
+                <DrawingBrush  x:Name="Destination">
+                    <DrawingBrush.Drawing>
+                        <DrawingGroup>
+                            <GeometryDrawing Brush="Transparent">
+                                <GeometryDrawing.Geometry>
+                                    <RectangleGeometry Rect="0,0,96,64" />
+                                </GeometryDrawing.Geometry>
+                            </GeometryDrawing>
+                            <GeometryDrawing Brush="Transparent">
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                    <RectangleGeometry Rect="48,16,32,32" >
+                                        <RectangleGeometry.Transform>
+                                            <RotateTransform CenterX="48" CenterY="32" Angle="45"/>
+                                        </RectangleGeometry.Transform>
+                                    </RectangleGeometry>
+                                </GeometryGroup>
+                            </GeometryDrawing.Geometry>
+                            <GeometryDrawing.Pen>
+                                <Pen Thickness="3" Brush="Black" />
+                            </GeometryDrawing.Pen>
+                        </GeometryDrawing>
+                        </DrawingGroup>
+                    </DrawingBrush.Drawing>
+                </DrawingBrush>
+                <DrawingBrush x:Name="Wall">
+                    <DrawingBrush.Drawing>
+                        <DrawingGroup>
+                            <GeometryDrawing Brush="Transparent">
+                                <GeometryDrawing.Geometry>
+                                    <RectangleGeometry Rect="0,0,96,64" />
+                                </GeometryDrawing.Geometry>
+                            </GeometryDrawing>
+                            <GeometryDrawing Brush="Magenta">
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <RectangleGeometry Rect="1,1,25,25" />
+                                        <RectangleGeometry Rect="25,1,40,25" />
+                                        <RectangleGeometry Rect="1,26,40,25" />
+                                        <RectangleGeometry Rect="42,26,24,25" />
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                            <GeometryDrawing Brush="DarkMagenta">
+                                <GeometryDrawing.Geometry>
+                                    <GeometryGroup>
+                                        <PathGeometry>
+                                            <PathGeometry.Figures>
+                                                <PathFigure StartPoint="1,51">
+                                                    <PathFigure.Segments>
+                                                        <LineSegment Point="31,63"/>
+                                                        <LineSegment Point="95,63"/>
+                                                        <LineSegment Point="65,51"/>
+                                                        <LineSegment Point="1,51"/>
+                                                    </PathFigure.Segments>
+
+                                                </PathFigure>
+                                                <PathFigure StartPoint="65,1">
+                                                    <PathFigure.Segments>
+                                                        <LineSegment Point="95,13"/>
+                                                        <LineSegment Point="95,63"/>
+                                                        <LineSegment Point="65,51"/>
+                                                        <LineSegment Point="65,26"/>
+                                                        <LineSegment Point="95,39"/>
+                                                        <LineSegment Point="65,26"/>
+                                                        <LineSegment Point="65,1"/>
+                                                    </PathFigure.Segments>
+
+                                                </PathFigure>
+                                            </PathGeometry.Figures>
+                                        </PathGeometry>
+                                    </GeometryGroup>
+                                </GeometryDrawing.Geometry>
+                                <GeometryDrawing.Pen>
+                                    <Pen Thickness="3" Brush="Black" LineJoin="Round" />
+                                </GeometryDrawing.Pen>
+                            </GeometryDrawing>
+                        </DrawingGroup>
+                    </DrawingBrush.Drawing>
+                </DrawingBrush>
+                <ImageBrush ImageSource="{StaticResource imgTile}" Stretch="Uniform" Viewbox="288,64,96,64" ViewboxUnits="Absolute"/>
+            </vc:WindowPortToTileDisplay.brushes>
+        </vc:WindowPortToTileDisplay>
+        <LinearGradientBrush x:Key="brLandsape" StartPoint="0.5,0" EndPoint="0.5,1">
+            <GradientStop Color="Blue" Offset="0.0" />
+            <!--GradientStop Color="Yellow" Offset="0.25" /-->
+            <!--GradientStop Color="Red" Offset="0.25" /-->
+            <GradientStop Color="LightBlue" Offset="0.61" />
+            <GradientStop Color="DarkGreen" Offset="0.61" />
+            <GradientStop Color="LimeGreen" Offset="0.851" />
+            <GradientStop Color="Lime" Offset="1.0" />
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="brLinearGrad" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="Transparent" Offset="0.25" />
+            <GradientStop Color="DarkRed" Offset="0.25" />
+            <GradientStop Color="Red" Offset="0.29" />
+            <GradientStop Color="Wheat" Offset="0.3" />
+            <GradientStop Color="Wheat" Offset="0.31" />
+            <GradientStop Color="Red" Offset="0.32" />
+            <GradientStop Color="Yellow" Offset="0.45" />
+            <GradientStop Color="DarkGreen" Offset="0.75" />
+            <GradientStop Color="Black" Offset="0.75" />
+            <GradientStop Color="#00000000" Offset="0.78" />
+        </LinearGradientBrush>
+        <RadialGradientBrush x:Key="brRadialGradient" 
+      GradientOrigin="0.5,0.5" Center="0.5,0.5" 
+      RadiusX="0.5" RadiusY="0.5" SpreadMethod="Pad">
+            <GradientStop Color="Yellow" Offset="0" />
+            <GradientStop Color="Blue" Offset="0.25" />
+            <GradientStop Color="Red" Offset="0.75" />
+            <GradientStop Color="LimeGreen" Offset="1" />
+        </RadialGradientBrush>
+        <LinearGradientBrush x:Key="brLinearGradBlue" StartPoint="0,0">
+
+            <!-- This gradient stop is partially transparent. -->
+            <GradientStop Color="#200000FF" Offset="0.0" />
+
+            <!-- This gradient stop is fully opaque. -->
+            <GradientStop Color="#FF0000FF" Offset="1.0" />
+        </LinearGradientBrush>
+    </Page.Resources>
+    <Grid>
+        <Rectangle Fill="{StaticResource brLandsape}"/>
+        <ItemsControl Grid.Row="0" ItemsSource="{Binding WindowPort, ConverterParameter=32;24, Converter={StaticResource vcPortGrid}}">
+           <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Canvas>
+                    </Canvas>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+
+    </Grid>
+</Page>
diff --git a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/PlotFrame.xaml.cs b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/PlotFrame.xaml.cs
similarity index 90%
rename from CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/PlotFrame.xaml.cs
rename to CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/PlotFrame.xaml.cs
index 33a265254..09a2d9fb5 100644
--- a/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/View/PlotFrame.xaml.cs
+++ b/CSharpBible/Graphics/MVVM_Converter_DrawGrid3_NonLin/Views/PlotFrame.xaml.cs
@@ -1,44 +1,44 @@
-// ***********************************************************************
-// Assembly         : MVVM_Converter_DrawGrid3_NonLin
-// Author           : Mir
-// Created          : 09-02-2022
-//
-// Last Modified By : Mir
-// Last Modified On : 09-04-2022
-// ***********************************************************************
-// <copyright file="PlotFrame.xaml.cs" company="JC-Soft">
-//     (c) by Joe Care 2022
-// </copyright>
-// <summary></summary>
-// ***********************************************************************
-using MVVM_Converter_DrawGrid3_NonLin.View.Converter;
-using MVVM_Converter_DrawGrid3_NonLin.ViewModel;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace MVVM_Converter_DrawGrid3_NonLin.View
-{
-    /// <summary>
-    /// Interaktionslogik für PlotFrame.xaml
-    /// </summary>
-    public partial class PlotFrame : Page
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlotFrame"/> class.
-        /// </summary>
-        public PlotFrame()
-        {
-            InitializeComponent();
-            SizeChanged += (object sender, SizeChangedEventArgs e) =>
-            {
-                if (this.Resources["vcPortGrid"] is WindowPortToTileDisplay pc)
-                {
-                    pc.WindowSize = e.NewSize;
-                    if (DataContext is PlotFrameViewModel vm)
-                        vm.WindowSize = e.NewSize;
-                }
-            };
-
-        }
-    }
-}
+// ***********************************************************************
+// Assembly         : MVVM_Converter_DrawGrid3_NonLin
+// Author           : Mir
+// Created          : 09-02-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 09-04-2022
+// ***********************************************************************
+// <copyright file="PlotFrame.xaml.cs" company="JC-Soft">
+//     (c) by Joe Care 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using MVVM_Converter_DrawGrid3_NonLin.Views.Converter;
+using MVVM_Converter_DrawGrid3_NonLin.ViewModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace MVVM_Converter_DrawGrid3_NonLin.Views
+{
+    /// <summary>
+    /// Interaktionslogik für PlotFrame.xaml
+    /// </summary>
+    public partial class PlotFrame : Page
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlotFrame"/> class.
+        /// </summary>
+        public PlotFrame()
+        {
+            InitializeComponent();
+            SizeChanged += (object sender, SizeChangedEventArgs e) =>
+            {
+                if (this.Resources["vcPortGrid"] is WindowPortToTileDisplay pc)
+                {
+                    pc.WindowSize = e.NewSize;
+                    if (DataContext is PlotFrameViewModel vm)
+                        vm.WindowSize = e.NewSize;
+                }
+            };
+
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/App.xaml b/CSharpBible/Graphics/MVVM_DynamicShape/App.xaml
new file mode 100644
index 000000000..a65af026d
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="MVVM_DynamicShape.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:MVVM_DynamicShape"
+             StartupUri="View/MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/App.xaml.cs b/CSharpBible/Graphics/MVVM_DynamicShape/App.xaml.cs
new file mode 100644
index 000000000..819f5cfae
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/App.xaml.cs
@@ -0,0 +1,24 @@
+// ***********************************************************************
+// Assembly         : DynamicShapes
+// Author           : Mir
+// Created          : 06-16-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-08-2022
+// ***********************************************************************
+// <copyright file="App.xaml.cs" company="JC-Soft">
+//     Copyright © JC-Soft 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System.Windows;
+
+namespace MVVM_DynamicShape
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj b/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj
new file mode 100644
index 000000000..5092e0e13
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/MVVM_DynamicShape.csproj
@@ -0,0 +1,52 @@
+<Project>
+  <Import Project="..\Graphics_net.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFrameworks>net472-windows;net48-windows;net481-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  <PropertyGroup>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <Product>DynamicShapes 1.0</Product>
+	<Description>Demo: Shapes dynamisch erstellen und löschen (Disks und Rechtecke) </Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="obj\**" />
+    <EmbeddedResource Remove="obj\**" />
+    <None Remove="obj\**" />
+    <Page Remove="obj\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Views\Converter\" />
+  </ItemGroup>
+
+</Project>
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Models/.info b/CSharpBible/Graphics/MVVM_DynamicShape/Models/.info
new file mode 100644
index 000000000..e69de29bb
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Models/DynamicShapeModel.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Models/DynamicShapeModel.cs
new file mode 100644
index 000000000..6844c93b3
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Models/DynamicShapeModel.cs
@@ -0,0 +1,14 @@
+using MVVM.ViewModel;
+using MVVM_DynamicShape.Models.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MVVM_DynamicShape.Models;
+
+public class DynamicShapeModel : IDynamicShapeModel
+{
+    public IObservableCollection<IShape> Shapes { get; set ; }
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Models/EShapeType.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Models/EShapeType.cs
new file mode 100644
index 000000000..579e43b57
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Models/EShapeType.cs
@@ -0,0 +1,11 @@
+namespace MVVM_DynamicShape.Model
+{
+    
+        #region Property
+        /// <summary>
+        /// Enum EShapeType
+        /// </summary>
+        public enum EShapeType { None, Circle, Rectangle }
+        #endregion
+  
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Models/Interfaces/IDynamicShapeModel.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Models/Interfaces/IDynamicShapeModel.cs
new file mode 100644
index 000000000..e4ad206d9
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Models/Interfaces/IDynamicShapeModel.cs
@@ -0,0 +1,10 @@
+using MVVM.ViewModel;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace MVVM_DynamicShape.Models.Interfaces;
+
+public interface IDynamicShapeModel
+{
+    IObservableCollection<IShape> Shapes { get; set; }
+}
\ No newline at end of file
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Models/Interfaces/IShape.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Models/Interfaces/IShape.cs
new file mode 100644
index 000000000..a2ab6bcc5
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Models/Interfaces/IShape.cs
@@ -0,0 +1,17 @@
+using MVVM_DynamicShape.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MVVM_DynamicShape.Models.Interfaces;
+
+public interface IShape
+{
+    EShapeType ShapeType { get; }
+    string Name { get; }
+    public double X { get; set; }
+    public double Y { get; set; }
+
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Properties/AssemblyInfo.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..464076cc6
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Properties/AssemblyInfo.cs
@@ -0,0 +1,23 @@
+// ***********************************************************************
+// Assembly         : DynamicShapes
+// Author           : Mir
+// Created          : 06-16-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-08-2022
+// ***********************************************************************
+// <copyright file="AssemblyInfo.cs" company="JC-Soft">
+//     Copyright © JC-Soft 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+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/CSharpBible/Graphics/MVVM_DynamicShape/Properties/Resources.Designer.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..d0b419819
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Properties/Resources.Designer.cs
@@ -0,0 +1,99 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MVVM_DynamicShape.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MVVM_DynamicShape.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Create rectangle ähnelt.
+        /// </summary>
+        public static string btnShape1 {
+            get {
+                return ResourceManager.GetString("btnShape1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Create circle ähnelt.
+        /// </summary>
+        public static string btnShape2 {
+            get {
+                return ResourceManager.GetString("btnShape2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Drawing a dynamic shape on a canvas ähnelt.
+        /// </summary>
+        public static string Description {
+            get {
+                return ResourceManager.GetString("Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die DynamicShape ähnelt.
+        /// </summary>
+        public static string Title {
+            get {
+                return ResourceManager.GetString("Title", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Properties/Resources.resx b/CSharpBible/Graphics/MVVM_DynamicShape/Properties/Resources.resx
new file mode 100644
index 000000000..232c5e403
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Properties/Resources.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnShape1" xml:space="preserve">
+    <value>Create rectangle</value>
+  </data>
+  <data name="btnShape2" xml:space="preserve">
+    <value>Create circle</value>
+  </data>
+  <data name="Description" xml:space="preserve">
+    <value>Drawing a dynamic shape on a canvas</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>DynamicShape</value>
+  </data>
+</root>
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/.info b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/.info
new file mode 100644
index 000000000..e69de29bb
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs
new file mode 100644
index 000000000..735665137
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/DynamicShapeViewModel.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using MVVM.View.Extension;
+using MVVM.ViewModel;
+using MVVM_DynamicShape.Model;
+using MVVM_DynamicShape.Models.Interfaces;
+
+namespace MVVM_DynamicShape.ViewModels;
+
+public partial class DynamicShapeViewModel(IDynamicShapeModel iModel) : BaseViewModelCT
+{
+    IDynamicShapeModel _iModel { get; } = iModel;
+
+
+    #region Property
+
+    /// <summary>
+    /// The shape1
+    /// </summary>
+    [ObservableProperty]
+    private EShapeType _Shape = EShapeType.None;
+
+    [ObservableProperty]
+    private string _sText = "";
+
+    [ObservableProperty]
+    private ObservableCollection<VisShape> _visShapes = new();
+    #endregion
+
+    #region Methode
+    public DynamicShapeViewModel() : this(IoC.GetRequiredService<IDynamicShapeModel>())
+    {
+    }
+
+    [RelayCommand]
+    public void Shape1()
+    {
+        Shape = EShapeType.Rectangle;
+    }
+    [RelayCommand]
+    public void Shape2()
+    {
+        Shape = EShapeType.Circle;
+    }
+    [RelayCommand]
+    public void MouseLeftButtonDown(object? sender)
+    {
+        // Create the selected shape
+    }
+    [RelayCommand]
+    public void MouseRightButtonDown(object? sender)
+    {
+        // Delete the selected shape
+    }
+    #endregion
+
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/VisShape.cs b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/VisShape.cs
new file mode 100644
index 000000000..e608bd79a
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/ViewModels/VisShape.cs
@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MVVM.ViewModel;
+using MVVM_DynamicShape.Model;
+
+namespace MVVM_DynamicShape.ViewModels;
+
+public partial class VisShape : BaseViewModelCT
+{
+    [ObservableProperty]
+    private double _x;
+
+    [ObservableProperty]
+    private double _y;
+
+    [ObservableProperty]
+    private EShapeType _sType;
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Views/.info b/CSharpBible/Graphics/MVVM_DynamicShape/Views/.info
new file mode 100644
index 000000000..e69de29bb
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Views/DynamicShapeView.xaml b/CSharpBible/Graphics/MVVM_DynamicShape/Views/DynamicShapeView.xaml
new file mode 100644
index 000000000..63e1c7392
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Views/DynamicShapeView.xaml
@@ -0,0 +1,38 @@
+<Page x:Class="MVVM_DynamicShape.Views.DynamicShapeView"
+      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:i="http://schemas.microsoft.com/xaml/behaviors"
+      xmlns:local="clr-namespace:MVVM_DynamicShape.Views"
+      xmlns:mvvm="clr-namespace:MVVM_DynamicShape.ViewModels"
+      xmlns:p="clr-namespace:MVVM_DynamicShape.Properties"
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="{x:Static p:Resources.Title}" 
+      ToolTip="{x:Static p:Resources.Description}"
+      mc:Ignorable="d">
+    <Page.DataContext>
+        <mvvm:DynamicShapeViewModel />
+    </Page.DataContext>
+    <DockPanel>
+        <ToggleButton DockPanel.Dock="Top" Width="100" Name="CreateShape1" Command="{Binding Shape1Command}" Content="{x:Static p:Resources.btnShape1}" />
+        <ToggleButton DockPanel.Dock="Top" Width="100" Name="CreateShape2" Command="{Binding Shape2Command}" Content="{x:Static p:Resources.btnShape2}" />
+
+        <Label DockPanel.Dock="Bottom" Content="{Binding SText}" /> 
+        <Canvas Background="Gray" Name="canvasArea"
+                ClipToBounds="True">
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="MouseLeftButtonDown">
+                    <i:InvokeCommandAction Command="{Binding MouseLeftButtonDownCommand}" />
+                </i:EventTrigger>
+                <i:EventTrigger EventName="MouseRightButtonDown">
+                    <i:InvokeCommandAction Command="{Binding MouseRightButtonDownCommand}" />
+                </i:EventTrigger>
+                <i:EventTrigger EventName="Resize">
+                    <i:InvokeCommandAction Command="{Binding ResizeCommand}" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+            <Button Canvas.Left="10" Canvas.Top="10">test</Button>
+        </Canvas>
+    </DockPanel>
+</Page>
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Views/DynamicShapeView.xaml.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Views/DynamicShapeView.xaml.cs
new file mode 100644
index 000000000..aeeb5c72b
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Views/DynamicShapeView.xaml.cs
@@ -0,0 +1,40 @@
+using MVVM_DynamicShape.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+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 MVVM_DynamicShape.Views
+{
+    /// <summary>
+    /// Interaktionslogik für DynamicShapeView.xaml
+    /// </summary>
+    public partial class DynamicShapeView : Page
+    {
+        #region Methode
+        public DynamicShapeView()
+        {
+            DataContextChanged += (s, e) =>
+            {
+                if (DataContext is DynamicShapeViewModel viewModel)
+                {
+         //           viewModel.onCreateShape = DoCreateShape;
+                }
+            };
+            InitializeComponent();            
+        }
+
+
+        #endregion
+    }
+}
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Views/MainWindow.xaml b/CSharpBible/Graphics/MVVM_DynamicShape/Views/MainWindow.xaml
new file mode 100644
index 000000000..d55eeb786
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Views/MainWindow.xaml
@@ -0,0 +1,14 @@
+<Window x:Class="MVVM_DynamicShape.Views.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:p="clr-namespace:MVVM_DynamicShape.Properties"
+        Title="{x:Static p:Resources.Title}" 
+        ToolTip="{x:Static p:Resources.Description}"
+        Height="350" 
+        Width="525" 
+        WindowStartupLocation="CenterScreen">
+
+    <Grid>
+        <Frame x:Name="MainFrame" Source="Views/DynamicShapeView.xaml" />
+    </Grid>
+</Window>
diff --git a/CSharpBible/Graphics/MVVM_DynamicShape/Views/MainWindow.xaml.cs b/CSharpBible/Graphics/MVVM_DynamicShape/Views/MainWindow.xaml.cs
new file mode 100644
index 000000000..cd5175379
--- /dev/null
+++ b/CSharpBible/Graphics/MVVM_DynamicShape/Views/MainWindow.xaml.cs
@@ -0,0 +1,41 @@
+// ***********************************************************************
+// Assembly         : DynamicShapes
+// Author           : Mir
+// Created          : 06-16-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 09-09-2022
+// ***********************************************************************
+// <copyright file="MainWindow.xaml.cs" company="JC-Soft">
+//     Copyright © JC-Soft 2022
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+/// <summary>
+/// The Dynamic Shape - Views namespace.
+/// </summary>
+namespace MVVM_DynamicShape.Views;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+public partial class MainWindow : Window
+{
+
+    #region Methode
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MainWindow" /> class.
+    /// </summary>
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+    #endregion
+}
diff --git a/CSharpBible/Graphics/PolySpline/App.xaml b/CSharpBible/Graphics/PolySpline/App.xaml
new file mode 100644
index 000000000..a8ddf5267
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="PolySpline.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:PolySpline"
+             StartupUri="Views/MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/CSharpBible/Graphics/PolySpline/App.xaml.cs b/CSharpBible/Graphics/PolySpline/App.xaml.cs
new file mode 100644
index 000000000..8acb11ecb
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/App.xaml.cs
@@ -0,0 +1,24 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-20-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-20-2022
+// ***********************************************************************
+// <copyright file="App.xaml.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System.Windows;
+
+namespace PolySpline
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/Models/.info b/CSharpBible/Graphics/PolySpline/Models/.info
new file mode 100644
index 000000000..e69de29bb
diff --git a/CSharpBible/Graphics/PolySpline/Models/IPolySplineModel.cs b/CSharpBible/Graphics/PolySpline/Models/IPolySplineModel.cs
new file mode 100644
index 000000000..dde657ed7
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Models/IPolySplineModel.cs
@@ -0,0 +1,6 @@
+namespace PolySpline.Models
+{
+    public interface IPolySplineModel
+    {
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/Models/PolySplineModel.cs b/CSharpBible/Graphics/PolySpline/Models/PolySplineModel.cs
new file mode 100644
index 000000000..74f2ff484
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Models/PolySplineModel.cs
@@ -0,0 +1,14 @@
+using MVVM.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PolySpline.Models
+{
+    public class PolySplineModel : BaseViewModel, IPolySplineModel
+    {
+       //public Points
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/PolySpline.csproj b/CSharpBible/Graphics/PolySpline/PolySpline.csproj
new file mode 100644
index 000000000..d463d33a0
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/PolySpline.csproj
@@ -0,0 +1,58 @@
+<Project>
+	<Import Project="..\Graphics.props" />
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFrameworks>net462-windows;net472-windows;net48-windows;net481-windows</TargetFrameworks>
+		<UseWPF>true</UseWPF>
+	</PropertyGroup>
+	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+	<PropertyGroup>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>disable</ImplicitUsings>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Remove="obj\**" />
+		<Compile Remove="Properties\AssemblyInfo.cs" />
+		<EmbeddedResource Remove="obj\**" />
+		<None Remove="obj\**" />
+		<None Remove="*.bak" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Remove="App.config" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="$(UpDir)\Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+		<Compile Update="Properties\Settings.Designer.cs">
+			<DesignTimeSharedInput>True</DesignTimeSharedInput>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Settings.settings</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="Properties\Settings.settings">
+			<Generator>SettingsSingleFileGenerator</Generator>
+			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="Models\Interfaces\" />
+	</ItemGroup>
+
+</Project>
diff --git a/CSharpBible/Graphics/PolySpline/PolySpline2.csproj b/CSharpBible/Graphics/PolySpline/PolySpline2.csproj
new file mode 100644
index 000000000..78f2c8cef
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/PolySpline2.csproj
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <BaseOutputPath>..\..\..\bin\$(MSBuildProjectName)\</BaseOutputPath>
+    <BaseIntermediateOutputPath>..\..\..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath>..\..\..\obj\$(MSBuildProjectName)\</IntermediateOutputPath>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <PublishUrl>...\..\..\publish\</PublishUrl>
+    <ProjectGuid>{070E91DD-75E9-4186-A773-A2FB576AD1AB}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="ViewModels\ControlPointBehavior.cs" />
+    <Compile Include="ViewModels\Coordinate.cs" />
+    <Compile Include="ViewModels\MainWindowViewModel.cs" />
+    <Page Include="Views\MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ViewModels\PolySpline.cs" />
+    <Compile Include="ViewModels\PolySplineCollection.cs" />
+    <Compile Include="ViewModels\Segment.cs" />
+    <Compile Include="Views\MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj">
+      <Project>{ABC8A3FB-12D1-40ED-AA6C-DBFF48B7A080}</Project>
+      <Name>MVVM_BaseLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/CSharpBible/Graphics/PolySpline/PolySpline_net.csproj b/CSharpBible/Graphics/PolySpline/PolySpline_net.csproj
new file mode 100644
index 000000000..d51adc8d5
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/PolySpline_net.csproj
@@ -0,0 +1,59 @@
+<Project>
+  <Import Project="..\Graphics_net.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <Deterministic>false</Deterministic>
+  </PropertyGroup>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  <ItemGroup>
+		<Compile Remove="obj\**" />
+		<EmbeddedResource Remove="obj\**" />
+		<None Remove="obj\**" />
+		<Page Remove="obj\**" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Remove="AssemblyInfo.cs" />
+		<Compile Remove="Properties\AssemblyInfo.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Remove="App.config" />
+		<None Remove="packages.config" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Folder Include="Models\" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="$(UpDir)\Libraries\MVVM_BaseLib\MVVM_BaseLib.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+		<Compile Update="Properties\Settings.Designer.cs">
+			<DesignTimeSharedInput>True</DesignTimeSharedInput>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Settings.settings</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="Properties\Settings.settings">
+			<Generator>SettingsSingleFileGenerator</Generator>
+			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
+		</None>
+	</ItemGroup>
+</Project>
diff --git a/CSharpBible/Graphics/PolySpline/Properties/AssemblyInfo.cs b/CSharpBible/Graphics/PolySpline/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..eb7f26e3a
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die einer Assembly zugeordnet sind.
+[assembly: AssemblyTitle("WpfApp")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("JC-Soft")]
+[assembly: AssemblyProduct("WpfApp")]
+[assembly: AssemblyCopyright("Copyright © JC-Soft 2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
+// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
+// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
+[assembly: ComVisible(false)]
+
+//Um mit dem Erstellen lokalisierbarer Anwendungen zu beginnen, legen Sie
+//<UICulture>ImCodeVerwendeteKultur</UICulture> in der .csproj-Datei
+//in einer <PropertyGroup> fest.  Wenn Sie in den Quelldateien beispielsweise Deutsch
+//(Deutschland) verwenden, legen Sie <UICulture> auf \"de-DE\" fest.  Heben Sie dann die Auskommentierung
+//des nachstehenden NeutralResourceLanguage-Attributs auf.  Aktualisieren Sie "en-US" in der nachstehenden Zeile,
+//sodass es mit der UICulture-Einstellung in der Projektdatei übereinstimmt.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher
+                                     //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird,
+                                     // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.)
+    ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs
+                                              //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird,
+                                              // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.)
+)]
+
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+// indem Sie "*" wie unten gezeigt eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/CSharpBible/Graphics/PolySpline/Properties/Resources.Designer.cs b/CSharpBible/Graphics/PolySpline/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..3628639e5
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PolySpline.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PolySpline.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/Properties/Resources.resx b/CSharpBible/Graphics/PolySpline/Properties/Resources.resx
new file mode 100644
index 000000000..096826bd1
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Properties/Resources.resx
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/CSharpBible/Graphics/PolySpline/Properties/Settings.Designer.cs b/CSharpBible/Graphics/PolySpline/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..451f93046
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PolySpline.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/Properties/Settings.settings b/CSharpBible/Graphics/PolySpline/Properties/Settings.settings
new file mode 100644
index 000000000..049245f40
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/CSharpBible/Graphics/PolySpline/ViewModels/ControlPointBehavior.cs b/CSharpBible/Graphics/PolySpline/ViewModels/ControlPointBehavior.cs
new file mode 100644
index 000000000..135a6ee74
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/ViewModels/ControlPointBehavior.cs
@@ -0,0 +1,70 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-22-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-22-2022
+// ***********************************************************************
+// <copyright file="ControlPointBehavior.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System.Windows;
+using Microsoft.Xaml.Behaviors;
+
+
+namespace PolySpline.ViewModels
+{
+    /// <summary>
+    /// Class ControlPointBehavior.
+    /// Implements the <see cref="Microsoft.Xaml.Behaviors.Behavior{System.Windows.FrameworkElement}" />
+    /// </summary>
+    /// <seealso cref="Microsoft.Xaml.Behaviors.Behavior{System.Windows.FrameworkElement}" />
+    public class ControlPointBehavior : Behavior<FrameworkElement>
+    {
+        /// <summary>
+        /// The mouse down
+        /// </summary>
+        private bool mouseDown;
+        /// <summary>
+        /// The delta
+        /// </summary>
+        private Vector delta;
+
+        /// <summary>
+        /// Called after the behavior is attached to an AssociatedObject.
+        /// </summary>
+        /// <remarks>Override this to hook up functionality to the AssociatedObject.</remarks>
+        protected override void OnAttached()
+        {
+            var iObjParent = AssociatedObject.Parent as IInputElement;
+
+            AssociatedObject.MouseLeftButtonDown += (s, e) =>
+            {
+                mouseDown = true;
+                var mousePosition = e.GetPosition(iObjParent);
+                var elementPosition = (AssociatedObject.DataContext as Coordinate)?.Point ?? new Point(0,0);
+                delta = elementPosition - mousePosition;
+                AssociatedObject.CaptureMouse();
+            };
+
+            AssociatedObject.MouseMove += (s, e) =>
+            {
+                if (!mouseDown) return;
+                var mousePosition = e.GetPosition(iObjParent);
+                var elementPosition = mousePosition + delta;
+                var c = (AssociatedObject.DataContext as Coordinate);
+                if (c!=null)
+                    c.Point = elementPosition;
+            };
+
+            AssociatedObject.MouseLeftButtonUp += (s, e) =>
+            {
+                mouseDown = false;
+                AssociatedObject.ReleaseMouseCapture();
+            };
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/ViewModels/Coordinate.cs b/CSharpBible/Graphics/PolySpline/ViewModels/Coordinate.cs
new file mode 100644
index 000000000..1f3218f13
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/ViewModels/Coordinate.cs
@@ -0,0 +1,53 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-22-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 08-20-2022
+// ***********************************************************************
+// <copyright file="Coordinate.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using MVVM.ViewModel;
+using System.Windows;
+
+
+namespace PolySpline.ViewModels
+{
+    /// <summary>
+    /// Class Coordinate.
+    /// Implements the <see cref="NotificationObject" />
+    /// </summary>
+    /// <seealso cref="NotificationObject" />
+    public class Coordinate : NotificationObject
+    {
+        /// <summary>
+        /// The x
+        /// </summary>
+        private double x;
+        /// <summary>
+        /// The y
+        /// </summary>
+        private double y;
+
+        /// <summary>
+        /// Gets or sets the x.
+        /// </summary>
+        /// <value>The x.</value>
+        public double X { get => x; set => SetProperty(ref x, value, (o, n) => RaisePropertyChanged(nameof(Point))); }
+        /// <summary>
+        /// Gets or sets the y.
+        /// </summary>
+        /// <value>The y.</value>
+        public double Y { get => y; set => SetProperty(ref y, value, (o, n) => RaisePropertyChanged(nameof(Point))); }
+        /// <summary>
+        /// Gets or sets the point.
+        /// </summary>
+        /// <value>The point.</value>
+        public Point Point { get => new Point(x, y); set { (X, Y) = (value.X, value.Y); }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/ViewModels/PolySpline.cs b/CSharpBible/Graphics/PolySpline/ViewModels/PolySpline.cs
new file mode 100644
index 000000000..77ec9cf78
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/ViewModels/PolySpline.cs
@@ -0,0 +1,27 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-22-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-22-2022
+// ***********************************************************************
+// <copyright file="PolySpline.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System.Collections.Generic;
+
+
+namespace PolySpline.ViewModels
+{
+    /// <summary>
+    /// Class PolySpline.
+    /// Implements the <see cref="System.Collections.Generic.List{PolySpline.ViewModels.Coordinate}" />
+    /// </summary>
+    /// <seealso cref="System.Collections.Generic.List{PolySpline.ViewModels.Coordinate}" />
+    public class PolySpline : List<Coordinate>
+    {
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/ViewModels/PolySplineCollection.cs b/CSharpBible/Graphics/PolySpline/ViewModels/PolySplineCollection.cs
new file mode 100644
index 000000000..0ae4545f9
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/ViewModels/PolySplineCollection.cs
@@ -0,0 +1,71 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-22-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-22-2022
+// ***********************************************************************
+// <copyright file="PolySplineCollection.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+
+namespace PolySpline.ViewModels
+{
+    /// <summary>
+    /// Class PolySplineCollection.
+    /// Implements the <see cref="System.Collections.Generic.List{PolySpline.ViewModels.PolySpline}" />
+    /// </summary>
+    /// <seealso cref="System.Collections.Generic.List{PolySpline.ViewModels.PolySpline}" />
+    public class PolySplineCollection : List<PolySpline>
+    {
+        /// <summary>
+        /// Gets the segments.
+        /// </summary>
+        /// <value>The segments.</value>
+        public IEnumerable<Segment> Segments
+        {
+            get
+            {
+                foreach (var PolySpline in this)
+                {
+                    var last = PolySpline.FirstOrDefault();
+                    bool flag = false;
+                    Coordinate middle = PolySpline.FirstOrDefault();
+                    foreach (var coordinate in PolySpline.Skip(1))
+                    {
+                        if (flag = !flag)
+                            middle = coordinate;
+                        else
+                        {
+                            yield return new Segment { Start = last ?? coordinate, Middle = middle, End = coordinate };
+                            last = coordinate;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the control points.
+        /// </summary>
+        /// <value>The control points.</value>
+        public IEnumerable<Coordinate> ControlPoints
+        {
+            get
+            {
+                foreach (var PolySpline in this)
+                {
+                    foreach (var coordinate in PolySpline)
+                        yield return coordinate;
+                }
+            }
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/ViewModels/PolySplineViewModel.cs b/CSharpBible/Graphics/PolySpline/ViewModels/PolySplineViewModel.cs
new file mode 100644
index 000000000..c32e69dfb
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/ViewModels/PolySplineViewModel.cs
@@ -0,0 +1,42 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-20-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-22-2022
+// ***********************************************************************
+// <copyright file="PolySplineViewModel.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using MVVM.ViewModel;
+namespace PolySpline.ViewModels;
+
+/// <summary>
+/// Class PolySplineViewModel.
+/// </summary>
+public partial class PolySplineViewModel : BaseViewModel
+{
+    /// <summary>
+    /// Gets or sets the pl collection.
+    /// </summary>
+    /// <value>The pl collection.</value>
+    public PolySplineCollection plCollection { get; set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PolySplineViewModel"/> class.
+    /// </summary>
+    public PolySplineViewModel()
+    {
+        plCollection = new PolySplineCollection();
+        var p = new PolySpline();
+        p.Add(new Coordinate() { X = 100, Y = 100 });
+        p.Add(new Coordinate() { X = 200, Y = 150 });
+        p.Add(new Coordinate() { X = 250, Y = 200 });
+        p.Add(new Coordinate() { X = 150, Y = 250 });
+        p.Add(new Coordinate() { X = 250, Y = 300 });
+        plCollection.Add(p);
+    }   
+}
diff --git a/CSharpBible/Graphics/PolySpline/ViewModels/Segment.cs b/CSharpBible/Graphics/PolySpline/ViewModels/Segment.cs
new file mode 100644
index 000000000..3197f0654
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/ViewModels/Segment.cs
@@ -0,0 +1,82 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-22-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 08-23-2022
+// ***********************************************************************
+// <copyright file="Segment.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using CommunityToolkit.Mvvm.ComponentModel;
+using MVVM.ViewModel;
+using System.Windows;
+
+namespace PolySpline.ViewModels
+{
+    /// <summary>
+    /// Class Segment.
+    /// </summary>
+    public partial class Segment:NotificationObjectCT
+    {
+#if NET50_OR_GREATER
+        public Coordinate? Start { get; set; }
+        public Coordinate? Middle { get; set; }
+        public Coordinate? End { get; set; }
+#else
+        /// <summary>
+        /// Gets or sets the start.
+        /// </summary>
+        /// <value>The start.</value>
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(Middle1))]
+        private Coordinate _start;
+        /// <summary>
+        /// Gets or sets the start.
+        /// </summary>
+        /// <value>The start.</value>
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(Middle1))]
+        [NotifyPropertyChangedFor(nameof(Middle2))]
+        private Coordinate _middle;
+        public Point Middle1 => new Point((Start.X * 0.333 + Middle.X * 0.667) , (Start.Y *0.333+ Middle.Y * 0.667) );
+        public Point Middle2 => new Point((End.X * 0.333 + Middle.X * 0.667), (End.Y * 0.333 + Middle.Y * 0.667) );
+        /// <summary>
+        /// Gets or sets the end.
+        /// </summary>
+        /// <value>The end.</value>
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(Middle2))]
+        private Coordinate _end;
+
+        partial void OnEndChanged(Coordinate? oldValue, Coordinate newValue)
+        {
+            if (newValue != null)
+            {
+               newValue.PropertyChanged+=(e,a)=>OnPropertyChanged(nameof(Middle2));
+            }
+        }
+        partial void OnStartChanged(Coordinate? oldValue, Coordinate newValue)
+        {
+            if (newValue != null)
+            {
+                newValue.PropertyChanged += (e, a) => OnPropertyChanged(nameof(Middle1));
+            }
+        }
+        partial void OnMiddleChanged(Coordinate? oldValue, Coordinate newValue)
+        {
+            if (newValue != null)
+            {
+                newValue.PropertyChanged += (e, a) =>
+                {
+                    OnPropertyChanged(nameof(Middle1));
+                    OnPropertyChanged(nameof(Middle2));
+                };
+            }
+        }
+#endif
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/Views/MainWindow.xaml b/CSharpBible/Graphics/PolySpline/Views/MainWindow.xaml
new file mode 100644
index 000000000..efd62b7fa
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Views/MainWindow.xaml
@@ -0,0 +1,15 @@
+<Window x:Class="PolySpline.Views.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:PolySpline.Views"
+        xmlns:mvvm="clr-namespace:PolySpline.ViewModels"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        mc:Ignorable="d"
+        
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+        <Frame Source="/Views/PolySplineView.xaml"/>
+    </Grid>
+</Window>
diff --git a/CSharpBible/Graphics/PolySpline/Views/MainWindow.xaml.cs b/CSharpBible/Graphics/PolySpline/Views/MainWindow.xaml.cs
new file mode 100644
index 000000000..409bacf0d
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Views/MainWindow.xaml.cs
@@ -0,0 +1,31 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-20-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-20-2022
+// ***********************************************************************
+// <copyright file="MainWindow.xaml.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System.Windows;
+
+namespace PolySpline.Views
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainWindow"/> class.
+        /// </summary>
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/PolySpline/Views/PolySplineView.xaml b/CSharpBible/Graphics/PolySpline/Views/PolySplineView.xaml
new file mode 100644
index 000000000..e02ce4cd4
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Views/PolySplineView.xaml
@@ -0,0 +1,73 @@
+<Page x:Class="PolySpline.Views.PolySplineView"
+        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:PolySpline.Views"
+        xmlns:mvvm="clr-namespace:PolySpline.ViewModels"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        mc:Ignorable="d"      
+        Title="MainWindow" d:Height="450" d:Width="800">
+    <Page.DataContext>
+        <mvvm:PolySplineViewModel/>
+    </Page.DataContext>
+    <Page.Resources>
+    </Page.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition Width="Auto" MinWidth="123"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0" Margin="10,10,10,10" >
+            <ItemsControl ItemsSource="{Binding plCollection.ControlPoints}" Margin="10,10,10,10">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <Canvas/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemContainerStyle>
+                    <Style TargetType="ContentPresenter">
+                        <Setter Property="Canvas.Left" Value="{Binding X}"/>
+                        <Setter Property="Canvas.Top" Value="{Binding Y}"/>
+                    </Style>
+                </ItemsControl.ItemContainerStyle>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Ellipse Margin="-10,-10,0,0" Width="20" Height="20" Stroke="DarkBlue" Fill="Transparent" Cursor="Hand">
+                            <i:Interaction.Behaviors>
+                                <mvvm:ControlPointBehavior/>
+                            </i:Interaction.Behaviors>
+                        </Ellipse>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <ItemsControl ItemsSource="{Binding plCollection.Segments}" Margin="10,10,10,10">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <Canvas/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Path Stroke="Black">
+                            
+                            <Path.Data>
+                                <PathGeometry>
+                                    
+                        <PathFigure StartPoint="{Binding Start.Point}" IsFilled="True">
+                            <BezierSegment Point1="{Binding Middle1}" Point2="{Binding Middle2}" Point3="{Binding End.Point}" IsSmoothJoin="False"/>
+                        </PathFigure>
+                                </PathGeometry>
+                            </Path.Data>
+                        <!--Line X1="{Binding Start.X}" Y1="{Binding Start.Y}" X2="{Binding End.X}" Y2="{Binding End.Y}" Stroke="Black" StrokeThickness="2"/-->
+                        </Path>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </Grid>
+        <Grid Grid.Column="1">
+            <DataGrid x:Name="Points"  ItemsSource="{Binding plCollection.ControlPoints}">
+            </DataGrid>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/CSharpBible/Graphics/PolySpline/Views/PolySplineView.xaml.cs b/CSharpBible/Graphics/PolySpline/Views/PolySplineView.xaml.cs
new file mode 100644
index 000000000..279eef5bd
--- /dev/null
+++ b/CSharpBible/Graphics/PolySpline/Views/PolySplineView.xaml.cs
@@ -0,0 +1,32 @@
+// ***********************************************************************
+// Assembly         : PolySpline_net
+// Author           : Mir
+// Created          : 06-20-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-20-2022
+// ***********************************************************************
+// <copyright file="PolySplineView.xaml.cs" company="PolySpline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using System.Windows;
+using System.Windows.Controls;
+
+namespace PolySpline.Views
+{
+    /// <summary>
+    /// Interaction logic for PolySplineView.xaml
+    /// </summary>
+    public partial class PolySplineView : Page
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PolySplineView"/> class.
+        /// </summary>
+        public PolySplineView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/CSharpBible/Graphics/Polyline/Models/IPolyLineModel.cs b/CSharpBible/Graphics/Polyline/Models/IPolyLineModel.cs
new file mode 100644
index 000000000..27acc57dd
--- /dev/null
+++ b/CSharpBible/Graphics/Polyline/Models/IPolyLineModel.cs
@@ -0,0 +1,6 @@
+namespace Polyline.Models
+{
+    public interface IPolyLineModel
+    {
+    }
+}
\ No newline at end of file
diff --git a/CSharpBible/Graphics/Polyline/Models/PolyLineModel.cs b/CSharpBible/Graphics/Polyline/Models/PolyLineModel.cs
new file mode 100644
index 000000000..4ad0340bb
--- /dev/null
+++ b/CSharpBible/Graphics/Polyline/Models/PolyLineModel.cs
@@ -0,0 +1,14 @@
+using MVVM.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Polyline.Models
+{
+    public class PolyLineModel : BaseViewModel, IPolyLineModel
+    {
+       //public Points
+    }
+}
diff --git a/CSharpBible/Graphics/Polyline/Polyline.csproj b/CSharpBible/Graphics/Polyline/Polyline.csproj
index e2db1b83b..6e988114e 100644
--- a/CSharpBible/Graphics/Polyline/Polyline.csproj
+++ b/CSharpBible/Graphics/Polyline/Polyline.csproj
@@ -51,5 +51,8 @@
 			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
 		</None>
 	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="Models\Interfaces\" />
+	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/CSharpBible/Graphics/Polyline/ViewModels/MainWindowViewModel.cs b/CSharpBible/Graphics/Polyline/ViewModels/MainWindowViewModel.cs
deleted file mode 100644
index 0ee2d03bc..000000000
--- a/CSharpBible/Graphics/Polyline/ViewModels/MainWindowViewModel.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// ***********************************************************************
-// Assembly         : Polyline_net
-// Author           : Mir
-// Created          : 06-20-2022
-//
-// Last Modified By : Mir
-// Last Modified On : 06-22-2022
-// ***********************************************************************
-// <copyright file="MainWindowViewModel.cs" company="Polyline_net">
-//     Copyright (c) JC-Soft. All rights reserved.
-// </copyright>
-// <summary></summary>
-// ***********************************************************************
-namespace Polyline.ViewModels
-{
-    /// <summary>
-    /// Class MainWindowViewModel.
-    /// </summary>
-    public class MainWindowViewModel
-    {
-        /// <summary>
-        /// Gets or sets the pl collection.
-        /// </summary>
-        /// <value>The pl collection.</value>
-        public PolylineCollection plCollection { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MainWindowViewModel"/> class.
-        /// </summary>
-        public MainWindowViewModel()
-        {
-            plCollection = new PolylineCollection();
-            var p = new Polyline();
-            p.Add(new Coordinate() { X = 100, Y = 100 });
-            p.Add(new Coordinate() { X = 200, Y = 150 });
-            p.Add(new Coordinate() { X = 250, Y = 200 });
-            p.Add(new Coordinate() { X = 150, Y = 250 });
-            p.Add(new Coordinate() { X = 250, Y = 300 });
-            plCollection.Add(p);
-        }   
-    }
-}
diff --git a/CSharpBible/Graphics/Polyline/ViewModels/PolyLineViewModel.cs b/CSharpBible/Graphics/Polyline/ViewModels/PolyLineViewModel.cs
new file mode 100644
index 000000000..437449a7e
--- /dev/null
+++ b/CSharpBible/Graphics/Polyline/ViewModels/PolyLineViewModel.cs
@@ -0,0 +1,42 @@
+// ***********************************************************************
+// Assembly         : Polyline_net
+// Author           : Mir
+// Created          : 06-20-2022
+//
+// Last Modified By : Mir
+// Last Modified On : 06-22-2022
+// ***********************************************************************
+// <copyright file="PolyLineViewModel.cs" company="Polyline_net">
+//     Copyright (c) JC-Soft. All rights reserved.
+// </copyright>
+// <summary></summary>
+// ***********************************************************************
+using MVVM.ViewModel;
+namespace Polyline.ViewModels;
+
+/// <summary>
+/// Class PolyLineViewModel.
+/// </summary>
+public partial class PolyLineViewModel : BaseViewModel
+{
+    /// <summary>
+    /// Gets or sets the pl collection.
+    /// </summary>
+    /// <value>The pl collection.</value>
+    public PolylineCollection plCollection { get; set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PolyLineViewModel"/> class.
+    /// </summary>
+    public PolyLineViewModel()
+    {
+        plCollection = new PolylineCollection();
+        var p = new Polyline();
+        p.Add(new Coordinate() { X = 100, Y = 100 });
+        p.Add(new Coordinate() { X = 200, Y = 150 });
+        p.Add(new Coordinate() { X = 250, Y = 200 });
+        p.Add(new Coordinate() { X = 150, Y = 250 });
+        p.Add(new Coordinate() { X = 250, Y = 300 });
+        plCollection.Add(p);
+    }   
+}
diff --git a/CSharpBible/Graphics/Polyline/Views/MainWindow.xaml b/CSharpBible/Graphics/Polyline/Views/MainWindow.xaml
index cbb213164..761543ea2 100644
--- a/CSharpBible/Graphics/Polyline/Views/MainWindow.xaml
+++ b/CSharpBible/Graphics/Polyline/Views/MainWindow.xaml
@@ -9,67 +9,7 @@
         mc:Ignorable="d"
         
         Title="MainWindow" Height="450" Width="800">
-    <Window.DataContext>
-        <mvvm:MainWindowViewModel />
-    </Window.DataContext>
-    <Window.Resources>
-        <mvvm:PolylineCollection x:Key="plCollection">
-            <mvvm:Polyline>
-                <mvvm:Coordinate X="150" Y="50"/>
-                <mvvm:Coordinate X="300" Y="100"/>
-                <mvvm:Coordinate X="250" Y="150"/>
-                <mvvm:Coordinate X="100" Y="200"/>
-            </mvvm:Polyline>
-        </mvvm:PolylineCollection>
-    </Window.Resources>
-    <Grid DataContext="{Binding plCollection}" d:DataContext="{StaticResource plCollection}">
-        <Grid.ColumnDefinitions>
-
-            <ColumnDefinition/>
-            <ColumnDefinition Width="Auto" MinWidth="123"/>
-
-        </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0" Margin="10,10,10,10" >
-            <ItemsControl ItemsSource="{Binding ControlPoints}" Margin="10,10,10,10">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <Canvas/>
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemContainerStyle>
-                    <Style TargetType="ContentPresenter">
-                        <Setter Property="Canvas.Left" Value="{Binding X}"/>
-                        <Setter Property="Canvas.Top" Value="{Binding Y}"/>
-                    </Style>
-                </ItemsControl.ItemContainerStyle>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Ellipse Margin="-10,-10,0,0" Width="20" Height="20" Stroke="DarkBlue" Fill="Transparent" Cursor="Hand">
-                            <i:Interaction.Behaviors>
-                                <mvvm:ControlPointBehavior/>
-                            </i:Interaction.Behaviors>
-                        </Ellipse>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <ItemsControl ItemsSource="{Binding Segments}" Margin="10,10,10,10">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <Canvas/>
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Line X1="{Binding Start.X}" Y1="{Binding Start.Y}" X2="{Binding End.X}" Y2="{Binding End.Y}" Stroke="Black" StrokeThickness="2"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </Grid>
-        <Grid Grid.Column="1">
-            <DataGrid x:Name="Points"  ItemsSource="{Binding ControlPoints}">
-                
-            </DataGrid>
-        </Grid>
-
+    <Grid>
+        <Frame Source="/Views/PolyLineView.xaml"/>
     </Grid>
 </Window>
diff --git a/CSharpBible/Graphics/Polyline/Views/PolyLineView.xaml b/CSharpBible/Graphics/Polyline/Views/PolyLineView.xaml
index 6809820ca..c4e6b58af 100644
--- a/CSharpBible/Graphics/Polyline/Views/PolyLineView.xaml
+++ b/CSharpBible/Graphics/Polyline/Views/PolyLineView.xaml
@@ -10,19 +10,9 @@
         
         Title="MainWindow" d:Height="450" d:Width="800">
     <Page.DataContext>
-        <mvvm:MainWindowViewModel />
+        <mvvm:PolyLineViewModel />
     </Page.DataContext>
-    <Page.Resources>
-        <mvvm:PolylineCollection x:Key="plCollection">
-            <mvvm:Polyline>
-                <mvvm:Coordinate X="150" Y="50"/>
-                <mvvm:Coordinate X="300" Y="100"/>
-                <mvvm:Coordinate X="250" Y="150"/>
-                <mvvm:Coordinate X="100" Y="200"/>
-            </mvvm:Polyline>
-        </mvvm:PolylineCollection>
-    </Page.Resources>
-    <Grid DataContext="{Binding plCollection}" d:DataContext="{StaticResource plCollection}">
+    <Grid DataContext="{Binding plCollection}">
         <Grid.ColumnDefinitions>
 
             <ColumnDefinition/>
diff --git a/CSharpBible/Graphics/TitleGen/TitleGen.csproj b/CSharpBible/Graphics/TitleGen/TitleGen.csproj
index 91b5cf0cc..c19a05a3e 100644
--- a/CSharpBible/Graphics/TitleGen/TitleGen.csproj
+++ b/CSharpBible/Graphics/TitleGen/TitleGen.csproj
@@ -9,7 +9,7 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resource.Designer.cs">