diff --git a/Deploy/MFD4CTS_2_6_1_RC..zip b/Deploy/MFD4CTS_2_6_1_RC..zip
new file mode 100644
index 0000000..e366aee
Binary files /dev/null and b/Deploy/MFD4CTS_2_6_1_RC..zip differ
diff --git a/Deploy/MFD4CTS_2_6_BetaInstall.zip b/Deploy/MFD4CTS_2_6_BetaInstall.zip
new file mode 100644
index 0000000..1981f66
Binary files /dev/null and b/Deploy/MFD4CTS_2_6_BetaInstall.zip differ
diff --git a/MFDSettingsManager/Configuration/Collections/ConfigurationCollection.cs b/MFDSettingsManager/Configuration/Collections/ConfigurationCollection.cs
new file mode 100644
index 0000000..3d1b883
--- /dev/null
+++ b/MFDSettingsManager/Configuration/Collections/ConfigurationCollection.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace MFDSettingsManager.Configuration.Collections
+{
+    /// <summary>
+    /// Collection of MFD configurations
+    /// </summary>
+    public class ConfigurationCollection : ConfigurationSectionCollectionBase<Configuration>
+    {
+        /// <summary>
+        /// Definition of a key
+        /// </summary>
+        /// <returns></returns>
+        protected override Func<Configuration, object> GetDefaultKey()
+        {
+            return (element) =>
+            {
+                return element.Name + element.FileName;
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/MFDSettingsManager/Configuration/Collections/ConfigurationSectionCollectionBase.cs b/MFDSettingsManager/Configuration/Collections/ConfigurationSectionCollectionBase.cs
new file mode 100644
index 0000000..a6019fc
--- /dev/null
+++ b/MFDSettingsManager/Configuration/Collections/ConfigurationSectionCollectionBase.cs
@@ -0,0 +1,189 @@
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Xml;
+
+namespace MFDSettingsManager.Configuration.Collections
+{
+    /// <summary>
+    /// Base class for all ConfigurationSectionCollection
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class ConfigurationSectionCollectionBase<T> : ConfigurationElementCollection where T : ConfigurationElement, new()
+    {
+        #region Properties
+
+        /// <summary>
+        /// Logger to use
+        /// </summary>
+        protected ILog Logger => LogManager.GetLogger("MFD4CTS");
+
+        #endregion Properties
+
+        #region Overrides to permit error logging
+
+        /// <summary>
+        /// Error deserializing an attribute
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        protected override bool OnDeserializeUnrecognizedAttribute(string name, string value)
+        {
+            Logger?.Error($"Unrecognized attribute named: {name} with value: {value}");
+            return base.OnDeserializeUnrecognizedAttribute(name, value);
+        }
+
+        /// <summary>
+        /// Logs an unrecognized element
+        /// </summary>
+        /// <param name="elementName"></param>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        protected override bool OnDeserializeUnrecognizedElement(string elementName, XmlReader reader)
+        {
+            Logger?.Error($"Unrecognized element named: {elementName} location: {ElementInformation.Source}");
+            return base.OnDeserializeUnrecognizedElement(elementName, reader);
+        }
+
+        /// <summary>
+        /// Logs a required property missing
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        protected override object OnRequiredPropertyNotFound(string name)
+        {
+            Logger?.Error($"Required property missing named: {name}.");
+            return base.OnRequiredPropertyNotFound(name);
+        }
+
+        #endregion Overrides to permit error logging
+
+        #region Collection item access
+
+        /// <summary>
+        /// Exposes the Collection as a List
+        /// </summary>
+        public List<T> List => GetAsList();
+
+        /// <summary>
+        /// Access collection item by index
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public T this[int index]
+        {
+            get
+            {
+                return BaseGet(index) as T;
+            }
+            set
+            {
+                if (BaseGet(index) != null)
+                {
+                    BaseRemoveAt(index);
+                }
+                BaseAdd(index, value);
+            }
+        }
+
+        /// <summary>
+        /// Access collection item by key
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public new T this[string key]
+        {
+            get { return (T)BaseGet(key); }
+            set
+            {
+                if (BaseGet(key) != null)
+                {
+                    BaseRemoveAt(BaseIndexOf(BaseGet(key)));
+                }
+                BaseAdd(value);
+            }
+        }
+
+        /// <summary>
+        /// Public add needed to provide a method for adding items to the collection
+        /// </summary>
+        /// <param name="definition"></param>
+        public void Add(T definition)
+        {
+            BaseAdd(definition);
+        }
+
+        /// <summary>
+        /// Public remove method to provide a method for removing items from the collection
+        /// </summary>
+        /// <param name="definition"></param>
+        public void Remove(T definition)
+        {
+            BaseRemove(GetCompositeKey);
+        }
+
+        #endregion Collection item access
+
+        #region Create new element for the collection
+
+        /// <summary>
+        /// Creates a new element for the collection
+        /// </summary>
+        /// <returns></returns>
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new T();
+        }
+
+        #endregion Create new element for the collection
+
+        #region Key and item management
+
+        /// <summary>
+        /// Function to define how we get a key
+        /// </summary>
+        public Func<T, object> GetCompositeKey => GetDefaultKey();
+
+        /// <summary>
+        /// Default implementation returns empty string
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Func<T, object> GetDefaultKey()
+        {
+            return (T) => "";
+        }
+
+        /// <summary>
+        /// Each unique entry is Name+FileName
+        /// </summary>
+        /// <param name="element"></param>
+        /// <returns></returns>
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return GetCompositeKey?.Invoke((T)element) ?? "";
+        }
+
+        #endregion Key and item management
+
+        #region Private helpers
+
+        private List<T> GetAsList()
+        {
+            var defList = new List<T>();
+
+            var iterator = this.GetEnumerator();
+            while (iterator.MoveNext())
+            {
+                defList.Add((T)iterator.Current);
+            }
+
+            return defList;
+        }
+        
+
+        #endregion Private helpers    
+    }
+}
+    
diff --git a/MFDSettingsManager/Configuration/Collections/ModulesConfigurationCollection.cs b/MFDSettingsManager/Configuration/Collections/ModulesConfigurationCollection.cs
new file mode 100644
index 0000000..3a68df6
--- /dev/null
+++ b/MFDSettingsManager/Configuration/Collections/ModulesConfigurationCollection.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace MFDSettingsManager.Configuration.Collections
+{
+    /// <summary>
+    /// Module configuration collection
+    /// </summary>
+    public class ModulesConfigurationCollection : ConfigurationSectionCollectionBase<ModuleConfiguration>
+    {
+        /// <summary>
+        /// Definition of a key
+        /// </summary>
+        /// <returns></returns>
+        protected override Func<ModuleConfiguration, object> GetDefaultKey()
+        {
+            return (element) =>
+            {
+                return element.ModuleName;
+            };
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/MFDSettingsManager/Configuration/Collections/SubConfigurationCollection.cs b/MFDSettingsManager/Configuration/Collections/SubConfigurationCollection.cs
new file mode 100644
index 0000000..a4c9226
--- /dev/null
+++ b/MFDSettingsManager/Configuration/Collections/SubConfigurationCollection.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace MFDSettingsManager.Configuration.Collections
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class SubConfigurationCollection : ConfigurationSectionCollectionBase<SubConfiguration>
+    {
+        /// <summary>
+        /// Definition of a key
+        /// </summary>
+        /// <returns></returns>
+        protected override Func<SubConfiguration, object> GetDefaultKey()
+        {
+            return (subconfig) =>
+            {
+                return subconfig.Name;
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/MFDSettingsManager/Configuration/Elements/Configuration.cs b/MFDSettingsManager/Configuration/Elements/Configuration.cs
new file mode 100644
index 0000000..f472678
--- /dev/null
+++ b/MFDSettingsManager/Configuration/Elements/Configuration.cs
@@ -0,0 +1,136 @@
+using MFDSettingsManager.Configuration.Collections;
+using System;
+using System.Configuration;
+
+namespace MFDSettingsManager.Configuration
+{
+    /// <summary>
+    /// Encapsulates a MFD configuration
+    /// </summary>
+    public class Configuration : ConfigurationBase
+    {
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public Configuration()
+        {
+        }
+
+        /// <summary>
+        /// Sub-Configurations
+        /// </summary>
+        [ConfigurationProperty("SubConfigurations", IsDefaultCollection = false)]
+        [ConfigurationCollection(typeof(SubConfigurationCollection), AddItemName = "add", ClearItemsName = "clear", RemoveItemName = "remove")]
+        public SubConfigurationCollection SubConfigurations
+        {
+            get
+            {
+                object o = this["SubConfigurations"];
+                return o as SubConfigurationCollection;
+            }
+
+            set
+            {
+                this["SubConfigurations"] = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="dc"></param>
+        public Configuration(Configuration dc) : base(dc)
+        {
+            Height = dc.Height;
+            Width = dc.Width;
+            Left = dc.Left;
+            Top = dc.Top;
+        }
+
+        #region Left, Top, Wdith and Height
+
+        /// <summary>
+        /// Nullable Width of the image in the display, used to override the default
+        /// </summary>
+        [ConfigurationProperty("width", IsRequired = false)]
+        public int? Width
+        {
+            get
+            {
+                if (this["width"] == null)
+                {
+                    return null;
+                }
+                return (int)Convert.ChangeType(this["width"], typeof(int));
+            }
+            set
+            {
+                this["width"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Nullable Height of the image in the display, used to override the default
+        /// </summary>
+        [ConfigurationProperty("height", IsRequired = false)]
+        public int? Height
+        {
+            get
+            {
+                if (this["height"] == null)
+                {
+                    return null;
+                }
+                return (int)Convert.ChangeType(this["height"], typeof(int));
+            }
+            set
+            {
+                this["height"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Nullable Left position of the image in the display
+        /// </summary>
+        [ConfigurationProperty("left", IsRequired = false)]
+        public int? Left
+        {
+            get
+            {
+                if (this["left"] == null)
+                {
+                    return null;
+                }
+                return (int)Convert.ChangeType(this["left"], typeof(int));
+            }
+            set
+            {
+                this["left"] = value;
+            }
+        }
+        
+        /// <summary>
+        /// Nullable Top position of the image in the display
+        /// </summary>
+        [ConfigurationProperty("top", IsRequired = false)]
+        public int? Top
+        {
+            get
+            {
+                if (this["top"] == null)
+                {
+                    return null;
+                }
+                return (int)Convert.ChangeType(this["top"], typeof(int));
+            }
+            set
+            {
+                this["top"] = value;
+            }
+        }
+
+        #endregion Left, Top, Wdith and Height
+    }
+}
\ No newline at end of file
diff --git a/MFDSettingsManager/Configuration/MFDDefintion.cs b/MFDSettingsManager/Configuration/Elements/ConfigurationBase.cs
similarity index 65%
rename from MFDSettingsManager/Configuration/MFDDefintion.cs
rename to MFDSettingsManager/Configuration/Elements/ConfigurationBase.cs
index 87f8aca..1074e04 100644
--- a/MFDSettingsManager/Configuration/MFDDefintion.cs
+++ b/MFDSettingsManager/Configuration/Elements/ConfigurationBase.cs
@@ -4,29 +4,25 @@
 namespace MFDSettingsManager.Configuration
 {
     /// <summary>
-    /// Encapsulates a MFD configuration
+    /// Base class for all configuration types
     /// </summary>
-    public class MFDDefintion : ConfigurationElement
+    public abstract class ConfigurationBase : ConfigurationElement
     {
-
         /// <summary>
         /// Default constructor
         /// </summary>
-        public MFDDefintion()
+        public ConfigurationBase()
         {
+
         }
 
         /// <summary>
-        /// Copy constructor
+        /// Base copy constructor
         /// </summary>
         /// <param name="dc"></param>
-        public MFDDefintion(MFDDefintion dc)
+        public ConfigurationBase(ConfigurationBase dc) 
         {
             FileName = dc.FileName;
-            Height = dc.Height;
-            Width = dc.Width;
-            Left = dc.Left;
-            Top = dc.Top;
             Name = dc.Name;
             Enabled = dc.Enabled ?? true;
             XOffsetStart = dc.XOffsetStart;
@@ -109,90 +105,6 @@ public string FileName
 
         #endregion General configuration properties
 
-        #region Left, Top, Wdith and Height
-
-        /// <summary>
-        /// Nullable Width of the image in the display, used to override the default
-        /// </summary>
-        [ConfigurationProperty("width", IsRequired = false)]
-        public int? Width
-        {
-            get
-            {
-                if (this["width"] == null)
-                {
-                    return null;
-                }
-                return (int)Convert.ChangeType(this["width"], typeof(int));
-            }
-            set
-            {
-                this["width"] = value;
-            }
-        }
-
-        /// <summary>
-        /// Nullable Height of the image in the display, used to override the default
-        /// </summary>
-        [ConfigurationProperty("height", IsRequired = false)]
-        public int? Height
-        {
-            get
-            {
-                if (this["height"] == null)
-                {
-                    return null;
-                }
-                return (int)Convert.ChangeType(this["height"], typeof(int));
-            }
-            set
-            {
-                this["height"] = value;
-            }
-        }
-
-        /// <summary>
-        /// Nullable Left position of the image in the display
-        /// </summary>
-        [ConfigurationProperty("left", IsRequired = false)]
-        public int? Left
-        {
-            get
-            {
-                if (this["left"] == null)
-                {
-                    return null;
-                }
-                return (int)Convert.ChangeType(this["left"], typeof(int));
-            }
-            set
-            {
-                this["left"] = value;
-            }
-        }
-        
-        /// <summary>
-        /// Nullable Top position of the image in the display
-        /// </summary>
-        [ConfigurationProperty("top", IsRequired = false)]
-        public int? Top
-        {
-            get
-            {
-                if (this["top"] == null)
-                {
-                    return null;
-                }
-                return (int)Convert.ChangeType(this["top"], typeof(int));
-            }
-            set
-            {
-                this["top"] = value;
-            }
-        }
-
-        #endregion Left, Top, Wdith and Height
-
         #region X Offsets
 
         /// <summary>
@@ -267,7 +179,7 @@ public int? YOffsetFinish
         {
             get
             {
-                if(this["yOffsetFinish"] == null)
+                if (this["yOffsetFinish"] == null)
                 {
                     return null;
                 }
@@ -281,4 +193,4 @@ public int? YOffsetFinish
 
         #endregion Y Offsets
     }
-}
\ No newline at end of file
+}
diff --git a/MFDSettingsManager/Configuration/ModuleConfigurationDefintion.cs b/MFDSettingsManager/Configuration/Elements/ModuleConfiguration.cs
similarity index 79%
rename from MFDSettingsManager/Configuration/ModuleConfigurationDefintion.cs
rename to MFDSettingsManager/Configuration/Elements/ModuleConfiguration.cs
index d4cb314..1789963 100644
--- a/MFDSettingsManager/Configuration/ModuleConfigurationDefintion.cs
+++ b/MFDSettingsManager/Configuration/Elements/ModuleConfiguration.cs
@@ -1,4 +1,5 @@
-using System;
+using MFDSettingsManager.Configuration.Collections;
+using System;
 using System.Configuration;
 
 namespace MFDSettingsManager.Configuration
@@ -6,7 +7,7 @@ namespace MFDSettingsManager.Configuration
     /// <summary>
     /// Module configuration
     /// </summary>
-    public class ModuleConfigurationDefintion : ConfigurationElement
+    public class ModuleConfiguration : ConfigurationElement
     {
         #region Module configuration properties
 
@@ -66,13 +67,13 @@ public string FileName
         /// MFD Configurations
         /// </summary>
         [ConfigurationProperty("Configurations", IsDefaultCollection = true)]
-        [ConfigurationCollection(typeof(MFDDefinitionsCollection), AddItemName = "add", ClearItemsName = "clear", RemoveItemName = "remove")]
-        public MFDDefinitionsCollection MFDConfigurations
+        [ConfigurationCollection(typeof(ConfigurationCollection), AddItemName = "add", ClearItemsName = "clear", RemoveItemName = "remove")]
+        public ConfigurationCollection Configurations
         {
             get
             {
                 object o = this["Configurations"];
-                return o as MFDDefinitionsCollection;
+                return o as ConfigurationCollection;
             }
 
             set
@@ -86,12 +87,12 @@ public MFDDefinitionsCollection MFDConfigurations
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        public MFDDefintion GetMFDConfiguration(string name)
+        public Configuration GetMFDConfiguration(string name)
         {
-            var iterator = MFDConfigurations.GetEnumerator();
+            var iterator = Configurations.GetEnumerator();
             while(iterator.MoveNext())
             {
-                var currentConfig = (MFDDefintion) iterator.Current;
+                var currentConfig = (Configuration) iterator.Current;
                 if(currentConfig.Name == name)
                 {
                     return currentConfig;
diff --git a/MFDSettingsManager/Configuration/Elements/SubConfiguration.cs b/MFDSettingsManager/Configuration/Elements/SubConfiguration.cs
new file mode 100644
index 0000000..91eec3b
--- /dev/null
+++ b/MFDSettingsManager/Configuration/Elements/SubConfiguration.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace MFDSettingsManager.Configuration
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class SubConfiguration : ConfigurationBase
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public SubConfiguration()
+        {
+
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="dc"></param>
+        public SubConfiguration(SubConfiguration dc) : base(dc)
+        {
+            StartX = dc.StartX;
+            StartY = dc.StartY;
+            EndX = dc.EndX;
+            EndY = dc.EndY;
+        }
+
+
+        #region startX, startY, endX and endY
+
+        /// <summary>
+        /// Starting X position
+        /// </summary>
+        [ConfigurationProperty("startX", IsRequired = false)]
+        public int? StartX
+        {
+            get
+            {
+                if (this["startX"] == null)
+                {
+                    return null;
+                }
+
+                return (int)Convert.ChangeType(this["startX"], typeof(int));
+            }
+            set
+            {
+                this["startX"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Starting Y position
+        /// </summary>
+        [ConfigurationProperty("startY", IsRequired = false)]
+        public int? StartY
+        {
+            get
+            {
+                if (this["startY"] == null)
+                {
+                    return null;
+                }
+
+                return (int)Convert.ChangeType(this["startY"], typeof(int));
+            }
+            set
+            {
+                this["startY"] = value;
+            }
+        }
+
+        /// <summary>
+        /// ending X position
+        /// </summary>
+        [ConfigurationProperty("endX", IsRequired = false)]
+        public int? EndX
+        {
+            get
+            {
+                if (this["endX"] == null)
+                {
+                    return null;
+                }
+
+                return (int)Convert.ChangeType(this["endX"], typeof(int));
+            }
+            set
+            {
+                this["endX"] = value;
+            }
+        }
+
+        /// <summary>
+        /// ending Y position
+        /// </summary>
+        [ConfigurationProperty("endY", IsRequired = false)]
+        public int? EndY
+        {
+            get
+            {
+                if (this["endY"] == null)
+                {
+                    return null;
+                }
+
+                return (int)Convert.ChangeType(this["endY"], typeof(int));
+            }
+            set
+            {
+                this["endY"] = value;
+            }
+        }
+
+
+        #endregion startX, startY, endX and endY
+    }
+}
\ No newline at end of file
diff --git a/MFDSettingsManager/Configuration/MFDConfigurationSection.cs b/MFDSettingsManager/Configuration/MFDConfigurationSection.cs
index ccfd067..286ee83 100644
--- a/MFDSettingsManager/Configuration/MFDConfigurationSection.cs
+++ b/MFDSettingsManager/Configuration/MFDConfigurationSection.cs
@@ -1,4 +1,5 @@
 using log4net;
+using MFDSettingsManager.Configuration.Collections;
 using System;
 using System.Configuration;
 using System.IO;
@@ -35,7 +36,7 @@ public static MFDConfigurationSection GetConfig(ILog logger, string fullPathtoCo
 
             System.Configuration.Configuration currentConfiguration = null;
 
-            if(string.IsNullOrEmpty(fullPathtoConfig))
+            if (string.IsNullOrEmpty(fullPathtoConfig))
             {
                 var exeAssem = Assembly.GetEntryAssembly();
                 currentConfiguration = ConfigurationManager.OpenExeConfiguration(exeAssem.Location);
@@ -62,7 +63,6 @@ public static MFDConfigurationSection GetConfig(ILog logger, string fullPathtoCo
             }
 
             return null;
-
         }
 
         #region Properties to support schema definitions 
@@ -119,23 +119,6 @@ internal set
 
         #region Main configuration properties
 
-        /// <summary>
-        /// SaveClips results in the cropped images being saved
-        /// </summary>
-        [ConfigurationProperty("saveClips", IsRequired = false)]
-        public bool? SaveClips
-        {
-            get
-            {
-                return (bool?)this["saveClips"];
-            }
-            set
-            {
-                IsDataDirty = true;
-                this["saveClips"] = value;
-            }
-        }
-
         /// <summary>
         /// The file path to the images to be cropped
         /// </summary>
@@ -178,13 +161,13 @@ public string DefaultConfig
         /// MFD Default Configurations
         /// </summary>
         [ConfigurationProperty("DefaultConfigurations", IsDefaultCollection = false, IsRequired = false)]
-        [ConfigurationCollection(typeof(MFDDefinitionsCollection), AddItemName = "add", ClearItemsName = "clear", RemoveItemName = "remove")]
-        public MFDDefinitionsCollection DefaultConfigurations
+        [ConfigurationCollection(typeof(ConfigurationCollection), AddItemName = "add", ClearItemsName = "clear", RemoveItemName = "remove")]
+        public ConfigurationCollection DefaultConfigurations
         {
             get
             {
                 object o = this["DefaultConfigurations"];
-                return o as MFDDefinitionsCollection;
+                return o as ConfigurationCollection;
             }
 
             set
diff --git a/MFDSettingsManager/Configuration/MFDDefinitionsCollection.cs b/MFDSettingsManager/Configuration/MFDDefinitionsCollection.cs
deleted file mode 100644
index 91f9195..0000000
--- a/MFDSettingsManager/Configuration/MFDDefinitionsCollection.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace MFDSettingsManager.Configuration
-{
-    /// <summary>
-    /// Collection of MFD configurations
-    /// </summary>
-    public class MFDDefinitionsCollection : ConfigurationElementCollection
-    {
-
-        /// <summary>
-        /// Exposes the Collection as a List
-        /// </summary>
-        public List<MFDDefintion> List => GetAsList();
-
-        private List<MFDDefintion> GetAsList()
-        {
-            var defList = new List<MFDDefintion>();
-
-            var iterator = this.GetEnumerator();
-            while(iterator.MoveNext())
-            {
-                defList.Add((MFDDefintion) iterator.Current);
-            }
-
-            return defList;
-        }
-
-        #region Collection item access
-
-        /// <summary>
-        /// Access collection item by index
-        /// </summary>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        public MFDDefintion this[int index]
-        {
-            get
-            {
-                return BaseGet(index) as MFDDefintion;
-            }
-            set
-            {
-                if (BaseGet(index) != null)
-                {
-                    BaseRemoveAt(index);
-                }
-                BaseAdd(index, value);
-            }
-        }
-
-        /// <summary>
-        /// Access collection item by key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public new MFDDefintion this[string key]
-        {
-            get { return (MFDDefintion)BaseGet(key); }
-            set
-            {
-                if (BaseGet(key) != null)
-                {
-                    BaseRemoveAt(BaseIndexOf(BaseGet(key)));
-                }
-                BaseAdd(value);
-            }
-        }
-
-        #endregion Collection item access
-
-        #region Create new element for the collection
-
-        /// <summary>
-        /// Creates a new element for the collection
-        /// </summary>
-        /// <returns></returns>
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new MFDDefintion();
-        }
-
-        #endregion Create new element for the collection
-
-        #region Key and item management
-
-        /// <summary>
-        /// Each unique entry is Name+FileName
-        /// </summary>
-        /// <param name="element"></param>
-        /// <returns></returns>
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((MFDDefintion)element).Name + ((MFDDefintion)element).FileName;
-        }
-
-        /// <summary>
-        /// Public add needed to provide a method for adding items to the collection
-        /// </summary>
-        /// <param name="definition"></param>
-        public void Add(MFDDefintion definition)
-        {
-            BaseAdd(definition);
-        }
-
-        /// <summary>
-        /// Public remove needed to provide a method for removing items from the collection
-        /// </summary>
-        /// <param name="defintion"></param>
-        public void Remove(MFDDefintion defintion)
-        {
-            BaseRemove(defintion.Name + defintion.FileName);
-        }
-
-        #endregion Key and item management
-    }
-}
\ No newline at end of file
diff --git a/MFDSettingsManager/Configuration/ModulesConfigurationCollection.cs b/MFDSettingsManager/Configuration/ModulesConfigurationCollection.cs
deleted file mode 100644
index 4b64dcf..0000000
--- a/MFDSettingsManager/Configuration/ModulesConfigurationCollection.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace MFDSettingsManager.Configuration
-{
-    /// <summary>
-    /// Module configuration collection
-    /// </summary>
-    public class ModulesConfigurationCollection : ConfigurationElementCollection
-    {
-        /// <summary>
-        /// Exposes the Collection as a List
-        /// </summary>
-        public List<ModuleConfigurationDefintion> List => GetAsList();
-
-        private List<ModuleConfigurationDefintion> GetAsList()
-        {
-            var defList = new List<ModuleConfigurationDefintion>();
-
-            var iterator = this.GetEnumerator();
-            while (iterator.MoveNext())
-            {
-                defList.Add((ModuleConfigurationDefintion)iterator.Current);
-            }
-
-            return defList;
-        }
-
-        #region Collection item access
-
-        /// <summary>
-        /// Access collection item by index
-        /// </summary>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        public ModuleConfigurationDefintion this[int index]
-        {
-            get
-            {
-                return BaseGet(index) as ModuleConfigurationDefintion;
-            }
-            set
-            {
-                if (BaseGet(index) != null)
-                {
-                    BaseRemoveAt(index);
-                }
-                BaseAdd(index, value);
-            }
-        }
-
-        /// <summary>
-        /// Access collection item by key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public new ModuleConfigurationDefintion this[string key]
-        {
-            get { return (ModuleConfigurationDefintion)BaseGet(key); }
-            set
-            {
-                if (BaseGet(key) != null)
-                {
-                    BaseRemoveAt(BaseIndexOf(BaseGet(key)));
-                }
-                BaseAdd(value);
-            }
-        }
-
-        #endregion Collection item access
-
-        #region Create new element for the collection
-
-        /// <summary>
-        /// Creates a new element for the collection
-        /// </summary>
-        /// <returns></returns>
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ModuleConfigurationDefintion();
-        }
-
-        #endregion Create new element for the collection
-
-        #region Key and item management
-        
-        /// <summary>
-        /// Each unique entry is IntegrationType+SubWorkflowKey
-        /// </summary>
-        /// <param name="element"></param>
-        /// <returns></returns>
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ModuleConfigurationDefintion)element).ModuleName;
-        }
-
-        /// <summary>
-        /// Public add needed to provide a method for adding items to the collection
-        /// </summary>
-        /// <param name="definition"></param>
-        public void Add(ModuleConfigurationDefintion definition)
-        {
-            BaseAdd(definition);
-        }
-
-        /// <summary>
-        /// Public remove needed to provide a method for removing items from the collection
-        /// </summary>
-        /// <param name="defintion"></param>
-        public void Remove(ModuleConfigurationDefintion defintion)
-        {
-            BaseRemove(defintion.ModuleName);
-        }
-
-        #endregion Key and item management
-    }
-}
\ No newline at end of file
diff --git a/MFDSettingsManager/MFDSettingsManager.csproj b/MFDSettingsManager/MFDSettingsManager.csproj
index fa905ea..a4a9bad 100644
--- a/MFDSettingsManager/MFDSettingsManager.csproj
+++ b/MFDSettingsManager/MFDSettingsManager.csproj
@@ -51,19 +51,25 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Configuration\Collections\ConfigurationSectionCollectionBase.cs" />
+    <Compile Include="Configuration\Elements\ConfigurationBase.cs" />
+    <Compile Include="Configuration\Elements\SubConfiguration.cs" />
+    <Compile Include="Configuration\Collections\SubConfigurationCollection.cs" />
     <Compile Include="Extensions\ArgProcessingExtensions.cs" />
     <Compile Include="Extensions\ConfigurationSectionExtensions.cs" />
     <Compile Include="Extensions\ImageHandlerExtensions.cs" />
     <Compile Include="Mappers\ConfigSectionModelMapper.cs" />
     <Compile Include="Mappers\NativeMethods.cs" />
     <Compile Include="Configuration\MFDConfigurationSection.cs" />
-    <Compile Include="Configuration\MFDDefinitionsCollection.cs" />
-    <Compile Include="Configuration\MFDDefintion.cs" />
+    <Compile Include="Configuration\Collections\ConfigurationCollection.cs" />
+    <Compile Include="Configuration\Elements\Configuration.cs" />
+    <Compile Include="Models\ConfigurationModelBase.cs" />
     <Compile Include="Models\ConfigurationDefinition.cs" />
     <Compile Include="Models\ModuleDefinition.cs" />
     <Compile Include="Models\ModulesConfiguration.cs" />
-    <Compile Include="Configuration\ModuleConfigurationDefintion.cs" />
-    <Compile Include="Configuration\ModulesConfigurationCollection.cs" />
+    <Compile Include="Configuration\Elements\ModuleConfiguration.cs" />
+    <Compile Include="Configuration\Collections\ModulesConfigurationCollection.cs" />
+    <Compile Include="Models\SubConfigurationDefinition.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Enum\SavedImageType.cs" />
   </ItemGroup>
diff --git a/MFDSettingsManager/Mappers/ConfigSectionModelMapper.cs b/MFDSettingsManager/Mappers/ConfigSectionModelMapper.cs
index b625f73..03a21d1 100644
--- a/MFDSettingsManager/Mappers/ConfigSectionModelMapper.cs
+++ b/MFDSettingsManager/Mappers/ConfigSectionModelMapper.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace MFDSettingsManager.Mappers
 {
@@ -45,7 +44,7 @@ internal static ModulesConfiguration MapFromConfigurationSection(MFDConfiguratio
                 var modelModule = ConvertFromConfigSectionModule(moduleConfigurations, currentModule);
 
                 // Add the Configurations
-                currentModule.MFDConfigurations.List.ForEach(currentConfig =>
+                currentModule.Configurations.List.ForEach(currentConfig =>
                 {
                     var mfdConfiguration = ConvertFromConfigSectionDefinition(section, modelModule, currentConfig);
                     logger.Info($"Loading Configuration {mfdConfiguration.ToReadableString()}...");
@@ -60,7 +59,6 @@ internal static ModulesConfiguration MapFromConfigurationSection(MFDConfiguratio
                         dc.Logger = logger;
                         dc.ModuleName = modelModule.ModuleName;
                         dc.FileName = !string.IsNullOrEmpty(modelModule.FileName) ? modelModule.FileName : dc.FileName;
-                        dc.SaveResults = dc.SaveResults ?? section.SaveClips ?? false;
                         logger.Info($"Adding default configuration {dc.ToReadableString()}...");
                         var newMfdConfiguration = new ConfigurationDefinition(dc)
                         {
@@ -80,7 +78,6 @@ internal static ModulesConfiguration MapFromConfigurationSection(MFDConfiguratio
                         existConfig.YOffsetStart = existConfig.YOffsetStart == 0 ? dc.YOffsetStart : existConfig.YOffsetStart;
                         existConfig.YOffsetFinish = existConfig.YOffsetFinish == 0 ? dc.YOffsetFinish : existConfig.YOffsetFinish;
                         existConfig.FileName = string.IsNullOrEmpty(existConfig.FileName) ? dc.FileName : existConfig.FileName;
-                        existConfig.SaveResults = existConfig.SaveResults ?? dc.SaveResults ?? false;
                         existConfig.ModuleName = modelModule.ModuleName;
                         existConfig.FilePath = section.FilePath;
                         var completePath = Path.Combine(section.FilePath, existConfig.FileName);
@@ -133,12 +130,11 @@ private static ModulesConfiguration ConvertFromConfigSection(MFDConfigurationSec
             {
                 Logger = section.Logger,
                 FilePath = section.FilePath,
-                DefaultConfig = section.DefaultConfig,
-                SaveClips = section.SaveClips ?? false,
+                DefaultConfig = section.DefaultConfig
             };
         }
 
-        private static ModuleDefinition ConvertFromConfigSectionModule(ModulesConfiguration parent, ModuleConfigurationDefintion module)
+        private static ModuleDefinition ConvertFromConfigSectionModule(ModulesConfiguration parent, ModuleConfiguration module)
         {
             return new ModuleDefinition()
             {
@@ -149,9 +145,9 @@ private static ModuleDefinition ConvertFromConfigSectionModule(ModulesConfigurat
             };
         }
 
-        private static ConfigurationDefinition ConvertFromConfigSectionDefinition(MFDConfigurationSection section, ModuleDefinition parent, MFDDefintion currentConfig)
+        private static ConfigurationDefinition ConvertFromConfigSectionDefinition(MFDConfigurationSection section, ModuleDefinition parent, Configuration.Configuration currentConfig)
         {
-            return new ConfigurationDefinition()
+            var config = new ConfigurationDefinition()
             {
                 Logger = section.Logger,
                 ModuleName = parent?.ModuleName,
@@ -168,9 +164,34 @@ private static ConfigurationDefinition ConvertFromConfigSectionDefinition(MFDCon
                 YOffsetStart = currentConfig.YOffsetStart ?? 0,
                 YOffsetFinish = currentConfig.YOffsetFinish ?? 0,
                 Enabled = currentConfig.Enabled ?? true,
-                SaveResults = section.SaveClips
-           };
+                SubConfigurations = new List<SubConfigurationDefinition>()
+            };
+
+            currentConfig.SubConfigurations.List.ForEach((subConfig) =>
+            {
+                var currentSubConfig = new SubConfigurationDefinition()
+                {
+                    Enabled = subConfig.Enabled ?? currentConfig.Enabled ?? true,
+                    EndX = subConfig.EndX ?? 0,
+                    EndY = subConfig.EndY ?? 0,
+                    StartX = subConfig.StartX ?? 0,
+                    StartY = subConfig.StartY ?? 0,
+                    FileName = subConfig.FileName ?? currentConfig.FileName ?? parent.FileName,
+                    FilePath = section.FilePath,
+                    Logger = section.Logger,
+                    ModuleName = parent?.ModuleName,
+                    Name = subConfig.Name,
+                    Opacity = subConfig.Opacity ?? 0,
+                    XOffsetStart = subConfig.XOffsetStart ?? 0,
+                    XOffsetFinish = subConfig.XOffsetFinish ?? 0,
+                    YOffsetStart = subConfig.YOffsetStart ?? 0,
+                    YOffsetFinish = subConfig.YOffsetFinish ?? 0
+                };
+
+                config.SubConfigurations.Add(currentSubConfig);
+            });
 
+            return config; 
         }
     }
 }
diff --git a/MFDSettingsManager/Models/ConfigurationDefinition.cs b/MFDSettingsManager/Models/ConfigurationDefinition.cs
index 3ee3775..cfbd45f 100644
--- a/MFDSettingsManager/Models/ConfigurationDefinition.cs
+++ b/MFDSettingsManager/Models/ConfigurationDefinition.cs
@@ -1,56 +1,40 @@
-using log4net;
-using MFDSettingsManager.Enum;
-using MFDSettingsManager.Extensions;
-using System;
+using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 
 namespace MFDSettingsManager.Models
 {
     /// <summary>
     /// Single Configuration for a Module
     /// </summary>
-    public class ConfigurationDefinition 
+    public class ConfigurationDefinition : ConfigurationModelBase
     {
-        /// <summary>
-        /// Logger
-        /// </summary>
-        public ILog Logger { get; set; }
+        #region Ctor
 
-        #region Identifying properties
         /// <summary>
-        /// Module Name
-        /// </summary>
-        public string ModuleName { get; set; }
-        /// <summary>
-        /// Name of the Configuration
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// FileName for the image cropping that this configuration uses
+        /// Default constructor
         /// </summary>
-        public string FileName { get; set; }
+        public ConfigurationDefinition()
+        {
 
-        /// <summary>
-        /// The starting file path for the configuration
-        /// </summary>
-        public string FilePath { get; set; }
+        }
 
         /// <summary>
-        /// Determines if the configuration is rendered
+        /// Copy constructor
         /// </summary>
-        public bool Enabled { get; internal set; }
+        /// <param name="dc"></param>
+        public ConfigurationDefinition(ConfigurationDefinition dc) : base(dc)
+        {
+            Left = dc.Left;
+            Top = dc.Top;
+            Width = dc.Width;
+            Height = dc.Height;
+        }
 
-        #endregion Identifying properties
+        #endregion Ctor
 
         #region Basic Image Properties Left, Top, Width, Height and Opacity
         /// <summary>
-        /// Translucency of the image expressed as percentage of solidness 
-        /// </summary>
-        public float Opacity { get; set; }
-        /// <summary>
         /// Width of the displayed image
         /// </summary>
         public int Width { get; set; }
@@ -69,144 +53,27 @@ public class ConfigurationDefinition
 
         #endregion Basic Image Properties Left, Top, Width, Height and Opacity
 
-        #region Image cropping properties
-        /// <summary>
-        /// Starting X position of the Crop
-        /// </summary>
-        public int XOffsetStart { get; set; }
-        /// <summary>
-        /// Starting Y position of the Crop
-        /// </summary>
-        public int YOffsetStart { get; set; }
-        /// <summary>
-        /// Ending X position of the Crop
-        /// </summary>
-        public int XOffsetFinish { get; set; }
-        /// <summary>
-        /// Ending Y position of the Crop
-        /// </summary>
-        public int YOffsetFinish { get; set; }
-        /// <summary>
-        /// If true then the results of the cropping are saved
-        /// </summary>
-        public bool? SaveResults { get; set; }
-        #endregion Image cropping properties
-
-        #region Public methods
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public ConfigurationDefinition()
-        {
-
-        }
-
-        /// <summary>
-        /// Copy constructor
-        /// </summary>
-        /// <param name="dc"></param>
-        public ConfigurationDefinition(ConfigurationDefinition dc)
-        {
-            Enabled = dc.Enabled;
-            Logger = dc.Logger;
-            FileName = dc.FileName;
-            ModuleName = dc.ModuleName;
-            Left = dc.Left;
-            Top = dc.Top;
-            Width = dc.Width;
-            Height = dc.Height;
-            Name = dc.Name;
-            XOffsetStart = dc.XOffsetStart;
-            XOffsetFinish = dc.XOffsetFinish;
-            YOffsetStart = dc.YOffsetStart;
-            YOffsetFinish = dc.YOffsetFinish;
-            SaveResults = dc.SaveResults;
-            Opacity = dc.Opacity;
-        }
+        #region SubConfiguration support
 
         /// <summary>
-        /// Crop the specified image
+        /// List of SubConfigurations
         /// </summary>
-        /// <param name="imagePath"></param>
-        /// <returns></returns>
-        public BitmapSource CropImage(string imagePath)
-        {
-            if (Enabled)
-            {
-                BitmapImage src = new BitmapImage();
-                src.BeginInit();
-                src.UriSource = new Uri(imagePath, UriKind.Relative);
-                src.CacheOption = BitmapCacheOption.OnLoad;
-                src.EndInit();
+        public List<SubConfigurationDefinition> SubConfigurations { get; set; }
 
-                Int32Rect offSet = new Int32Rect(XOffsetStart, YOffsetStart, XOffsetFinish - XOffsetStart, YOffsetFinish - YOffsetStart);
-                CroppedBitmap croppedBitmap = new CroppedBitmap(src, offSet);
-                var noAlphaSource = new FormatConvertedBitmap();
-                noAlphaSource.BeginInit();
-                noAlphaSource.Source = croppedBitmap;
-                noAlphaSource.DestinationFormat = PixelFormats.Bgr24;
-                noAlphaSource.AlphaThreshold = 0;
-                noAlphaSource.EndInit();
+        #endregion SubConfiguration support
 
-                if ((SaveResults ?? false) == true)
-                {
-                    var fi = new FileInfo(imagePath);
-
-                    SaveImage(noAlphaSource, fi.Directory.FullName, $"X_{XOffsetStart}To{XOffsetFinish}Y_{YOffsetStart}To{YOffsetFinish}_{Opacity}");
-                }
-                return noAlphaSource;
-            }
-            else
-            {
-                return null;
-            }
-        }
+        #region Protected overrides 
 
         /// <summary>
-        /// Describes the Configuration
+        /// Returns the portion of the readable string specific to <seealso cref="ConfigurationDefinition"/>
         /// </summary>
         /// <returns></returns>
-        public string ToReadableString()
+        protected override string GetReadableString()
         {
-            string completePath = null;
-            string fileStatus = null;
-            var pathExists = false;
-            if(!string.IsNullOrEmpty(FilePath) && Directory.Exists(FilePath) && !string.IsNullOrEmpty(FileName))
-            {
-                completePath = Path.Combine(FilePath, FileName);
-                pathExists = File.Exists(completePath);
-                fileStatus = pathExists ? "found " : "not found ";
-            }
-            return $"Config: {Name} for: {ModuleName} at: ({Left}, {Top}) for ({Width}, {Height}) with Opacity: {Opacity} Enabled: {Enabled} from: {completePath ?? "Unknown Image"} was: {fileStatus} at Offset: ({XOffsetStart}, {YOffsetStart}) for: ({XOffsetFinish - XOffsetStart}, {YOffsetFinish - YOffsetStart}).";
+            return $"{Width}_{Height}";
         }
 
-        /// <summary>
-        /// Short form
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return ToReadableString();
-        }
-
-        #endregion Public methods
-
-        #region Private helpers
-
-        /// <summary>
-        /// Saves the Image in the specified format, default format is bmp
-        /// </summary>
-        /// <param name="retResult"><seealso cref="BitmapSource"/></param>
-        /// <param name="filePath">Directory to save the file to</param>
-        /// <param name="imagePrefix">Prefix to add to the filename</param>
-        private void SaveImage(BitmapSource retResult, string filePath, string imagePrefix)
-        {
-            var fileName = Path.Combine(filePath, $"{imagePrefix}_{ModuleName}_{Name}_{Width}_{Height}.png");
-            retResult?.SaveToPng(fileName);
-            Logger.Debug($"Cropped image saved as {fileName}.");
-        }
+        #endregion Protected overrides 
 
-        #endregion Private helpers
     }
 }
\ No newline at end of file
diff --git a/MFDSettingsManager/Models/ConfigurationModelBase.cs b/MFDSettingsManager/Models/ConfigurationModelBase.cs
new file mode 100644
index 0000000..e233663
--- /dev/null
+++ b/MFDSettingsManager/Models/ConfigurationModelBase.cs
@@ -0,0 +1,221 @@
+using log4net;
+using MFDSettingsManager.Extensions;
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace MFDSettingsManager.Models
+{
+    /// <summary>
+    /// Properties common to Configuration and SubConfiguration
+    /// </summary>
+    public abstract class ConfigurationModelBase
+    {
+        #region Ctor
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public ConfigurationModelBase()
+        {
+
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="cb"></param>
+        public ConfigurationModelBase(ConfigurationModelBase cb)
+        {
+            Enabled = cb.Enabled;
+            Logger = cb.Logger;
+            FileName = cb.FileName;
+            ModuleName = cb.ModuleName;
+            Name = cb.Name;
+            XOffsetStart = cb.XOffsetStart;
+            XOffsetFinish = cb.XOffsetFinish;
+            YOffsetStart = cb.YOffsetStart;
+            YOffsetFinish = cb.YOffsetFinish;
+            Opacity = cb.Opacity;
+        }
+
+        #endregion Ctor
+
+        #region Utility properties
+
+        /// <summary>
+        /// Logger
+        /// </summary>
+        public ILog Logger { get; set; }
+
+        /// <summary>
+        /// Folder used to cache the generated images
+        /// </summary>
+        public string CacheFolder => GetCacheFolderForModule();
+
+        #endregion Utility properties
+
+        #region Identifying properties
+
+        /// <summary>
+        /// Module Name
+        /// </summary>
+        public string ModuleName { get; set; }
+        /// <summary>
+        /// Name of the Configuration
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// FileName for the image cropping that this configuration uses
+        /// </summary>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// The starting file path for the configuration
+        /// </summary>
+        public string FilePath { get; set; }
+
+        /// <summary>
+        /// Determines if the configuration is rendered
+        /// </summary>
+        public bool Enabled { get; internal set; }
+
+        /// <summary>
+        /// Default readable string
+        /// </summary>
+        /// <returns></returns>
+        protected virtual string GetReadableString()
+        {
+            return "";
+        }
+
+        #endregion Identifying properties
+
+        #region Image cropping properties
+
+        /// <summary>
+        /// Translucency of the image expressed as percentage of solidness 
+        /// </summary>
+        public float Opacity { get; set; }
+        /// <summary>
+        /// Starting X position of the Crop
+        /// </summary>
+        public int XOffsetStart { get; set; }
+        /// <summary>
+        /// Starting Y position of the Crop
+        /// </summary>
+        public int YOffsetStart { get; set; }
+        /// <summary>
+        /// Ending X position of the Crop
+        /// </summary>
+        public int XOffsetFinish { get; set; }
+        /// <summary>
+        /// Ending Y position of the Crop
+        /// </summary>
+        public int YOffsetFinish { get; set; }
+
+        #endregion Image cropping properties
+
+        #region Image cropping 
+
+        /// <summary>
+        /// Crop the specified image
+        /// </summary>
+        /// <param name="imagePath"></param>
+        /// <returns></returns>
+        public virtual BitmapSource CropImage(string imagePath)
+        {
+            if (Enabled)
+            {
+                BitmapImage src = new BitmapImage();
+                src.BeginInit();
+                src.UriSource = new Uri(imagePath, UriKind.Relative);
+                src.CacheOption = BitmapCacheOption.OnLoad;
+                src.EndInit();
+
+                Int32Rect offSet = new Int32Rect(XOffsetStart, YOffsetStart, XOffsetFinish - XOffsetStart, YOffsetFinish - YOffsetStart);
+                CroppedBitmap croppedBitmap = new CroppedBitmap(src, offSet);
+                var noAlphaSource = new FormatConvertedBitmap();
+                noAlphaSource.BeginInit();
+                noAlphaSource.Source = croppedBitmap;
+                noAlphaSource.DestinationFormat = PixelFormats.Bgr24;
+                noAlphaSource.AlphaThreshold = 0;
+                noAlphaSource.EndInit();
+                SaveImage(noAlphaSource, CacheFolder, $"X_{XOffsetStart}To{XOffsetFinish}Y_{YOffsetStart}To{YOffsetFinish}_{Opacity}");
+                return noAlphaSource;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        #endregion Image cropping
+
+        #region Image saving
+
+        /// <summary>
+        /// Saves the Image in the specified format, default format is bmp
+        /// </summary>
+        /// <param name="retResult"><seealso cref="BitmapSource"/></param>
+        /// <param name="filePath">Directory to save the file to</param>
+        /// <param name="imagePrefix">Prefix to add to the filename</param>
+        protected virtual void SaveImage(BitmapSource retResult, string filePath, string imagePrefix)
+        {
+            Directory.CreateDirectory(filePath);
+            var fileName = Path.Combine(filePath, $"{imagePrefix}_{Name}_{GetReadableString()}.png");
+            retResult?.SaveToPng(fileName);
+            Logger.Info($"Cropped image saved as {fileName}.");
+        }
+
+
+        #endregion Image saving
+
+        #region Public overrides
+
+        /// <summary>
+        /// Describes the Configuration
+        /// </summary>
+        /// <returns></returns>
+        public string ToReadableString()
+        {
+            string completePath = null;
+            string fileStatus = null;
+            var pathExists = false;
+            if (!string.IsNullOrEmpty(FilePath) && Directory.Exists(FilePath) && !string.IsNullOrEmpty(FileName))
+            {
+                completePath = Path.Combine(FilePath, FileName);
+                pathExists = File.Exists(completePath);
+                fileStatus = pathExists ? "found " : "not found ";
+            }
+
+            return $"Config: {Name} for: {ModuleName} at: {GetReadableString()} with Opacity: {Opacity} Enabled: {Enabled} from: {completePath ?? "Unknown Image"} was: {fileStatus} at Offset: ({XOffsetStart}, {YOffsetStart}) for: ({XOffsetFinish - XOffsetStart}, {YOffsetFinish - YOffsetStart}).";
+        }
+
+        /// <summary>
+        /// Short form
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return ToReadableString();
+        }
+
+        #endregion Public overrides
+
+        #region Private helpers
+
+        /// <summary>
+        /// Returns the location of the Cache for the current Module
+        /// </summary>
+        /// <returns></returns>
+        private string GetCacheFolderForModule()
+        {
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), $"Vyper Industries\\MFD4CTS\\cache\\{ModuleName}");
+        }
+
+        #endregion Private helpers
+    }
+}
diff --git a/MFDSettingsManager/Models/SubConfigurationDefinition.cs b/MFDSettingsManager/Models/SubConfigurationDefinition.cs
new file mode 100644
index 0000000..b6142bc
--- /dev/null
+++ b/MFDSettingsManager/Models/SubConfigurationDefinition.cs
@@ -0,0 +1,70 @@
+using System;
+using System.IO;
+
+namespace MFDSettingsManager.Models
+{
+    /// <summary>
+    /// Defines a SubConfiguration
+    /// </summary>
+    public class SubConfigurationDefinition : ConfigurationModelBase
+    {
+        #region Ctor
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public SubConfigurationDefinition()
+        {
+
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="dc"></param>
+        public SubConfigurationDefinition(SubConfigurationDefinition dc) : base(dc)
+        {
+            StartX = dc.StartX;
+            EndX = dc.EndX;
+            StartY = dc.StartY;
+            EndY = dc.EndY;
+        }
+
+        #endregion Ctor
+
+        #region Basic Image Properties StartX, EndX, StartY and EndY
+
+        /// <summary>
+        /// The X coordinate inside of the Configuration image relative to (0,0) to start rendering the image
+        /// </summary>
+        public int StartX { get; set; }
+        /// <summary>
+        /// The X coordinate inside of the Configuration image relative to (0,0) to end rendering the image
+        /// </summary>
+        public int EndX { get; set; }
+        /// <summary>
+        /// The Y coordinate inside of the Configuration image relative to (0,0) to start rendering the image
+        /// </summary>
+        public int StartY { get; set; }
+        /// <summary>
+        /// The Y coordinate inside of the Configuration image relative to (0,0) to end rendering the image
+        /// </summary>
+        public int EndY { get; set; }
+
+        #endregion Basic Image Properties StartX, EndX, StartY and EndY
+
+        #region Protected overrides 
+
+        /// <summary>
+        /// Returns the portion of the readable string specific to <seealso cref="SubConfigurationDefinition"/>
+        /// </summary>
+        /// <returns></returns>
+
+        protected override string GetReadableString()
+        {
+            return $"{EndX - StartX}_{EndY - StartY}";
+        }
+
+        #endregion Protected overrides 
+    }
+}
\ No newline at end of file
diff --git a/MFDSettingsManager/Properties/AssemblyInfo.cs b/MFDSettingsManager/Properties/AssemblyInfo.cs
index 1a7625e..a699024 100644
--- a/MFDSettingsManager/Properties/AssemblyInfo.cs
+++ b/MFDSettingsManager/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.6.1.0")]
+[assembly: AssemblyFileVersion("2.6.1.0")]
diff --git a/MFDisplay.sln b/MFDisplay.sln
index 2ae6ac0..4d0656f 100644
--- a/MFDisplay.sln
+++ b/MFDisplay.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{EC07B551-2
 	ProjectSection(SolutionItems) = preProject
 		mfdisp_exe_test.tmc = mfdisp_exe_test.tmc
 		MFDisplay\Docs\testfunction.tmc = MFDisplay\Docs\testfunction.tmc
+		..\..\..\Downloads\tv-test-pattern-146649_960_720.png = ..\..\..\Downloads\tv-test-pattern-146649_960_720.png
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MFDSettingsManager", "MFDSettingsManager\MFDSettingsManager.csproj", "{BB12C431-7568-4AB3-AC21-4D6396744F22}"
diff --git a/MFDisplay/App.config b/MFDisplay/App.config
index c0cfb9c..44abfaf 100644
--- a/MFDisplay/App.config
+++ b/MFDisplay/App.config
@@ -7,9 +7,34 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
-  
-  <log4net configSource="log4net.config" />
-  
+
+  <log4net>
+    <appender name="Console" type="log4net.Appender.ConsoleAppender">
+      <threshold value="Debug" />
+      <layout type="log4net.Layout.PatternLayout">
+        <!-- Pattern to output the caller's file name and line number -->
+        <conversionPattern value="%date %5level [%thread] (%file:%line) - %message%newline" />
+      </layout>
+    </appender>
+
+    <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+      <file value="${APPDATA}\Vyper Industries\MFD4CTS\status.log" />
+      <threshold value="Info" />
+      <appendToFile value="true" />
+      <maximumFileSize value="100MB" />
+      <maxSizeRollBackups value="10" />
+
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date %-5level[%logger]: %message%newline" />
+      </layout>
+    </appender>
+
+    <root>
+      <appender-ref ref="Console" />
+      <appender-ref ref="RollingFile" />
+    </root>
+  </log4net>
+
   <MFDSettings configSource="mfdsettings.config" />
 
     <runtime>
diff --git a/MFDisplay/AuxWindow.xaml b/MFDisplay/AuxWindow.xaml
index b9871a2..608a9fe 100644
--- a/MFDisplay/AuxWindow.xaml
+++ b/MFDisplay/AuxWindow.xaml
@@ -7,6 +7,7 @@
         mc:Ignorable="d"
         Title="MFD" Name="auxWindow" BorderThickness="0" Topmost="True" Loaded="Window_Loaded" Closed="Window_Closed" ResizeMode="NoResize" WindowStyle="None" ShowInTaskbar="False" Opacity="0" AllowsTransparency="True">
     <Grid>
-        <Image Width="auto" Height="auto" x:Name="imgMain" Stretch="Fill"  Margin="0"/>
+        <Image x:Name="imgMain" StretchDirection="Both" Stretch="Fill" />
+        <Image x:Name="imgInsert" />
     </Grid>
 </Window>
diff --git a/MFDisplay/AuxWindow.xaml.cs b/MFDisplay/AuxWindow.xaml.cs
index 8bac1fb..67bc707 100644
--- a/MFDisplay/AuxWindow.xaml.cs
+++ b/MFDisplay/AuxWindow.xaml.cs
@@ -2,6 +2,7 @@
 using MFDSettingsManager.Models;
 using System;
 using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media.Imaging;
 using Path = System.IO.Path;
@@ -18,6 +19,11 @@ public partial class AuxWindow : Window
         /// </summary>
         public bool IsWindowLoaded { get; protected set; }
 
+        /// <summary>
+        /// The name of the sub configuration to load
+        /// </summary>
+        public string SubConfigurationName { get; set; }
+
         /// <summary>
         /// MFD Configuration
         /// </summary>
@@ -84,9 +90,15 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
                 Close();
                 return;
             }
-
-            LoadImage();
-            Logger?.Debug($"Loading the configuration for {Configuration.Name} from Module {Configuration.ModuleName}");
+            if (Configuration.Enabled)
+            {
+                LoadImage();
+                Logger?.Debug($"Loading the configuration for {Configuration.Name} from Module {Configuration.ModuleName}");
+            }
+            else
+            {
+                Logger?.Info($"Configuration for {Configuration.Name} for Module {Configuration.ModuleName} is currently disabled in configuration.");
+            }
         }
 
         /// <summary>
@@ -94,7 +106,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
         /// </summary>
         public void LoadImage()
         {
-            BitmapSource bitmapSource = null;
+            SubConfigurationDefinition subConfig = null;
             IsWindowLoaded = false;
             if (!IsValid)
             {
@@ -103,34 +115,99 @@ public void LoadImage()
             }
             else
             {
-                var filePath = Path.Combine(FilePath, Configuration.FileName);
+                var cacheFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), $"Vyper Industries\\MFD4CTS\\cache\\{Configuration.ModuleName}");
+
+                // Previous renders are cached so if the cache file is available then it will be used
+                var imagePrefix = $"X_{Configuration.XOffsetStart}To{Configuration.XOffsetFinish}Y_{Configuration.YOffsetStart}To{Configuration.YOffsetFinish}_{Configuration.Opacity}";
+                var cacheFile = Path.Combine(cacheFolder, $"{imagePrefix}_{Configuration.Name}_{Configuration.Width}_{Configuration.Height}.png");
+                imgMain.Source = GetBitMapSource(Configuration, cacheFolder, cacheFile);
                 imgMain.Width = Width;
                 imgMain.Height = Height;
+                imgMain.Visibility = Visibility.Visible;
+
                 try
                 {
-                    bitmapSource = Configuration.CropImage(filePath);
+                    // First check to see if we are using a SubConfiguration
+                    if (!string.IsNullOrEmpty(SubConfigurationName))
+                    {
+                        subConfig = Configuration?.SubConfigurations?.FirstOrDefault(sc => sc.Name.Equals(SubConfigurationName, StringComparison.InvariantCultureIgnoreCase));
+                        if (subConfig != null)
+                        {
+                            Logger?.Info($"Processing sub-configuration: {subConfig.ToString()} for Module: {Configuration.ModuleName}!");
+                            var insetImagePrefix = $"X_{subConfig.XOffsetStart}To{subConfig.XOffsetFinish}Y_{subConfig.YOffsetStart}To{subConfig.YOffsetFinish}_{subConfig.Opacity}";
+                            var width = subConfig.EndX - subConfig.StartX;
+                            var height = subConfig.EndY - subConfig.StartY;
+                            var insetCacheFile = Path.Combine(cacheFolder, $"{insetImagePrefix}_{subConfig.Name}_{width}_{height}.png");
+                            imgInsert.Source = GetBitMapSource(subConfig, cacheFolder, insetCacheFile);
+                            imgInsert.Width = width;
+                            imgInsert.Height = height;
+                            imgInsert.Opacity = subConfig.Opacity;
+                            imgInsert.Visibility = Visibility.Visible;
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
-                    Logger?.Error($"Unable to load {Configuration.ToReadableString()}.", ex);
+                    Logger?.Error($"Unable to load {subConfig?.ToReadableString()}.", ex);
                     Close();
                 }
-                finally
+                IsWindowLoaded = true;
+                Visibility = Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Loads the image from the cache or crops it from the source image
+        /// </summary>
+        /// <typeparam name="T">Must be derived from <seealso cref="ConfigurationModelBase"/></typeparam>
+        /// <param name="configSource">The configuration source, derived from <seealso cref="ConfigurationModelBase"/> </param>
+        /// <param name="cacheFolder">Location of the cache of images</param>
+        /// <param name="cacheFile">Full path to the requested file in the cache</param>
+        /// <returns><seealso cref="BitmapSource"/></returns>
+        private BitmapSource GetBitMapSource<T>(T configSource, string cacheFolder, string cacheFile)
+            where T: ConfigurationModelBase
+        {
+            BitmapSource bitmapSource = null;
+            string filePath = string.Empty;
+
+            try
+            {
+                if (File.Exists(cacheFile))
+                {
+                    Logger.Info($"Cache file found: {cacheFile}");
+                    Stream imageStreamSource = new FileStream(cacheFile, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    PngBitmapDecoder decoder = new PngBitmapDecoder(imageStreamSource, BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.Default);
+                    bitmapSource = decoder.Frames[0];
+                }
+                else
                 {
-                    if(bitmapSource != null)
-                    {
-                        imgMain.Source = bitmapSource;
-                        IsWindowLoaded = true;
-                        Logger?.Debug($"Image {filePath} is loaded.");
-                        Visibility = Visibility.Visible;
-                    }
-                    else
+                    if (!Directory.Exists(cacheFolder))
                     {
-                        Logger?.Warn($"Configuration was not loaded -> {Configuration.ToReadableString()}.");
-                        Close();
+                        Directory.CreateDirectory(cacheFolder);
                     }
+                    filePath = Path.Combine(FilePath, configSource.FileName);
+                    bitmapSource = configSource.CropImage(filePath);
                 }
             }
+            catch (Exception ex)
+            {
+                Logger?.Error($"Unable to load {configSource.ToReadableString()}.", ex);
+                Close();
+            }
+            finally
+            {
+                if (bitmapSource != null)
+                {
+                    Logger?.Info($"Configuration {configSource.ToReadableString()} is loaded.");
+                }
+                else
+                {
+                    Logger?.Warn($"Configuration was not loaded -> {configSource.ToReadableString()}.");
+                    Close();
+                }
+            }
+
+            return bitmapSource;
         }
 
         private void Window_Closed(object sender, EventArgs e)
diff --git a/MFDisplay/MFDisplay.csproj b/MFDisplay/MFDisplay.csproj
index f1f645c..b46efff 100644
--- a/MFDisplay/MFDisplay.csproj
+++ b/MFDisplay/MFDisplay.csproj
@@ -286,6 +286,10 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Content Include="test.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
     <SplashScreen Include="Images\MFD4CTS_LOGO.png" />
     <Resource Include="Images\Vyper_FC_orig.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -301,13 +305,8 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="log4net.config">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="MFDisplay_TemporaryKey.pfx" />
     <Content Include="mfdsettings.config">
-      <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="packages.config">
diff --git a/MFDisplay/MFDisplay.csproj.user b/MFDisplay/MFDisplay.csproj.user
index 7a55b2a..9c9b0c0 100644
--- a/MFDisplay/MFDisplay.csproj.user
+++ b/MFDisplay/MFDisplay.csproj.user
@@ -9,12 +9,12 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>
-    </StartArguments>
+    <StartArguments>-mod F-14R -submod SPL</StartArguments>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/MFDisplay/MFDisplayApp.xaml.cs b/MFDisplay/MFDisplayApp.xaml.cs
index cf40be7..6896f7f 100644
--- a/MFDisplay/MFDisplayApp.xaml.cs
+++ b/MFDisplay/MFDisplayApp.xaml.cs
@@ -21,6 +21,8 @@ public partial class MFDisplayApp : Application, ISingleInstanceApp
         private const string Company = "Vyper Industries";
         private const string Years = "2018, 2019"; 
 
+        static string ConfigurationPath { get; set; }
+
         /// <summary>
         /// Main entry point
         /// </summary>
@@ -49,11 +51,20 @@ public static void Main()
         public bool SignalExternalCommandLineArgs(IList<string> args)
         {
             var modSpecified = args.GetSafeArgumentFrom("-mod");
+            var subModeSpecified = args.GetSafeArgumentFrom("-submod");
             if(!string.IsNullOrEmpty(modSpecified))
             {
                 Logger.Info($"External request to change module to {modSpecified}.");
                 ((MainWindow)MainWindow).ChangeSelectedModule(modSpecified);
             }
+
+            if (!string.IsNullOrEmpty(subModeSpecified))
+            {
+                Logger.Info($"External request to change sub-module to {subModeSpecified}.");
+                ((MainWindow)MainWindow).ChangeSelectedSubModule(subModeSpecified);
+            }
+
+
             return true;
         }
 
@@ -79,15 +90,13 @@ private string GetVersionString()
 
         private ILog Logger;
         private static readonly bool configPresent = true;
-        private static readonly string configurationFile = "";
 
         static MFDisplayApp()
         {
-            var exeAssem = Assembly.GetExecutingAssembly();
-            configurationFile = $"{exeAssem.Location}.config";
-            if (!File.Exists(configurationFile))
+            ConfigurationPath = $"{Assembly.GetExecutingAssembly().Location}.config";
+            if (!File.Exists(ConfigurationPath))
             {
-                MessageBox.Show($"The configuration file could not be found! Please re-install or repair the application or restore the configuration file {configurationFile}.", "Invalid Configuration", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show($"The configuration file could not be found! Please re-install or repair the application or restore the configuration file {ConfigurationPath}.", "Invalid Configuration", MessageBoxButton.OK, MessageBoxImage.Error);
                 configPresent = false;
                 return;
             }
@@ -104,11 +113,11 @@ internal void ShowConfigurationError(Window parent = null)
             var logPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"Vyper Industries\MFD4CTS\status.log");
             if(parent != null)
             {
-                MessageBox.Show(parent, $"Unable to load the configuration. Please check the log at {logPath} for details.", "Error in Configuration", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(parent, $"Unable to load the configuration from {ConfigurationPath}. Please check the log at {logPath} for details.", "Error in Configuration", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             else
             {
-                MessageBox.Show($"Unable to load the configuration. Please check the log at {logPath} for details.", "Error in Configuration", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show($"Unable to load the configuration from {ConfigurationPath}. Please check the log at {logPath} for details.", "Error in Configuration", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -120,6 +129,7 @@ internal void ShowConfigurationError(Window parent = null)
         protected override void OnStartup(StartupEventArgs e)
         {
             var modSpecified = e.Args.GetSafeArgumentFrom("-mod");
+            var subModeSpecified = e.Args.GetSafeArgumentFrom("-submod");
 
             if (!configPresent)
             {
@@ -128,8 +138,7 @@ protected override void OnStartup(StartupEventArgs e)
             }
 
             Logger = LogManager.GetLogger("MFD4CTS");
-            var assmLocation = Assembly.GetExecutingAssembly().Location;
-            var sectionConfig = MFDConfigurationSection.GetConfig(Logger);
+            var sectionConfig = MFDConfigurationSection.GetConfig(Logger, ConfigurationPath);
 
             if(sectionConfig == null)
             {
@@ -139,28 +148,18 @@ protected override void OnStartup(StartupEventArgs e)
             }
 
             Configuration = sectionConfig.ToModel(Logger);
-            if(!Directory.Exists(Configuration?.FilePath))
-            {
-                var mfdSettingsFile = Path.Combine((new FileInfo(assmLocation))?.DirectoryName, "mfdsettings.config");
-                var errorMessage = $"{Configuration.FilePath} is not a valid path. Please use an elevated editor, runas Administrator, and edit the FilePath in the file {mfdSettingsFile}";
-                Logger.Error(errorMessage);
-                MessageBox.Show(errorMessage, "Configuration Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                Shutdown(2);
-            }
-            else
+            Logger.Info($"Startup");
+            var mainWindow = new MainWindow()
             {
-                Logger.Info($"Startup");
-                var mainWindow = new MainWindow()
-                {
-                    Config = Configuration,
-                    Logger = Logger,
-                    WindowState = WindowState.Minimized,
-                    PassedModule = string.IsNullOrEmpty(modSpecified) ? null : modSpecified
-                };
-
-                mainWindow.ShowDialog();
-                Shutdown(0);
-            }
+                Config = Configuration,
+                Logger = Logger,
+                WindowState = WindowState.Minimized,
+                PassedModule = string.IsNullOrEmpty(modSpecified) ? null : modSpecified,
+                PassedSubModule = string.IsNullOrEmpty(subModeSpecified) ? null : subModeSpecified,
+            };
+
+            mainWindow.ShowDialog();
+            Shutdown(0);
             base.OnStartup(e);
         }
 
diff --git a/MFDisplay/MainWindow.xaml b/MFDisplay/MainWindow.xaml
index dadf1f1..1568a10 100644
--- a/MFDisplay/MainWindow.xaml
+++ b/MFDisplay/MainWindow.xaml
@@ -12,6 +12,9 @@
             <MenuItem Header="_File">
                 <MenuItem Header="_Exit" CommandParameter="Exit" Click="FileMenuItem_Click" />
             </MenuItem>
+            <MenuItem Header="Utility">
+                <MenuItem Header="_Clear Cache" CommandParameter="Cache" Click="ClearCache_Click"/>
+            </MenuItem>
             <MenuItem Header="_Help">
                 <MenuItem Header="_About" CommandParameter="About" Click="HelpMenuItem_Click"/>
             </MenuItem>
diff --git a/MFDisplay/MainWindow.xaml.cs b/MFDisplay/MainWindow.xaml.cs
index dae4d76..89c56fe 100644
--- a/MFDisplay/MainWindow.xaml.cs
+++ b/MFDisplay/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using MFDSettingsManager.Models;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -43,6 +44,11 @@ public partial class MainWindow : Window
         /// </summary>
         public string PassedModule { get; internal set; }
 
+        /// <summary>
+        /// The name of the sub-module that was passed
+        /// </summary>
+        public string PassedSubModule { get; internal set; }
+
         /// <summary>
         /// Ctor, initializes component, logging, sorted list and loads the configuration  
         /// </summary>
@@ -101,7 +107,8 @@ public void CreateWindows()
                 {
                     Logger = Logger,
                     Configuration = config,
-                    FilePath = Config.FilePath
+                    FilePath = Config.FilePath,
+                    SubConfigurationName = PassedSubModule
                 };
                 newAuxWindow.Show();
                 if (newAuxWindow.IsWindowLoaded)
@@ -145,6 +152,18 @@ public void ChangeSelectedModule(string moduleName)
             }
         }
 
+        /// <summary>
+        /// Changes the selected sub-module
+        /// </summary>
+        /// <param name="subModeSpecified"></param>
+        public void ChangeSelectedSubModule(string subModeSpecified)
+        {
+            PassedSubModule = subModeSpecified;
+            DestroyWindows();
+            CreateWindows();
+        }
+
+
         private void ProcessChangedModule(string moduleName)
         {
             if (GetSelectedDefinition(moduleName))
@@ -230,5 +249,30 @@ private void FileMenuItem_Click(object sender, RoutedEventArgs e)
         {
             Close();
         }
+
+        /// <summary>
+        /// Clears the cache of all PNG files
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ClearCache_Click(object sender, RoutedEventArgs e)
+        {
+            DestroyWindows();
+            var cacheFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), $"Vyper Industries\\MFD4CTS\\cache\\");
+            var cacheParent = new DirectoryInfo(cacheFolder);
+            var fileList = cacheParent.EnumerateFiles("*.png", SearchOption.AllDirectories).ToList();
+            fileList.ForEach((file) =>
+            {
+                try
+                {
+                    File.Delete(file.FullName);
+                }
+                catch (System.Exception ex)
+                {
+                    Logger.Warn($"Unable to delete cache file: {file.FullName}");
+                }
+            });
+            CreateWindows();
+        }
     }
 }
diff --git a/MFDisplay/Properties/AssemblyInfo.cs b/MFDisplay/Properties/AssemblyInfo.cs
index e4a4201..e866637 100644
--- a/MFDisplay/Properties/AssemblyInfo.cs
+++ b/MFDisplay/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.6.1.0")]
+[assembly: AssemblyFileVersion("2.6.1.0")]
diff --git a/MFDisplay/log4net.config b/MFDisplay/log4net.config
deleted file mode 100644
index f920a1c..0000000
--- a/MFDisplay/log4net.config
+++ /dev/null
@@ -1,26 +0,0 @@
-<log4net>
-  <appender name="Console" type="log4net.Appender.ConsoleAppender">
-    <threshold value="Debug" />
-    <layout type="log4net.Layout.PatternLayout">
-      <!-- Pattern to output the caller's file name and line number -->
-      <conversionPattern value="%date %5level [%thread] (%file:%line) - %message%newline" />
-    </layout>
-  </appender>
-
-  <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
-    <file value="${APPDATA}\Vyper Industries\MFD4CTS\status.log" />
-    <threshold value="Info" />
-    <appendToFile value="true" />
-    <maximumFileSize value="100MB" />
-    <maxSizeRollBackups value="10" />
-
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date %-5level[%logger]: %message%newline" />
-    </layout>
-  </appender>
-
-  <root>
-    <appender-ref ref="Console" />
-    <appender-ref ref="RollingFile" />
-  </root>
-</log4net>
diff --git a/MFDisplay/mfdsettings.config b/MFDisplay/mfdsettings.config
index 8bbd34f..d4ae970 100644
--- a/MFDisplay/mfdsettings.config
+++ b/MFDisplay/mfdsettings.config
@@ -13,11 +13,9 @@
   https://github.com/ScottyMac52/MFDisplay/wiki/Configuration-Guide
 
   -->
-  <MFDSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd"
-  saveClips="False" filePath="E:\HOTAS\TARGET\CTS\Docs\Profile JPGs"
-  defaultConfig="BMSFalconF-16">
-  
+<MFDSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath="E:\HOTAS\TARGET\CTS\Docs\Profile JPGs" defaultConfig="BMSFalconF-16">
+
   <DefaultConfigurations>
     <add name="LMFD" opacity="1" width="870" height="700" left="2575"
       top="700" xOffsetStart="101" xOffsetFinish="776" yOffsetStart="250"
@@ -114,7 +112,7 @@
       filename="_High Contrast MFDs\DCS AWACS MFD HiVis" />
     <add moduleName="Bf-109" displayName="Bf-109 K-4 Kurfürst" filename="Bf-109\DCS Bf109 MFD.jpg">
       <Configurations>
-        <add name="WHKEY" filename="Bf-109\DCS Bf109 WH.jpg" />
+        <add name="WHKEY" filename="Bf-109\DCS Bf109 WH.jpg"/>
       </Configurations>
     </add>
     <add moduleName="C-101EB" displayName="C-101EB Aviojet" filename="C-101\DCS C101EB MFD.jpg">
@@ -173,7 +171,17 @@
     </add>
     <add moduleName="F-14R" displayName="F-14 Tomcat (RIO)" filename="F-14\DCS F14RIO MFD.jpg">
       <Configurations>
-        <add name="WHKEY" filename="F-14\DCS F14RIO WH.jpg" />
+        <add name="LMFD">
+          <SubConfigurations>
+            <add name="BIT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="50" xOffsetFinish="260" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="SPL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="325" xOffsetFinish="535" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="NAV" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="590" xOffsetFinish="800" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="TAC" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="860" xOffsetFinish="1070" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="DL" opacity="1" filename="F-14\F14 CAP Drum.jpg"  startX="325" startY="350" endX="535" endY="795" xOffsetStart="1125" xOffsetFinish="1355" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="TGT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1380" xOffsetFinish="1590" yOffsetStart="1" yOffsetFinish="448" />
+          </SubConfigurations>
+        </add>
+        <add name="WHKEY" filename="F-14\DCS F14RIO WH.jpg"/>
       </Configurations>
     </add>
     <add moduleName="F-14PHV" displayName="F-14 HiVis (Pilot)" filename="_High Contrast MFDs\DCS F14Plt MFD HiVis.jpg">
@@ -184,6 +192,16 @@
     <add moduleName="F-14RHV" displayName="F-14 HiVis (RIO)" filename="_High Contrast MFDs\DCS F14RIO MFD HiVis.jpg">
       <Configurations>
         <add name="WHKEY" filename="F-14\DCS F14RIO WH.jpg" />
+        <add name="LMFD">
+          <SubConfigurations>
+            <add name="BIT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="50" xOffsetFinish="260" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="SPL" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="325" xOffsetFinish="535" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="NAV" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="590" xOffsetFinish="800" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="TAC" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="860" xOffsetFinish="1070" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="DL" opacity="1" filename="F-14\F14 CAP Drum.jpg"  startX="325" startY="350" endX="535" endY="795" xOffsetStart="1125" xOffsetFinish="1355" yOffsetStart="1" yOffsetFinish="448" />
+            <add name="TGT" opacity="1" filename="F-14\F14 CAP Drum.jpg" startX="325" startY="350" endX="535" endY="795" xOffsetStart="1380" xOffsetFinish="1590" yOffsetStart="1" yOffsetFinish="448" />
+          </SubConfigurations>
+        </add>
       </Configurations>
     </add>
     <add moduleName="F-15C" displayName="F-15C Eagle" filename="FC3_Su25T\DCS FC3 MFD.jpg">
diff --git a/MFDisplay/mfdsettings.xsd b/MFDisplay/mfdsettings.xsd
index c59a23c..ed30681 100644
--- a/MFDisplay/mfdsettings.xsd
+++ b/MFDisplay/mfdsettings.xsd
@@ -4,11 +4,10 @@
            attributeFormDefault="unqualified"
            elementFormDefault="qualified"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:complexType abstract="true"
-                  id="configuration"
-                  name="Configuration">
+
+  <xs:complexType abstract="true" id="baseconfiguration" name="BaseConfiguration">
     <xs:annotation>
-      <xs:documentation>Configuration defines all properties required to crop and image, re-size it and display it on the screen. The image is derived from the image filename specified either by the Module or by the configuration itself. </xs:documentation>
+      <xs:documentation>BaseConfiguration defines inserts of cropped images onto a Configuration. </xs:documentation>
     </xs:annotation>
     <xs:attribute name="name"
                   type="xs:string"
@@ -40,38 +39,6 @@
         <xs:documentation>Opacity of the image as rendered on the screen expressed as a percentage of 1. 30% Opacity is .3.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="width"
-                  default="100"
-                  type="xs:int"
-                  use="optional">
-      <xs:annotation>
-        <xs:documentation>Width of the image in screen pixels.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="height"
-                  default="100"
-                  type="xs:int"
-                  use="optional">
-      <xs:annotation>
-        <xs:documentation>Height of the image in screen pixels.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="left"
-                  default="1"
-                  type="xs:int"
-                  use="optional">
-      <xs:annotation>
-        <xs:documentation>Left position of the image in screen pixels.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="top"
-                  default="1"
-                  type="xs:int"
-                  use="optional">
-      <xs:annotation>
-        <xs:documentation>Top position of the image in screen pixels.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
     <xs:attribute name="xOffsetStart"
                   default="1"
                   type="xs:int"
@@ -105,6 +72,92 @@
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
+  <xs:complexType abstract="true"
+                  id="configuration"
+                  name="Configuration">
+    <xs:annotation>
+      <xs:documentation>Configuration defines all properties required to crop and image, re-size it and display it on the screen. The image is derived from the image filename specified either by the Module or by the configuration itself. </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="BaseConfiguration">
+        <xs:attribute name="width"
+                      default="100"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Width of the image in screen pixels.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="height"
+                      default="100"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Height of the image in screen pixels.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="left"
+                      default="1"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Left position of the image in screen pixels.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="top"
+                      default="1"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Top position of the image in screen pixels.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>    
+  </xs:complexType>
+  <xs:complexType abstract="true"
+                  id="subconfiguration"
+                  name="SubConfiguration">
+    <xs:annotation>
+      <xs:documentation>SubConfiguration defines the image that gets cropped and pled inside a Configuration. </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="BaseConfiguration">
+        <xs:attribute name="startX"
+                      default="100"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Starting X coordinate relative to (0,0) of the Configuration where the image is rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="endX"
+                      default="100"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Ending X coordinate relative to (0,0) of the Configuration where the image is rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="startY"
+                      default="1"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Starting Y coordinate relative to (0,0) of the Configuration where the image is rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="endY"
+                      default="1"
+                      type="xs:int"
+                      use="optional">
+          <xs:annotation>
+            <xs:documentation>Ending Y coordinate relative to (0,0) of the Configuration where the image is rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:complexType name="Module">
     <xs:annotation>
       <xs:documentation>Defines a module configuration. The moduleName, displayName and filename </xs:documentation>
@@ -124,11 +177,34 @@
                         maxOccurs="unbounded"
                         nillable="true">
               <xs:annotation>
-                <xs:documentation>Module configuration.</xs:documentation>
+                <xs:documentation>Configuration for a Module.</xs:documentation>
               </xs:annotation>
               <xs:complexType>
                 <xs:complexContent>
-                  <xs:extension base="Configuration" />
+                  <xs:extension base="Configuration">
+                    <xs:sequence>
+                      <xs:element name="SubConfigurations" minOccurs="0" maxOccurs="unbounded" nillable="true">
+                        <xs:annotation>
+                          <xs:documentation>SubConfigurations for the current Configuration</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexType>
+                          <xs:sequence>
+                            <xs:element name="add" minOccurs="0" maxOccurs="unbounded" nillable="true">
+                              <xs:annotation>
+                                <xs:documentation>SubConfiguration for a Configuration.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                <xs:complexContent>
+                                  <xs:extension base="SubConfiguration">
+                                  </xs:extension>
+                                </xs:complexContent>
+                              </xs:complexType>
+                            </xs:element>                            
+                          </xs:sequence>
+                        </xs:complexType>
+                      </xs:element>
+                    </xs:sequence>
+                  </xs:extension>
                 </xs:complexContent>
               </xs:complexType>
             </xs:element>
@@ -171,9 +247,6 @@
           </xs:annotation>
           <xs:complexType>
             <xs:sequence>
-              <xs:annotation>
-                <xs:documentation>WHere does this appear in schema?</xs:documentation>
-              </xs:annotation>
               <xs:element name="add"
                           minOccurs="0"
                           maxOccurs="unbounded"
@@ -197,12 +270,18 @@
                     maxOccurs="unbounded"
                     nillable="false">
           <xs:complexType>
+            <xs:annotation>
+              <xs:documentation>Configured Modules</xs:documentation>
+            </xs:annotation>
             <xs:sequence>
               <xs:element name="add"
                           minOccurs="0"
                           maxOccurs="unbounded"
                           nillable="true">
                 <xs:complexType>
+                  <xs:annotation>
+                    <xs:documentation>Module Configuration</xs:documentation>
+                  </xs:annotation>
                   <xs:complexContent>
                     <xs:extension base="Module" />
                   </xs:complexContent>
@@ -212,13 +291,6 @@
           </xs:complexType>
         </xs:element>
       </xs:sequence>
-      <xs:attribute name="saveClips"
-                    type="xs:string"
-                    use="required">
-        <xs:annotation>
-          <xs:documentation>If true then PNG images of the cropped configurations are saved in the save directory they originated from in the following format:</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
       <xs:attribute name="filePath"
                     type="xs:string"
                     use="required">
diff --git a/MFDisplay/test.config b/MFDisplay/test.config
new file mode 100644
index 0000000..145f5e9
--- /dev/null
+++ b/MFDisplay/test.config
@@ -0,0 +1,43 @@
+<!--
+  MFDSettings Configuration Section
+  Consult the Configuration Guide
+
+  Configuration for 1080p 24" 1920X1080 * 3
+    <add name="LMFD" opacity="1" width="400" height="400" left="-400" top="1" xOffsetStart="101" xOffsetFinish="776" yOffsetStart="250" yOffsetFinish="900"/>
+    <add name="RMFD" opacity="1" width="400" height="400" left="1920" top="1" xOffsetStart="903" xOffsetFinish="1576" yOffsetStart="250" yOffsetFinish="900" />
+  
+  Configuration for 1080p * 1
+    <add name="LMFD" opacity="1" width="400" height="400" left="1" top="1" xOffsetStart="101" xOffsetFinish="776" yOffsetStart="250" yOffsetFinish="900"/>
+    <add name="RMFD" opacity="1" width="400" height="400" left="1520" top="1" xOffsetStart="903" xOffsetFinish="1576" yOffsetStart="250" yOffsetFinish="900" />
+
+  https://github.com/ScottyMac52/MFDisplay/wiki/Configuration-Guide
+
+  -->
+<MFDSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath="C:\Users\Scott\Downloads\" defaultConfig="TestJpg">
+
+  <DefaultConfigurations>
+    <add name="LMFD" opacity=".75" width="870" height="700" left="2575" top="700" xOffsetStart="0" xOffsetFinish="851" yOffsetStart="0"  yOffsetFinish="479" />
+    <add name="RMFD" opacity=".75" width="870" height="700" left="4250" top="700" xOffsetStart="0" xOffsetFinish="851" yOffsetStart="0"  yOffsetFinish="479" />
+    <add name="WHKEY" opacity=".45" width="1200" height="1000" left="5120" top="360" xOffsetStart="0" xOffsetFinish="851" yOffsetStart="0"  yOffsetFinish="479" />
+  </DefaultConfigurations>
+  <Modules>
+    <add moduleName="TestJpg" displayName="Test Pattern JPG" filename="testpattern.jpg">
+      <Configurations>
+        <add name="LMFD">
+          <SubConfigurations>
+            <add name="SubTest" opacity="1" filename="tv-test-pattern-146649_960_720.png" startX="325" startY="350" endX="535" endY="795" xOffsetStart="0" xOffsetFinish="960" yOffsetStart="0"  yOffsetFinish="720" />
+          </SubConfigurations>
+          <!--
+         -->
+        </add>
+      </Configurations>
+    </add>
+    <add moduleName="TestPng" displayName="Test Pattern PNG" filename="tv-test-pattern-146649_960_720.png"/>
+    <add moduleName="TestPngFragment" displayName="Test Pattern PNG Fragment" filename="tv-test-pattern-146649_960_720.png">
+      <Configurations>
+        <add name="LMFD" opacity="1" filename="tv-test-pattern-146649_960_720.png" left="2950" top="1000" height="200" width="600"/>
+      </Configurations>
+    </add>
+  </Modules>
+</MFDSettings>
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
index f44b11d..23f9143 100644
--- a/Setup/Setup.vdproj
+++ b/Setup/Setup.vdproj
@@ -3472,7 +3472,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MFDSettingsManager, Version=2.5.0.0, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:MFDSettingsManager, Version=2.6.1.0, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
                     "_C4DC3EF2B28BD12B944CD4F281C1AE06"
@@ -4075,15 +4075,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MFD4CTS"
-        "ProductCode" = "8:{C947D7A5-4E57-4FE0-9B29-5B9CD8E7E7DD}"
-        "PackageCode" = "8:{817B5322-4A89-4B05-AC11-5081F11AD84E}"
+        "ProductCode" = "8:{394A03CA-2021-4C58-AB25-6AD614E510CA}"
+        "PackageCode" = "8:{A9424981-83B2-425E-9810-2BD624E175D7}"
         "UpgradeCode" = "8:{684D58BF-80C4-4679-8A57-A5856787407F}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:2.5.0"
+        "ProductVersion" = "8:2.6.1"
         "Manufacturer" = "8:Vyper Industries"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/ScottyMac52/MFDisplay/issues"