diff --git a/.gitignore b/.gitignore
index fe27920..7bad4ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,43 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 /.vs/
 *.suo
 *.user
+*.userosscache
 *.sln.docstates
 
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+[Rr]eleases/
 x64/
-build/
+x86/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
 
-# Roslyn cache directories
-*.ide/
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-#NUNIT
+# NUNIT
 *.VisualState.xml
 TestResult.xml
 
@@ -33,6 +46,19 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
 *_i.h
@@ -65,14 +91,21 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
 
 # TFS 2012 Local Workspace
 $tf/
@@ -85,7 +118,7 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding addin-in
+# JustCode is a .NET coding add-in
 .JustCode
 
 # TeamCity is a build add-in
@@ -94,9 +127,18 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
 
 # MightyMoose
 *.mm.*
@@ -124,42 +166,63 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
 
-# NuGet Packages Directory
-packages/*
-## TODO: If the tool you use requires repositories.config
-## uncomment the next line
-#!packages/repositories.config
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
 
-# Enable "build/" folder in the NuGet Packages folder since
-# NuGet packages use it for MSBuild targets.
-# This line needs to be after the ignore of the build folder
-# (and the packages folder if the line above has been uncommented)
-!packages/build/
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
 
-# Windows Azure Build Output
+# Microsoft Azure Build Output
 csx/
 *.build.csdef
 
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
 
 # Others
-sql/
-*.Cache
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -175,6 +238,7 @@ UpgradeLog*.htm
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
@@ -184,7 +248,69 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
\ No newline at end of file
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# TypeScript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output 
+ASALocalRun/
\ No newline at end of file
diff --git a/Filtration.Common.Tests/Filtration.Common.Tests.csproj b/Filtration.Common.Tests/Filtration.Common.Tests.csproj
index f5eaeec..4cef0e6 100644
--- a/Filtration.Common.Tests/Filtration.Common.Tests.csproj
+++ b/Filtration.Common.Tests/Filtration.Common.Tests.csproj
@@ -35,13 +35,11 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Filtration.Common.Tests/packages.config b/Filtration.Common.Tests/packages.config
index c5d64ff..4b97194 100644
--- a/Filtration.Common.Tests/packages.config
+++ b/Filtration.Common.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.Common/Filtration.Common.csproj b/Filtration.Common/Filtration.Common.csproj
index 3e0716c..13f3165 100644
--- a/Filtration.Common/Filtration.Common.csproj
+++ b/Filtration.Common/Filtration.Common.csproj
@@ -35,8 +35,8 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
       <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
diff --git a/Filtration.Common/Utilities/LineReader.cs b/Filtration.Common/Utilities/LineReader.cs
index 94dea54..1811195 100644
--- a/Filtration.Common/Utilities/LineReader.cs
+++ b/Filtration.Common/Utilities/LineReader.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 
@@ -21,6 +22,7 @@ namespace Filtration.Common.Utilities
         /// the stream into text.
         /// </summary>
         /// <param name="streamSource">Data source</param>
+        [DebuggerStepThrough]
         public LineReader(Func<Stream> streamSource)
             : this(streamSource, Encoding.UTF8)
         {
@@ -33,6 +35,7 @@ namespace Filtration.Common.Utilities
         /// <param name="streamSource">Data source</param>
         /// <param name="encoding">Encoding to use to decode the stream
         /// into text</param>
+        [DebuggerStepThrough]
         public LineReader(Func<Stream> streamSource, Encoding encoding)
             : this(() => new StreamReader(streamSource(), encoding))
         {
@@ -44,6 +47,7 @@ namespace Filtration.Common.Utilities
         /// UTF8 is used to decode the file into text.
         /// </summary>
         /// <param name="filename">File to read from</param>
+        [DebuggerStepThrough]
         public LineReader(string filename)
             : this(filename, Encoding.UTF8)
         {
@@ -56,6 +60,7 @@ namespace Filtration.Common.Utilities
         /// <param name="filename">File to read from</param>
         /// <param name="encoding">Encoding to use to decode the file
         /// into text</param>
+        [DebuggerStepThrough]
         public LineReader(string filename, Encoding encoding)
             : this(() => new StreamReader(filename, encoding))
         {
@@ -66,6 +71,7 @@ namespace Filtration.Common.Utilities
         /// is only called when the enumerator is fetched
         /// </summary>
         /// <param name="dataSource">Data source</param>
+        [DebuggerStepThrough]
         public LineReader(Func<TextReader> dataSource)
         {
             _dataSource = dataSource;
@@ -74,6 +80,7 @@ namespace Filtration.Common.Utilities
         /// <summary>
         /// Enumerates the data source line by line.
         /// </summary>
+        [DebuggerStepThrough]
         public IEnumerator<string> GetEnumerator()
         {
             using (TextReader reader = _dataSource())
@@ -89,6 +96,7 @@ namespace Filtration.Common.Utilities
         /// <summary>
         /// Enumerates the data source line by line.
         /// </summary>
+        [DebuggerStepThrough]
         IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
diff --git a/Filtration.Common/packages.config b/Filtration.Common/packages.config
index 088a524..0173a29 100644
--- a/Filtration.Common/packages.config
+++ b/Filtration.Common/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
+  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj b/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
index 5869c8a..30c7e22 100644
--- a/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
+++ b/Filtration.ItemFilterPreview.Data.Tests/Filtration.ItemFilterPreview.Data.Tests.csproj
@@ -46,9 +46,8 @@
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/Filtration.ItemFilterPreview.Data.Tests/Repositories/TestItemSetRepository.cs b/Filtration.ItemFilterPreview.Data.Tests/Repositories/TestItemSetRepository.cs
index 60db3ef..a593d1f 100644
--- a/Filtration.ItemFilterPreview.Data.Tests/Repositories/TestItemSetRepository.cs
+++ b/Filtration.ItemFilterPreview.Data.Tests/Repositories/TestItemSetRepository.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 
 namespace Filtration.ItemFilterPreview.Data.Tests.Repositories
 {
+    [Ignore("integration test")]
     [TestFixture]
     public class TestItemSetRepository
     {
diff --git a/Filtration.ItemFilterPreview.Data.Tests/packages.config b/Filtration.ItemFilterPreview.Data.Tests/packages.config
index 5229672..f051d19 100644
--- a/Filtration.ItemFilterPreview.Data.Tests/packages.config
+++ b/Filtration.ItemFilterPreview.Data.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
   <package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net461" />
   <package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
   <package id="System.Data.SQLite.EF6" version="1.0.102.0" targetFramework="net461" />
diff --git a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
index e6f2a41..9f42fc4 100644
--- a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
+++ b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj
@@ -46,21 +46,17 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -121,7 +117,6 @@
     <None Include="packages.config" />
     <None Include="Resources\MuldiniFilterScript.txt" />
   </ItemGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs
index 28d1e66..2a20555 100644
--- a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs
+++ b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs
@@ -6,6 +6,7 @@ using Filtration.ItemFilterPreview.Tests.Properties;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.Factories;
 using Filtration.Parser.Services;
 using Moq;
 using NUnit.Framework;
@@ -29,7 +30,7 @@ namespace Filtration.ItemFilterPreview.Tests.Services
             //Arrange
             var testInputItem = Mock.Of<IItem>();
             var testInputBlock = Mock.Of<IItemFilterBlock>();
-            var testInputScript = Mock.Of<IItemFilterScript>(s => s.ItemFilterBlocks == new ObservableCollection<IItemFilterBlock> {testInputBlock});
+            var testInputScript = Mock.Of<IItemFilterScript>(s => s.ItemFilterBlocks == new ObservableCollection<IItemFilterBlockBase> {testInputBlock});
 
             _testUtility.MockBlockItemMatcher
                 .Setup(b => b.ItemBlockMatch(testInputBlock, testInputItem))
@@ -50,7 +51,7 @@ namespace Filtration.ItemFilterPreview.Tests.Services
             //Arrange
             var testInputItem = Mock.Of<IItem>();
             var testInputBlock = Mock.Of<IItemFilterBlock>();
-            var testInputScript = Mock.Of<IItemFilterScript>(s => s.ItemFilterBlocks == new ObservableCollection<IItemFilterBlock> { testInputBlock });
+            var testInputScript = Mock.Of<IItemFilterScript>(s => s.ItemFilterBlocks == new ObservableCollection<IItemFilterBlockBase> { testInputBlock });
 
             _testUtility.MockBlockItemMatcher
                 .Setup(b => b.ItemBlockMatch(testInputBlock, testInputItem))
@@ -71,7 +72,12 @@ namespace Filtration.ItemFilterPreview.Tests.Services
             //Arrange
             var testInputScriptFile = Resources.MuldiniFilterScript;
             var blockGroupHierarchyBuilder = new BlockGroupHierarchyBuilder();
-            var scriptTranslator = new ItemFilterScriptTranslator(new ItemFilterBlockTranslator(blockGroupHierarchyBuilder), blockGroupHierarchyBuilder);
+            var mockItemFilterScriptFactory = new Mock<IItemFilterScriptFactory>();
+            mockItemFilterScriptFactory
+                .Setup(i => i.Create())
+                .Returns(new ItemFilterScript());
+
+            var scriptTranslator = new ItemFilterScriptTranslator(blockGroupHierarchyBuilder, new ItemFilterBlockTranslator(blockGroupHierarchyBuilder), mockItemFilterScriptFactory.Object);
             var script = scriptTranslator.TranslateStringToItemFilterScript(testInputScriptFile);
 
             var testInputItem = new Item
@@ -101,7 +107,11 @@ namespace Filtration.ItemFilterPreview.Tests.Services
             //Arrange
             var testInputScriptFile = Resources.MuldiniFilterScript;
             var blockGroupHierarchyBuilder = new BlockGroupHierarchyBuilder();
-            var scriptTranslator = new ItemFilterScriptTranslator(new ItemFilterBlockTranslator(blockGroupHierarchyBuilder), blockGroupHierarchyBuilder);
+            var mockItemFilterScriptFactory = new Mock<IItemFilterScriptFactory>();
+            mockItemFilterScriptFactory
+                .Setup(i => i.Create())
+                .Returns(new ItemFilterScript());
+            var scriptTranslator = new ItemFilterScriptTranslator(blockGroupHierarchyBuilder, new ItemFilterBlockTranslator(blockGroupHierarchyBuilder), mockItemFilterScriptFactory.Object);
             var script = scriptTranslator.TranslateStringToItemFilterScript(testInputScriptFile);
 
             var testInputItems = new List<IItem>
diff --git a/Filtration.ItemFilterPreview.Tests/Services/serializationtest.cs b/Filtration.ItemFilterPreview.Tests/Services/serializationtest.cs
index 5e3e1e6..fa59655 100644
--- a/Filtration.ItemFilterPreview.Tests/Services/serializationtest.cs
+++ b/Filtration.ItemFilterPreview.Tests/Services/serializationtest.cs
@@ -6,7 +6,6 @@ using System.Xml.Serialization;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.Enums;
 using NUnit.Framework;
-using YamlDotNet.Serialization;
 
 namespace Filtration.ItemFilterPreview.Tests.Services
 {
@@ -39,8 +38,7 @@ namespace Filtration.ItemFilterPreview.Tests.Services
                 serializer.Serialize(textWriter, item);
                  output = textWriter.ToString();
             }
-
-            var x = 2;
+            
             //Assert
         }
     }
diff --git a/Filtration.ItemFilterPreview.Tests/app.config b/Filtration.ItemFilterPreview.Tests/app.config
index c1fa1bd..0c4712b 100644
--- a/Filtration.ItemFilterPreview.Tests/app.config
+++ b/Filtration.ItemFilterPreview.Tests/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.2.3" newVersion="2.1.2.3" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.4" newVersion="2.2.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Filtration.ItemFilterPreview.Tests/packages.config b/Filtration.ItemFilterPreview.Tests/packages.config
index a76be05..24885ed 100644
--- a/Filtration.ItemFilterPreview.Tests/packages.config
+++ b/Filtration.ItemFilterPreview.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.13.1" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="4.19.2" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
   <package id="YamlDotNet" version="3.9.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
index f78f69b..88676a1 100644
--- a/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
+++ b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj
@@ -40,9 +40,8 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
       <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
@@ -60,9 +59,8 @@
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs b/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs
index a680185..c843cef 100644
--- a/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs
+++ b/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs
@@ -31,8 +31,8 @@ namespace Filtration.ItemFilterPreview.Services
                 sw.Restart();
 
                 var matchedBlock = itemFilterScript.ItemFilterBlocks
-                                    .Where(b => !(b is ItemFilterSection))
-                                    .FirstOrDefault(block => _blockItemMatcher.ItemBlockMatch(block, item));
+                                                   .OfType<IItemFilterBlock>()
+                                                   .FirstOrDefault(block => _blockItemMatcher.ItemBlockMatch(block, item));
 
                 filteredItems.Add(new FilteredItem(item, matchedBlock));
 
diff --git a/Filtration.ItemFilterPreview/packages.config b/Filtration.ItemFilterPreview/packages.config
index 7255210..500f87c 100644
--- a/Filtration.ItemFilterPreview/packages.config
+++ b/Filtration.ItemFilterPreview/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net461" />
+  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
index 0af02c0..69dd6ef 100644
--- a/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
+++ b/Filtration.ObjectModel.Tests/Filtration.ObjectModel.Tests.csproj
@@ -35,13 +35,11 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
diff --git a/Filtration.ObjectModel.Tests/TestItemFilterBlock.cs b/Filtration.ObjectModel.Tests/TestItemFilterBlock.cs
index 8afd358..045db54 100644
--- a/Filtration.ObjectModel.Tests/TestItemFilterBlock.cs
+++ b/Filtration.ObjectModel.Tests/TestItemFilterBlock.cs
@@ -6,23 +6,6 @@ namespace Filtration.ObjectModel.Tests
     [TestFixture]
     public class TestItemFilterBlock
     {
-        [Test]
-        public void ItemFilterBlock_BlockCount_ReturnsCorrectNumber()
-        {
-            // Arrange
-            var block = new ItemFilterBlock();
-            block.BlockItems.Add(new ItemLevelBlockItem());
-            block.BlockItems.Add(new ItemLevelBlockItem());
-            block.BlockItems.Add(new ItemLevelBlockItem());
-            block.BlockItems.Add(new ItemLevelBlockItem());
-
-            // Act
-            var count = block.BlockCount(typeof (ItemLevelBlockItem));
-
-            // Assert
-            Assert.AreEqual(4, count);
-        }
-
         [Test]
         public void ItemFilterBlock_AddBlockItemAllowed_LessThanMaximum_ReturnsTrue()
         {
diff --git a/Filtration.ObjectModel.Tests/packages.config b/Filtration.ObjectModel.Tests/packages.config
index c5d64ff..4b97194 100644
--- a/Filtration.ObjectModel.Tests/packages.config
+++ b/Filtration.ObjectModel.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
index d920d50..8660377 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
@@ -15,7 +15,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
 
         public BlockAction Action
         {
-            get { return _action; }
+            get => _action;
             set
             {
                 _action = value;
@@ -27,6 +27,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             }
         }
 
+        public string Comment { get; set; }
+
         public override string OutputText => Action.GetAttributeDescription();
 
         public override string PrefixText => string.Empty;
diff --git a/Filtration.ObjectModel/Commands/CommandManager.cs b/Filtration.ObjectModel/Commands/CommandManager.cs
new file mode 100644
index 0000000..2f58cee
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/CommandManager.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+
+namespace Filtration.ObjectModel.Commands
+{
+    public interface ICommandManager
+    {
+        void ExecuteCommand(ICommand command);
+        void Undo(int undoLevels = 1);
+        void Redo(int redoLevels = 1);
+    }
+
+    public interface ICommandManagerInternal : ICommandManager
+    {
+        void SetScript(IItemFilterScriptInternal layout);
+    }
+
+    internal class CommandManager : ICommandManagerInternal
+    {
+        private readonly Stack<IUndoableCommand> _undoCommandStack = new Stack<IUndoableCommand>();
+        private readonly Stack<IUndoableCommand> _redoCommandStack = new Stack<IUndoableCommand>();
+        private IItemFilterScriptInternal _itemFilterScript;
+
+        public void SetScript(IItemFilterScriptInternal itemFilterScript)
+        {
+            _itemFilterScript = itemFilterScript;
+        }
+
+        public void ExecuteCommand(ICommand command)
+        {
+            command.Execute();
+            if (command is IUndoableCommand undoableCommand)
+            {
+                _undoCommandStack.Push(undoableCommand);
+                _redoCommandStack.Clear();
+            }
+            _itemFilterScript.SetIsDirty(true);
+        }
+
+        public void Undo(int undoLevels = 1)
+        {
+            for (var index = undoLevels; _undoCommandStack.Count > 0 && index > 0; --index)
+            {
+                var undoableCommand = _undoCommandStack.Pop();
+                undoableCommand.Undo();
+                _redoCommandStack.Push(undoableCommand);
+            }
+            _itemFilterScript.SetIsDirty(true);
+        }
+
+        public void Redo(int redoLevels = 1)
+        {
+            for (int index = redoLevels; _redoCommandStack.Count > 0 && index > 0; --index)
+            {
+                var undoableCommand = _redoCommandStack.Pop();
+                undoableCommand.Redo();
+                _undoCommandStack.Push(undoableCommand);
+            }
+            _itemFilterScript.SetIsDirty(true);
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ICommand.cs b/Filtration.ObjectModel/Commands/ICommand.cs
new file mode 100644
index 0000000..84cfe3c
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ICommand.cs
@@ -0,0 +1,7 @@
+namespace Filtration.ObjectModel.Commands
+{
+    public interface ICommand
+    {
+        void Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/IUndoableCommand.cs b/Filtration.ObjectModel/Commands/IUndoableCommand.cs
new file mode 100644
index 0000000..9a9eb76
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/IUndoableCommand.cs
@@ -0,0 +1,8 @@
+namespace Filtration.ObjectModel.Commands
+{
+    internal interface IUndoableCommand : ICommand
+    {
+        void Undo();
+        void Redo();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/AddBlockCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/AddBlockCommand.cs
new file mode 100644
index 0000000..7aa9e85
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/AddBlockCommand.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class AddBlockCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
+        private IItemFilterBlock _newItemFilterBlock;
+
+        public AddBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase addAfterItemFilterBlock)
+        {
+            _itemFilterScript = itemFilterScript;
+            _addAfterItemFilterBlock = addAfterItemFilterBlock;
+        }
+        public void Execute()
+        {
+            _newItemFilterBlock = new ItemFilterBlock(_itemFilterScript);
+            if (_addAfterItemFilterBlock != null)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _newItemFilterBlock);
+            }
+            else
+            {
+                _itemFilterScript.ItemFilterBlocks.Add(_newItemFilterBlock);
+            }
+
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_newItemFilterBlock);
+        }
+
+        public void Redo() => Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/AddCommentBlockCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/AddCommentBlockCommand.cs
new file mode 100644
index 0000000..1c627df
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/AddCommentBlockCommand.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class AddCommentBlockCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
+        private IItemFilterCommentBlock _newItemFilterBlock;
+
+        public AddCommentBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase addAfterItemFilterBlock)
+        {
+            _itemFilterScript = itemFilterScript;
+            _addAfterItemFilterBlock = addAfterItemFilterBlock;
+        }
+        public void Execute()
+        {
+            _newItemFilterBlock = new ItemFilterCommentBlock(_itemFilterScript);
+            if (_addAfterItemFilterBlock != null)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _newItemFilterBlock);
+            }
+            else
+            {
+                _itemFilterScript.ItemFilterBlocks.Add(_newItemFilterBlock);
+            }
+
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_newItemFilterBlock);
+        }
+
+        public void Redo() => Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockDownCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockDownCommand.cs
new file mode 100644
index 0000000..0f837e6
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockDownCommand.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockDownCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockDownCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+
+            if (_indexMovedFrom >= _itemFilterScript.ItemFilterBlocks.Count)
+            {
+                throw new InvalidOperationException("Cannot move the bottom block down");
+            }
+
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom + 1, _blockToMove);
+
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToBottomCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToBottomCommand.cs
new file mode 100644
index 0000000..3b680a7
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToBottomCommand.cs
@@ -0,0 +1,30 @@
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockToBottomCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+            
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Add(_blockToMove);
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToTopCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToTopCommand.cs
new file mode 100644
index 0000000..49ac04a
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockToTopCommand.cs
@@ -0,0 +1,30 @@
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockToTopCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(0, _blockToMove);
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockUpCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockUpCommand.cs
new file mode 100644
index 0000000..44b7fec
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/MoveBlockUpCommand.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class MoveBlockUpCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _blockToMove;
+        private int _indexMovedFrom;
+
+        public MoveBlockUpCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
+        {
+            _itemFilterScript = itemFilterScript;
+            _blockToMove = blockToMove;
+        }
+
+        public void Execute()
+        {
+            _indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
+
+            if (_indexMovedFrom <= 0)
+            {
+                throw new InvalidOperationException("Cannot move the top block up");
+            }
+
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom-1, _blockToMove);
+
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
+        }
+
+        public void Redo() => Execute();
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlockCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlockCommand.cs
new file mode 100644
index 0000000..7d7c680
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/PasteBlockCommand.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class PasteBlockCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly IItemFilterBlockBase _pastedItemFilterBlock;
+        private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
+
+        public PasteBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase pastedItemFilterBlock, IItemFilterBlockBase addAfterItemFilterBlock)
+        {
+            _itemFilterScript = itemFilterScript;
+            _pastedItemFilterBlock = pastedItemFilterBlock;
+            _addAfterItemFilterBlock = addAfterItemFilterBlock;
+        }
+
+        public void Execute()
+        {
+            if (_addAfterItemFilterBlock != null)
+            {
+                _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _pastedItemFilterBlock);
+            }
+            else
+            {
+                _itemFilterScript.ItemFilterBlocks.Add(_pastedItemFilterBlock);
+            }
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Remove(_pastedItemFilterBlock);
+        }
+
+        public void Redo() => Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockCommand.cs
new file mode 100644
index 0000000..07e61ac
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/RemoveBlockCommand.cs
@@ -0,0 +1,29 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class RemoveBlockCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private IItemFilterBlockBase _removedItemFilterBlock;
+        private int _indexRemovedFrom;
+
+        public RemoveBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase itemFilterBlockBase)
+        {
+            _itemFilterScript = itemFilterScript;
+            _removedItemFilterBlock = itemFilterBlockBase;
+        }
+        public void Execute()
+        {
+            _indexRemovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_removedItemFilterBlock);
+            _itemFilterScript.ItemFilterBlocks.Remove(_removedItemFilterBlock);
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.ItemFilterBlocks.Insert(_indexRemovedFrom, _removedItemFilterBlock);
+        }
+
+        public void Redo() => Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Commands/ItemFilterScript/SetScriptDescriptionCommand.cs b/Filtration.ObjectModel/Commands/ItemFilterScript/SetScriptDescriptionCommand.cs
new file mode 100644
index 0000000..ec99154
--- /dev/null
+++ b/Filtration.ObjectModel/Commands/ItemFilterScript/SetScriptDescriptionCommand.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Filtration.ObjectModel.Commands.ItemFilterScript
+{
+    public class SetScriptDescriptionCommand : IUndoableCommand
+    {
+        private readonly IItemFilterScript _itemFilterScript;
+        private readonly string _newDescription;
+        private string _oldDescription;
+
+        public SetScriptDescriptionCommand(IItemFilterScript itemFilterScript, string newDescription)
+        {
+            _itemFilterScript = itemFilterScript;
+            _newDescription = newDescription;
+        }
+
+        public void Execute()
+        {
+            _oldDescription = _itemFilterScript.Description;
+            _itemFilterScript.Description = _newDescription;
+        }
+
+        public void Undo()
+        {
+            _itemFilterScript.Description = _oldDescription;
+        }
+
+        public void Redo() => Execute();
+    }
+}
diff --git a/Filtration.ObjectModel/Factories/IItemFilterScriptFactory.cs b/Filtration.ObjectModel/Factories/IItemFilterScriptFactory.cs
new file mode 100644
index 0000000..2a5c0b2
--- /dev/null
+++ b/Filtration.ObjectModel/Factories/IItemFilterScriptFactory.cs
@@ -0,0 +1,9 @@
+namespace Filtration.ObjectModel.Factories
+{
+    public interface IItemFilterScriptFactory
+    {
+        IItemFilterScript Create();
+
+        void Release(IItemFilterScript itemFilterScript);
+    }
+}
diff --git a/Filtration.ObjectModel/Filtration.ObjectModel.csproj b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
index 179468f..0c3638b 100644
--- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj
+++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
@@ -31,6 +31,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -73,6 +79,18 @@
     <Compile Include="BlockItemTypes\SoundBlockItem.cs" />
     <Compile Include="BlockItemTypes\TextColorBlockItem.cs" />
     <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
+		<Compile Include="Commands\CommandManager.cs" />
+    <Compile Include="Commands\ICommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\PasteBlockCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockToBottomCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\AddCommentBlockCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockDownCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockUpCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\MoveBlockToTopCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\SetScriptDescriptionCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\RemoveBlockCommand.cs" />
+    <Compile Include="Commands\ItemFilterScript\AddBlockCommand.cs" />
+    <Compile Include="Commands\IUndoableCommand.cs" />
     <Compile Include="Enums\BlockAction.cs" />
     <Compile Include="Enums\BlockItemType.cs" />
     <Compile Include="Enums\FilterPredicateOperator.cs" />
@@ -82,6 +100,7 @@
     <Compile Include="Enums\ThemeComponentType.cs" />
     <Compile Include="Extensions\EnumHelper.cs" />
     <Compile Include="Extensions\ItemRarityExtensions.cs" />
+		<Compile Include="Factories\IItemFilterScriptFactory.cs" />
     <Compile Include="FilteredItem.cs" />
     <Compile Include="IAudioVisualBlockItem.cs" />
     <Compile Include="IItemFilterBlockItem.cs" />
@@ -89,7 +108,7 @@
     <Compile Include="ItemFilterBlock.cs" />
     <Compile Include="ItemFilterBlockGroup.cs" />
     <Compile Include="ItemFilterScript.cs" />
-    <Compile Include="ItemFilterSection.cs" />
+		<Compile Include="ItemFilterScriptSettings.cs" />
     <Compile Include="ItemSet.cs" />
     <Compile Include="NumericFilterPredicate.cs" />
     <Compile Include="PathOfExileNamedColors.cs" />
@@ -102,6 +121,8 @@
     <Compile Include="ThemeEditor\Theme.cs" />
     <Compile Include="ThemeEditor\ThemeComponent.cs" />
     <Compile Include="ThemeEditor\ThemeComponentCollection.cs" />
+    <Compile Include="WindsorInstallers\CommandsInstaller.cs" />
+    <Compile Include="WindsorInstallers\ModelsInstaller.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Filtration.ObjectModel/IItemFilterBlockItem.cs b/Filtration.ObjectModel/IItemFilterBlockItem.cs
index 021201e..ec693d0 100644
--- a/Filtration.ObjectModel/IItemFilterBlockItem.cs
+++ b/Filtration.ObjectModel/IItemFilterBlockItem.cs
@@ -5,8 +5,6 @@ namespace Filtration.ObjectModel
 {
     public interface IItemFilterBlockItem : INotifyPropertyChanged
     {
-        event PropertyChangedEventHandler PropertyChanged;
-
         string PrefixText { get; }
         string OutputText { get; }
         string DisplayHeading { get; }
diff --git a/Filtration.ObjectModel/ItemFilterBlock.cs b/Filtration.ObjectModel/ItemFilterBlock.cs
index cf80d76..6fd27c9 100644
--- a/Filtration.ObjectModel/ItemFilterBlock.cs
+++ b/Filtration.ObjectModel/ItemFilterBlock.cs
@@ -4,44 +4,82 @@ using System.Linq;
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Commands;
 using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.Extensions;
 
 namespace Filtration.ObjectModel
 {
-    public interface IItemFilterBlock
+    public interface IItemFilterBlock : IItemFilterBlockBase
     {
         bool Enabled { get; set; }
         string Description { get; set; }
         ItemFilterBlockGroup BlockGroup { get; set; }
         BlockAction Action { get; set; }
+        ActionBlockItem ActionBlockItem { get; }
         ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
         Color DisplayBackgroundColor { get; }
         Color DisplayTextColor { get; }
         Color DisplayBorderColor { get; }
         double DisplayFontSize { get; }
-        int BlockCount(Type type);
-        bool AddBlockItemAllowed(Type type);
         bool HasBlockItemOfType<T>();
         bool HasBlockGroupInParentHierarchy(ItemFilterBlockGroup targetBlockGroup, ItemFilterBlockGroup startingBlockGroup);
     }
 
-    public class ItemFilterBlock : IItemFilterBlock
+    public interface IItemFilterBlockBase
+    {
+    }
+
+    public abstract class ItemFilterBlockBase : IItemFilterBlockBase
+    {
+        protected ItemFilterBlockBase()
+        {
+        }
+
+        protected ItemFilterBlockBase(IItemFilterScript parentScript)
+        {
+            CommandManager = parentScript.CommandManager;
+            ParentScript = parentScript;
+        }
+
+        public ICommandManager CommandManager { get; }
+        public IItemFilterScript ParentScript { get; set; }
+    }
+
+    public interface IItemFilterCommentBlock : IItemFilterBlockBase
+    {
+        string Comment { get; set; }
+    }
+
+    public class ItemFilterCommentBlock : ItemFilterBlockBase, IItemFilterCommentBlock
+    {
+        public ItemFilterCommentBlock(IItemFilterScript parentScript) : base(parentScript)
+        {
+        }
+
+        public string Comment { get; set; }
+    }
+
+    public class ItemFilterBlock : ItemFilterBlockBase, IItemFilterBlock
     {
         private ItemFilterBlockGroup _blockGroup;
 
-        public ItemFilterBlock()
+        internal ItemFilterBlock()
         {
-            BlockItems = new ObservableCollection<IItemFilterBlockItem> {new ActionBlockItem(BlockAction.Show)};
-            Enabled = true;
+            BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
         }
 
-        public bool Enabled { get; set; }
+        public ItemFilterBlock(IItemFilterScript parentScript) : base(parentScript)
+        {
+            BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
+        }
+
+        public bool Enabled { get; set; } = true;
         public string Description { get; set; }
 
         public ItemFilterBlockGroup BlockGroup
         {
-            get { return _blockGroup; }
+            get => _blockGroup;
             set
             {
                 var oldBlockGroup = _blockGroup;
@@ -79,17 +117,19 @@ namespace Filtration.ObjectModel
             }
         }
 
-        public ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
+        public ActionBlockItem ActionBlockItem { get; } = new ActionBlockItem(BlockAction.Show);
 
-        public int BlockCount(Type type)
-        {
-            return BlockItems?.Count(b => b.GetType() == type) ?? 0;
-        }
+        public ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
 
         public bool AddBlockItemAllowed(Type type)
         {
+            int BlockCount()
+            {
+                return BlockItems?.Count(b => b.GetType() == type) ?? 0;
+            }
+
             var blockItem = (IItemFilterBlockItem)Activator.CreateInstance(type);
-            return BlockCount(type) < blockItem.MaximumAllowed;
+            return BlockCount() < blockItem.MaximumAllowed;
         }
 
         public bool HasBlockItemOfType<T>()
diff --git a/Filtration.ObjectModel/ItemFilterScript.cs b/Filtration.ObjectModel/ItemFilterScript.cs
index 54d7cd6..703ad6d 100644
--- a/Filtration.ObjectModel/ItemFilterScript.cs
+++ b/Filtration.ObjectModel/ItemFilterScript.cs
@@ -1,45 +1,101 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using Filtration.ObjectModel.Annotations;
 using Filtration.ObjectModel.BlockItemTypes;
+using Filtration.ObjectModel.Commands;
 using Filtration.ObjectModel.ThemeEditor;
 
 namespace Filtration.ObjectModel
 {
-    public interface IItemFilterScript
+    public interface IItemFilterScript : INotifyPropertyChanged
     {
-        ObservableCollection<IItemFilterBlock> ItemFilterBlocks { get; }
+        ICommandManager CommandManager { get; }
+
+        ObservableCollection<IItemFilterBlockBase> ItemFilterBlocks { get; }
         ObservableCollection<ItemFilterBlockGroup> ItemFilterBlockGroups { get; }
         ThemeComponentCollection ThemeComponents { get; set; }
         string FilePath { get; set; }
         string Description { get; set; }
         DateTime DateModified { get; set; }
+        bool IsDirty { get; }
+
+        IItemFilterScriptSettings ItemFilterScriptSettings { get; }
+
         List<string> Validate();
         void ReplaceColors(ReplaceColorsParameterSet replaceColorsParameterSet);
     }
 
-    public class ItemFilterScript : IItemFilterScript
+    public interface IItemFilterScriptInternal : IItemFilterScript
     {
-        public ItemFilterScript()
+        void SetIsDirty(bool isDirty);
+    }
+
+    public class ItemFilterScript : IItemFilterScriptInternal
+    {
+        private bool _isDirty;
+        private string _description;
+
+        internal ItemFilterScript()
         {
-            ItemFilterBlocks = new ObservableCollection<IItemFilterBlock>();
+            ItemFilterBlocks = new ObservableCollection<IItemFilterBlockBase>();
             ItemFilterBlockGroups = new ObservableCollection<ItemFilterBlockGroup>
             {
                 new ItemFilterBlockGroup("Root", null)
             };
-            ThemeComponents = new ThemeComponentCollection { IsMasterCollection = true};
+            ThemeComponents = new ThemeComponentCollection { IsMasterCollection = true };
+            ItemFilterScriptSettings = new ItemFilterScriptSettings(ThemeComponents);
         }
 
-        public ObservableCollection<IItemFilterBlock> ItemFilterBlocks { get; }
+        public ItemFilterScript(ICommandManagerInternal commandManager) : this()
+        {
+            CommandManager = commandManager;
+            commandManager.SetScript(this);
+        }
+
+        public ICommandManager CommandManager { get; }
+
+        public ObservableCollection<IItemFilterBlockBase> ItemFilterBlocks { get; }
         public ObservableCollection<ItemFilterBlockGroup> ItemFilterBlockGroups { get; }
 
         public ThemeComponentCollection ThemeComponents { get; set; } 
 
+        public IItemFilterScriptSettings ItemFilterScriptSettings { get; }
+
         public string FilePath { get; set; }
-        public string Description { get; set; }
+
+        public string Description
+        {
+            get => _description;
+            set
+            {
+                if (value == _description) return;
+                _description = value;
+                OnPropertyChanged();
+            }
+        }
+
         public DateTime DateModified { get; set; }
 
+        public bool IsDirty
+        {
+            get => _isDirty;
+            private set
+            {
+                if (value == _isDirty) return;
+                _isDirty = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public void SetIsDirty(bool isDirty)
+        {
+            IsDirty = isDirty;
+        }
+
         public List<string> Validate()
         {
             var validationErrors = new List<string>();
@@ -54,9 +110,7 @@ namespace Filtration.ObjectModel
         
         public void ReplaceColors(ReplaceColorsParameterSet replaceColorsParameterSet)
         {
-            foreach (
-                var block in
-                    ItemFilterBlocks.Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b)))
+            foreach (var block in ItemFilterBlocks.OfType<ItemFilterBlock>().Where(b => BlockIsColorReplacementCandidate(replaceColorsParameterSet, b)))
             {
                 if (replaceColorsParameterSet.ReplaceTextColor)
                 {
@@ -78,15 +132,9 @@ namespace Filtration.ObjectModel
 
         private bool BlockIsColorReplacementCandidate(ReplaceColorsParameterSet replaceColorsParameterSet, IItemFilterBlock block)
         {
-            var textColorItem = block.HasBlockItemOfType<TextColorBlockItem>()
-                ? block.BlockItems.OfType<TextColorBlockItem>().First()
-                : null;
-            var backgroundColorItem = block.HasBlockItemOfType<BackgroundColorBlockItem>()
-                ? block.BlockItems.OfType<BackgroundColorBlockItem>().First()
-                : null;
-            var borderColorItem = block.HasBlockItemOfType<BorderColorBlockItem>()
-                ? block.BlockItems.OfType<BorderColorBlockItem>().First()
-                : null;
+            var textColorItem = block.BlockItems.OfType<TextColorBlockItem>().FirstOrDefault();
+            var backgroundColorItem = block.BlockItems.OfType<BackgroundColorBlockItem>().FirstOrDefault();
+            var borderColorItem = block.BlockItems.OfType<BorderColorBlockItem>().FirstOrDefault();
 
             // If we don't have all of the things we want to replace, then we aren't a candidate for replacing those things.
             if ((textColorItem == null && replaceColorsParameterSet.ReplaceTextColor) ||
@@ -109,5 +157,12 @@ namespace Filtration.ObjectModel
             return true;
         }
 
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }
diff --git a/Filtration.ObjectModel/ItemFilterScriptSettings.cs b/Filtration.ObjectModel/ItemFilterScriptSettings.cs
new file mode 100644
index 0000000..02cd23a
--- /dev/null
+++ b/Filtration.ObjectModel/ItemFilterScriptSettings.cs
@@ -0,0 +1,21 @@
+using Filtration.ObjectModel.ThemeEditor;
+
+namespace Filtration.ObjectModel
+{
+    public interface IItemFilterScriptSettings
+    {
+        bool BlockGroupsEnabled { get; set; }
+        ThemeComponentCollection ThemeComponentCollection { get; }
+    }
+
+    public class ItemFilterScriptSettings : IItemFilterScriptSettings
+    {
+        public ItemFilterScriptSettings(ThemeComponentCollection themeComponentCollection)
+        {
+            ThemeComponentCollection = themeComponentCollection;
+        }
+
+        public bool BlockGroupsEnabled { get; set; }
+        public ThemeComponentCollection ThemeComponentCollection { get; }
+    }
+}
\ No newline at end of file
diff --git a/Filtration.ObjectModel/ItemFilterSection.cs b/Filtration.ObjectModel/ItemFilterSection.cs
deleted file mode 100644
index 4a2ecbf..0000000
--- a/Filtration.ObjectModel/ItemFilterSection.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Filtration.ObjectModel
-{
-    public class ItemFilterSection : ItemFilterBlock
-    {
-    }
-}
diff --git a/Filtration.ObjectModel/Properties/Annotations.cs b/Filtration.ObjectModel/Properties/Annotations.cs
index c30d43a..2e7c846 100644
--- a/Filtration.ObjectModel/Properties/Annotations.cs
+++ b/Filtration.ObjectModel/Properties/Annotations.cs
@@ -1,4 +1,26 @@
-using System;
+/* MIT License
+
+Copyright (c) 2016 JetBrains http://www.jetbrains.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. */
+
+using System;
 
 #pragma warning disable 1591
 // ReSharper disable UnusedMember.Global
@@ -7,7 +29,6 @@
 // ReSharper disable IntroduceOptionalParameters.Global
 // ReSharper disable MemberCanBeProtected.Global
 // ReSharper disable InconsistentNaming
-// ReSharper disable CheckNamespace
 
 namespace Filtration.ObjectModel.Annotations
 {
@@ -16,32 +37,37 @@ namespace Filtration.ObjectModel.Annotations
   /// so the check for <c>null</c> is necessary before its usage.
   /// </summary>
   /// <example><code>
-  /// [CanBeNull] public object Test() { return null; }
-  /// public void UseTest() {
+  /// [CanBeNull] object Test() => null;
+  /// 
+  /// void UseTest() {
   ///   var p = Test();
   ///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
   /// }
   /// </code></example>
   [AttributeUsage(
     AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event)]
+    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
+    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter)]
   public sealed class CanBeNullAttribute : Attribute { }
 
   /// <summary>
   /// Indicates that the value of the marked element could never be <c>null</c>.
   /// </summary>
   /// <example><code>
-  /// [NotNull] public object Foo() {
+  /// [NotNull] object Foo() {
   ///   return null; // Warning: Possible 'null' assignment
   /// }
   /// </code></example>
   [AttributeUsage(
     AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event)]
+    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
+    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter)]
   public sealed class NotNullAttribute : Attribute { }
 
   /// <summary>
-  /// Indicates that collection or enumerable value does not contain null elements.
+  /// Can be appplied to symbols of types derived from IEnumerable as well as to symbols of Task
+  /// and Lazy classes to indicate that the value of a collection item, of the Task.Result property
+  /// or of the Lazy.Value property can never be null.
   /// </summary>
   [AttributeUsage(
     AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
@@ -49,7 +75,9 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class ItemNotNullAttribute : Attribute { }
 
   /// <summary>
-  /// Indicates that collection or enumerable value can contain null elements.
+  /// Can be appplied to symbols of types derived from IEnumerable as well as to symbols of Task
+  /// and Lazy classes to indicate that the value of a collection item, of the Task.Result property
+  /// or of the Lazy.Value property can be null.
   /// </summary>
   [AttributeUsage(
     AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
@@ -63,8 +91,9 @@ namespace Filtration.ObjectModel.Annotations
   /// </summary>
   /// <example><code>
   /// [StringFormatMethod("message")]
-  /// public void ShowError(string message, params object[] args) { /* do something */ }
-  /// public void Foo() {
+  /// void ShowError(string message, params object[] args) { /* do something */ }
+  /// 
+  /// void Foo() {
   ///   ShowError("Failed: {0}"); // Warning: Non-existing argument in format string
   /// }
   /// </code></example>
@@ -76,22 +105,24 @@ namespace Filtration.ObjectModel.Annotations
     /// <param name="formatParameterName">
     /// Specifies which parameter of an annotated method should be treated as format-string
     /// </param>
-    public StringFormatMethodAttribute(string formatParameterName)
+    public StringFormatMethodAttribute([NotNull] string formatParameterName)
     {
       FormatParameterName = formatParameterName;
     }
 
-    public string FormatParameterName { get; private set; }
+    [NotNull] public string FormatParameterName { get; private set; }
   }
 
   /// <summary>
   /// For a parameter that is expected to be one of the limited set of values.
   /// Specify fields of which type should be used as values for this parameter.
   /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field)]
+  [AttributeUsage(
+    AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field,
+    AllowMultiple = true)]
   public sealed class ValueProviderAttribute : Attribute
   {
-    public ValueProviderAttribute(string name)
+    public ValueProviderAttribute([NotNull] string name)
     {
       Name = name;
     }
@@ -105,7 +136,7 @@ namespace Filtration.ObjectModel.Annotations
   /// the parameter of <see cref="System.ArgumentNullException"/>.
   /// </summary>
   /// <example><code>
-  /// public void Foo(string param) {
+  /// void Foo(string param) {
   ///   if (param == null)
   ///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
   /// }
@@ -131,10 +162,12 @@ namespace Filtration.ObjectModel.Annotations
   /// <example><code>
   /// public class Foo : INotifyPropertyChanged {
   ///   public event PropertyChangedEventHandler PropertyChanged;
+  /// 
   ///   [NotifyPropertyChangedInvocator]
   ///   protected virtual void NotifyChanged(string propertyName) { ... }
   ///
-  ///   private string _name;
+  ///   string _name;
+  /// 
   ///   public string Name {
   ///     get { return _name; }
   ///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
@@ -153,12 +186,12 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
   {
     public NotifyPropertyChangedInvocatorAttribute() { }
-    public NotifyPropertyChangedInvocatorAttribute(string parameterName)
+    public NotifyPropertyChangedInvocatorAttribute([NotNull] string parameterName)
     {
       ParameterName = parameterName;
     }
 
-    public string ParameterName { get; private set; }
+    [CanBeNull] public string ParameterName { get; private set; }
   }
 
   /// <summary>
@@ -174,15 +207,16 @@ namespace Filtration.ObjectModel.Annotations
   /// <item>Value    ::= true | false | null | notnull | canbenull</item>
   /// </list>
   /// If method has single input parameter, it's name could be omitted.<br/>
-  /// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same)
-  /// for method output means that the methos doesn't return normally.<br/>
-  /// <c>canbenull</c> annotation is only applicable for output parameters.<br/>
-  /// You can use multiple <c>[ContractAnnotation]</c> for each FDT row,
-  /// or use single attribute with rows separated by semicolon.<br/>
+  /// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same) for method output
+  /// means that the methos doesn't return normally (throws or terminates the process).<br/>
+  /// Value <c>canbenull</c> is only applicable for output parameters.<br/>
+  /// You can use multiple <c>[ContractAnnotation]</c> for each FDT row, or use single attribute
+  /// with rows separated by semicolon. There is no notion of order rows, all rows are checked
+  /// for applicability and applied per each program state tracked by R# analysis.<br/>
   /// </syntax>
   /// <examples><list>
   /// <item><code>
-  /// [ContractAnnotation("=> halt")]
+  /// [ContractAnnotation("=&gt; halt")]
   /// public void TerminationMethod()
   /// </code></item>
   /// <item><code>
@@ -190,17 +224,17 @@ namespace Filtration.ObjectModel.Annotations
   /// public void Assert(bool condition, string text) // regular assertion method
   /// </code></item>
   /// <item><code>
-  /// [ContractAnnotation("s:null => true")]
+  /// [ContractAnnotation("s:null =&gt; true")]
   /// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
   /// </code></item>
   /// <item><code>
   /// // A method that returns null if the parameter is null,
   /// // and not null if the parameter is not null
-  /// [ContractAnnotation("null => null; notnull => notnull")]
+  /// [ContractAnnotation("null =&gt; null; notnull =&gt; notnull")]
   /// public object Transform(object data) 
   /// </code></item>
   /// <item><code>
-  /// [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")]
+  /// [ContractAnnotation("=&gt; true, result: notnull; =&gt; false, result: null")]
   /// public bool TryParse(string s, out Person result)
   /// </code></item>
   /// </list></examples>
@@ -216,7 +250,8 @@ namespace Filtration.ObjectModel.Annotations
       ForceFullStates = forceFullStates;
     }
 
-    public string Contract { get; private set; }
+    [NotNull] public string Contract { get; private set; }
+
     public bool ForceFullStates { get; private set; }
   }
 
@@ -225,14 +260,15 @@ namespace Filtration.ObjectModel.Annotations
   /// </summary>
   /// <example><code>
   /// [LocalizationRequiredAttribute(true)]
-  /// public class Foo {
-  ///   private string str = "my string"; // Warning: Localizable string
+  /// class Foo {
+  ///   string str = "my string"; // Warning: Localizable string
   /// }
   /// </code></example>
   [AttributeUsage(AttributeTargets.All)]
   public sealed class LocalizationRequiredAttribute : Attribute
   {
     public LocalizationRequiredAttribute() : this(true) { }
+
     public LocalizationRequiredAttribute(bool required)
     {
       Required = required;
@@ -250,8 +286,9 @@ namespace Filtration.ObjectModel.Annotations
   /// <example><code>
   /// [CannotApplyEqualityOperator]
   /// class NoEquality { }
+  /// 
   /// class UsesNoEquality {
-  ///   public void Test() {
+  ///   void Test() {
   ///     var ca1 = new NoEquality();
   ///     var ca2 = new NoEquality();
   ///     if (ca1 != null) { // OK
@@ -269,9 +306,10 @@ namespace Filtration.ObjectModel.Annotations
   /// </summary>
   /// <example><code>
   /// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
-  /// public class ComponentAttribute : Attribute { }
+  /// class ComponentAttribute : Attribute { }
+  /// 
   /// [Component] // ComponentAttribute requires implementing IComponent interface
-  /// public class MyComponent : IComponent { }
+  /// class MyComponent : IComponent { }
   /// </code></example>
   [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
   [BaseTypeRequired(typeof(Attribute))]
@@ -308,6 +346,7 @@ namespace Filtration.ObjectModel.Annotations
     }
 
     public ImplicitUseKindFlags UseKindFlags { get; private set; }
+
     public ImplicitUseTargetFlags TargetFlags { get; private set; }
   }
 
@@ -334,6 +373,7 @@ namespace Filtration.ObjectModel.Annotations
     }
 
     [UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; private set; }
+
     [UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; private set; }
   }
 
@@ -377,12 +417,13 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class PublicAPIAttribute : Attribute
   {
     public PublicAPIAttribute() { }
+
     public PublicAPIAttribute([NotNull] string comment)
     {
       Comment = comment;
     }
 
-    public string Comment { get; private set; }
+    [CanBeNull] public string Comment { get; private set; }
   }
 
   /// <summary>
@@ -398,15 +439,51 @@ namespace Filtration.ObjectModel.Annotations
   /// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>.
   /// </summary>
   /// <example><code>
-  /// [Pure] private int Multiply(int x, int y) { return x * y; }
-  /// public void Foo() {
-  ///   const int a = 2, b = 2;
-  ///   Multiply(a, b); // Waring: Return value of pure method is not used
+  /// [Pure] int Multiply(int x, int y) => x * y;
+  /// 
+  /// void M() {
+  ///   Multiply(123, 42); // Waring: Return value of pure method is not used
   /// }
   /// </code></example>
   [AttributeUsage(AttributeTargets.Method)]
   public sealed class PureAttribute : Attribute { }
 
+  /// <summary>
+  /// Indicates that the return value of method invocation must be used.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Method)]
+  public sealed class MustUseReturnValueAttribute : Attribute
+  {
+    public MustUseReturnValueAttribute() { }
+
+    public MustUseReturnValueAttribute([NotNull] string justification)
+    {
+      Justification = justification;
+    }
+
+    [CanBeNull] public string Justification { get; private set; }
+  }
+
+  /// <summary>
+  /// Indicates the type member or parameter of some type, that should be used instead of all other ways
+  /// to get the value that type. This annotation is useful when you have some "context" value evaluated
+  /// and stored somewhere, meaning that all other ways to get this value must be consolidated with existing one.
+  /// </summary>
+  /// <example><code>
+  /// class Foo {
+  ///   [ProvidesContext] IBarService _barService = ...;
+  /// 
+  ///   void ProcessNode(INode node) {
+  ///     DoSomething(node, node.GetGlobalServices().Bar);
+  ///     //              ^ Warning: use value of '_barService' field
+  ///   }
+  /// }
+  /// </code></example>
+  [AttributeUsage(
+    AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Parameter | AttributeTargets.Method |
+    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.GenericParameter)]
+  public sealed class ProvidesContextAttribute : Attribute { }
+
   /// <summary>
   /// Indicates that a parameter is a path to a file or a folder within a web project.
   /// Path can be relative or absolute, starting from web root (~).
@@ -415,12 +492,13 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class PathReferenceAttribute : Attribute
   {
     public PathReferenceAttribute() { }
-    public PathReferenceAttribute([PathReference] string basePath)
+
+    public PathReferenceAttribute([NotNull, PathReference] string basePath)
     {
       BasePath = basePath;
     }
 
-    public string BasePath { get; private set; }
+    [CanBeNull] public string BasePath { get; private set; }
   }
 
   /// <summary>
@@ -484,7 +562,7 @@ namespace Filtration.ObjectModel.Annotations
     /// Allows specifying a macro that will be executed for a <see cref="SourceTemplateAttribute">source template</see>
     /// parameter when the template is expanded.
     /// </summary>
-    public string Expression { get; set; }
+    [CanBeNull] public string Expression { get; set; }
 
     /// <summary>
     /// Allows specifying which occurrence of the target parameter becomes editable when the template is deployed.
@@ -500,73 +578,73 @@ namespace Filtration.ObjectModel.Annotations
     /// Identifies the target parameter of a <see cref="SourceTemplateAttribute">source template</see> if the
     /// <see cref="MacroAttribute"/> is applied on a template method.
     /// </summary>
-    public string Target { get; set; }
+    [CanBeNull] public string Target { get; set; }
   }
 
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
   public sealed class AspMvcAreaMasterLocationFormatAttribute : Attribute
   {
-    public AspMvcAreaMasterLocationFormatAttribute(string format)
+    public AspMvcAreaMasterLocationFormatAttribute([NotNull] string format)
     {
       Format = format;
     }
 
-    public string Format { get; private set; }
+    [NotNull] public string Format { get; private set; }
   }
 
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
   public sealed class AspMvcAreaPartialViewLocationFormatAttribute : Attribute
   {
-    public AspMvcAreaPartialViewLocationFormatAttribute(string format)
+    public AspMvcAreaPartialViewLocationFormatAttribute([NotNull] string format)
     {
       Format = format;
     }
 
-    public string Format { get; private set; }
+    [NotNull] public string Format { get; private set; }
   }
 
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
   public sealed class AspMvcAreaViewLocationFormatAttribute : Attribute
   {
-    public AspMvcAreaViewLocationFormatAttribute(string format)
+    public AspMvcAreaViewLocationFormatAttribute([NotNull] string format)
     {
       Format = format;
     }
 
-    public string Format { get; private set; }
+    [NotNull] public string Format { get; private set; }
   }
 
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
   public sealed class AspMvcMasterLocationFormatAttribute : Attribute
   {
-    public AspMvcMasterLocationFormatAttribute(string format)
+    public AspMvcMasterLocationFormatAttribute([NotNull] string format)
     {
       Format = format;
     }
 
-    public string Format { get; private set; }
+    [NotNull] public string Format { get; private set; }
   }
 
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
   public sealed class AspMvcPartialViewLocationFormatAttribute : Attribute
   {
-    public AspMvcPartialViewLocationFormatAttribute(string format)
+    public AspMvcPartialViewLocationFormatAttribute([NotNull] string format)
     {
       Format = format;
     }
 
-    public string Format { get; private set; }
+    [NotNull] public string Format { get; private set; }
   }
 
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
   public sealed class AspMvcViewLocationFormatAttribute : Attribute
   {
-    public AspMvcViewLocationFormatAttribute(string format)
+    public AspMvcViewLocationFormatAttribute([NotNull] string format)
     {
       Format = format;
     }
 
-    public string Format { get; private set; }
+    [NotNull] public string Format { get; private set; }
   }
 
   /// <summary>
@@ -579,12 +657,13 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class AspMvcActionAttribute : Attribute
   {
     public AspMvcActionAttribute() { }
-    public AspMvcActionAttribute(string anonymousProperty)
+
+    public AspMvcActionAttribute([NotNull] string anonymousProperty)
     {
       AnonymousProperty = anonymousProperty;
     }
 
-    public string AnonymousProperty { get; private set; }
+    [CanBeNull] public string AnonymousProperty { get; private set; }
   }
 
   /// <summary>
@@ -596,12 +675,13 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class AspMvcAreaAttribute : Attribute
   {
     public AspMvcAreaAttribute() { }
-    public AspMvcAreaAttribute(string anonymousProperty)
+
+    public AspMvcAreaAttribute([NotNull] string anonymousProperty)
     {
       AnonymousProperty = anonymousProperty;
     }
 
-    public string AnonymousProperty { get; private set; }
+    [CanBeNull] public string AnonymousProperty { get; private set; }
   }
 
   /// <summary>
@@ -614,12 +694,13 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class AspMvcControllerAttribute : Attribute
   {
     public AspMvcControllerAttribute() { }
-    public AspMvcControllerAttribute(string anonymousProperty)
+
+    public AspMvcControllerAttribute([NotNull] string anonymousProperty)
     {
       AnonymousProperty = anonymousProperty;
     }
 
-    public string AnonymousProperty { get; private set; }
+    [CanBeNull] public string AnonymousProperty { get; private set; }
   }
 
   /// <summary>
@@ -649,7 +730,7 @@ namespace Filtration.ObjectModel.Annotations
   /// ASP.NET MVC attribute. Allows disabling inspections for MVC views within a class or a method.
   /// </summary>
   [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-  public sealed class AspMvcSupressViewErrorAttribute : Attribute { }
+  public sealed class AspMvcSuppressViewErrorAttribute : Attribute { }
 
   /// <summary>
   /// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
@@ -677,13 +758,27 @@ namespace Filtration.ObjectModel.Annotations
 
   /// <summary>
   /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-  /// is an MVC view. If applied to a method, the MVC view name is calculated implicitly
+  /// is an MVC view component. If applied to a method, the MVC view name is calculated implicitly
   /// from the context. Use this attribute for custom wrappers similar to
   /// <c>System.Web.Mvc.Controller.View(Object)</c>.
   /// </summary>
   [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
   public sealed class AspMvcViewAttribute : Attribute { }
 
+  /// <summary>
+  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+  /// is an MVC view component name.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter)]
+  public sealed class AspMvcViewComponentAttribute : Attribute { }
+
+  /// <summary>
+  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+  /// is an MVC view component view. If applied to a method, the MVC view component view name is default.
+  /// </summary>
+  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+  public sealed class AspMvcViewComponentViewAttribute : Attribute { }
+
   /// <summary>
   /// ASP.NET MVC attribute. When applied to a parameter of an attribute,
   /// indicates that this parameter is an MVC action name.
@@ -702,12 +797,13 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class HtmlElementAttributesAttribute : Attribute
   {
     public HtmlElementAttributesAttribute() { }
-    public HtmlElementAttributesAttribute(string name)
+
+    public HtmlElementAttributesAttribute([NotNull] string name)
     {
       Name = name;
     }
 
-    public string Name { get; private set; }
+    [CanBeNull] public string Name { get; private set; }
   }
 
   [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
@@ -730,9 +826,10 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class RazorSectionAttribute : Attribute { }
 
   /// <summary>
-  /// Indicates how method invocation affects content of the collection.
+  /// Indicates how method, constructor invocation or property access
+  /// over collection type affects content of the collection.
   /// </summary>
-  [AttributeUsage(AttributeTargets.Method)]
+  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Property)]
   public sealed class CollectionAccessAttribute : Attribute
   {
     public CollectionAccessAttribute(CollectionAccessType collectionAccessType)
@@ -824,6 +921,16 @@ namespace Filtration.ObjectModel.Annotations
   [AttributeUsage(AttributeTargets.Parameter)]
   public sealed class RegexPatternAttribute : Attribute { }
 
+  /// <summary>
+  /// Prevents the Member Reordering feature from tossing members of the marked class.
+  /// </summary>
+  /// <remarks>
+  /// The attribute must be mentioned in your member reordering patterns
+  /// </remarks>
+  [AttributeUsage(
+    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Enum)]
+  public sealed class NoReorderAttribute : Attribute { }
+
   /// <summary>
   /// XAML attribute. Indicates the type that has <c>ItemsSource</c> property and should be treated
   /// as <c>ItemsControl</c>-derived type, to enable inner items <c>DataContext</c> type resolve.
@@ -832,7 +939,7 @@ namespace Filtration.ObjectModel.Annotations
   public sealed class XamlItemsControlAttribute : Attribute { }
 
   /// <summary>
-  /// XAML attibute. Indicates the property of some <c>BindingBase</c>-derived type, that
+  /// XAML attribute. Indicates the property of some <c>BindingBase</c>-derived type, that
   /// is used to bind some item of <c>ItemsControl</c>-derived type. This annotation will
   /// enable the <c>DataContext</c> type resolve for XAML bindings for such properties.
   /// </summary>
@@ -846,14 +953,15 @@ namespace Filtration.ObjectModel.Annotations
   [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
   public sealed class AspChildControlTypeAttribute : Attribute
   {
-    public AspChildControlTypeAttribute(string tagName, Type controlType)
+    public AspChildControlTypeAttribute([NotNull] string tagName, [NotNull] Type controlType)
     {
       TagName = tagName;
       ControlType = controlType;
     }
 
-    public string TagName { get; private set; }
-    public Type ControlType { get; private set; }
+    [NotNull] public string TagName { get; private set; }
+
+    [NotNull] public Type ControlType { get; private set; }
   }
 
   [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
@@ -873,7 +981,7 @@ namespace Filtration.ObjectModel.Annotations
       Attribute = attribute;
     }
 
-    public string Attribute { get; private set; }
+    [NotNull] public string Attribute { get; private set; }
   }
 
   [AttributeUsage(AttributeTargets.Property)]
@@ -890,25 +998,37 @@ namespace Filtration.ObjectModel.Annotations
   [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
   public sealed class RazorImportNamespaceAttribute : Attribute
   {
-    public RazorImportNamespaceAttribute(string name)
+    public RazorImportNamespaceAttribute([NotNull] string name)
     {
       Name = name;
     }
 
-    public string Name { get; private set; }
+    [NotNull] public string Name { get; private set; }
   }
 
   [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
   public sealed class RazorInjectionAttribute : Attribute
   {
-    public RazorInjectionAttribute(string type, string fieldName)
+    public RazorInjectionAttribute([NotNull] string type, [NotNull] string fieldName)
     {
       Type = type;
       FieldName = fieldName;
     }
 
-    public string Type { get; private set; }
-    public string FieldName { get; private set; }
+    [NotNull] public string Type { get; private set; }
+
+    [NotNull] public string FieldName { get; private set; }
+  }
+
+  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+  public sealed class RazorDirectiveAttribute : Attribute
+  {
+    public RazorDirectiveAttribute([NotNull] string directive)
+    {
+      Directive = directive;
+    }
+
+    [NotNull] public string Directive { get; private set; }
   }
 
   [AttributeUsage(AttributeTargets.Method)]
@@ -925,13 +1045,4 @@ namespace Filtration.ObjectModel.Annotations
 
   [AttributeUsage(AttributeTargets.Parameter)]
   public sealed class RazorWriteMethodParameterAttribute : Attribute { }
-
-  /// <summary>
-  /// Prevents the Member Reordering feature from tossing members of the marked class.
-  /// </summary>
-  /// <remarks>
-  /// The attribute must be mentioned in your member reordering patterns
-  /// </remarks>
-  [AttributeUsage(AttributeTargets.All)]
-  public sealed class NoReorder : Attribute { }
 }
\ No newline at end of file
diff --git a/Filtration.ObjectModel/Properties/AssemblyInfo.cs b/Filtration.ObjectModel/Properties/AssemblyInfo.cs
index 6ecac2f..5f4cbb6 100644
--- a/Filtration.ObjectModel/Properties/AssemblyInfo.cs
+++ b/Filtration.ObjectModel/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -33,3 +34,9 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]
+[assembly: InternalsVisibleTo("Filtration.ObjectModel.Tests")]
+[assembly: InternalsVisibleTo("Filtration.Parser.Tests")]
+[assembly: InternalsVisibleTo("Filtration.Tests")]
+[assembly: InternalsVisibleTo("Filtration.ThemeEditor.Tests")]
\ No newline at end of file
diff --git a/Filtration.ObjectModel/WindsorInstallers/CommandsInstaller.cs b/Filtration.ObjectModel/WindsorInstallers/CommandsInstaller.cs
new file mode 100644
index 0000000..eba5a12
--- /dev/null
+++ b/Filtration.ObjectModel/WindsorInstallers/CommandsInstaller.cs
@@ -0,0 +1,21 @@
+using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+using Filtration.ObjectModel.Commands;
+
+namespace Filtration.ObjectModel.WindsorInstallers
+{
+    public class CommandsInstaller : IWindsorInstaller
+    {
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+
+            container.Register(Component
+                .For<ICommandManager>()
+                .Forward<ICommandManagerInternal>()
+                .ImplementedBy<CommandManager>()
+                .LifestyleTransient());
+
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/WindsorInstallers/ModelsInstaller.cs b/Filtration.ObjectModel/WindsorInstallers/ModelsInstaller.cs
new file mode 100644
index 0000000..d0c38d4
--- /dev/null
+++ b/Filtration.ObjectModel/WindsorInstallers/ModelsInstaller.cs
@@ -0,0 +1,23 @@
+using Castle.Facilities.TypedFactory;
+using Castle.MicroKernel.Registration;
+using Castle.MicroKernel.SubSystems.Configuration;
+using Castle.Windsor;
+using Filtration.ObjectModel.Factories;
+
+namespace Filtration.ObjectModel.WindsorInstallers
+{
+    public class ModelsInstaller : IWindsorInstaller
+    {
+        public void Install(IWindsorContainer container, IConfigurationStore store)
+        {
+            container.Register(Component
+                .For<IItemFilterScript>()
+                .ImplementedBy<ItemFilterScript>()
+                .LifestyleTransient());
+
+            container.Register(Component
+                .For<IItemFilterScriptFactory>()
+                .AsFactory());
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/packages.config b/Filtration.ObjectModel/packages.config
new file mode 100644
index 0000000..2eb5957
--- /dev/null
+++ b/Filtration.ObjectModel/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Castle.Core" version="3.3.0" targetFramework="net461" />
+  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs b/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
index 59d923e..859e276 100644
--- a/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
+++ b/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
@@ -1,14 +1,16 @@
 using System.Collections.ObjectModel;
 using Filtration.ObjectModel;
-using Filtration.ObjectModel.ThemeEditor;
 
 namespace Filtration.Parser.Interface.Services
 {
     public interface IItemFilterBlockTranslator
     {
-        IItemFilterBlock TranslateStringToItemFilterBlock(string inputString,
-            ThemeComponentCollection masterComponentCollection);
+        IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, bool initialiseBlockGroupHierarchyBuilder = false);
+        IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript);
+
         string TranslateItemFilterBlockToString(IItemFilterBlock block);
         void ReplaceAudioVisualBlockItemsFromString(ObservableCollection<IItemFilterBlockItem> blockItems, string inputString);
+        string TranslateItemFilterCommentBlockToString(IItemFilterCommentBlock itemFilterCommentBlock);
+        string TranslateItemFilterBlockBaseToString(IItemFilterBlockBase itemFilterBlockBase);
     }
 }
\ No newline at end of file
diff --git a/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs b/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs
index 6cb2e70..06c9a93 100644
--- a/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs
+++ b/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs
@@ -4,7 +4,7 @@ namespace Filtration.Parser.Interface.Services
 {
     public interface IItemFilterScriptTranslator
     {
-        ItemFilterScript TranslateStringToItemFilterScript(string inputString);
-        string TranslateItemFilterScriptToString(ItemFilterScript script);
+        IItemFilterScript TranslateStringToItemFilterScript(string inputString);
+        string TranslateItemFilterScriptToString(IItemFilterScript script);
     }
 }
\ No newline at end of file
diff --git a/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj b/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
index ee5be14..26effd4 100644
--- a/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
+++ b/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
@@ -40,21 +40,17 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -113,6 +109,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\testscript2.txt" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/Filtration.Parser.Tests/Properties/Resources.Designer.cs b/Filtration.Parser.Tests/Properties/Resources.Designer.cs
index b4a2cb0..4cd12a1 100644
--- a/Filtration.Parser.Tests/Properties/Resources.Designer.cs
+++ b/Filtration.Parser.Tests/Properties/Resources.Designer.cs
@@ -91,6 +91,37 @@ namespace Filtration.Parser.Tests.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to #Script description
+        ///#Script description
+        ///#Script description
+        ///#Script description
+        ///
+        ///#Comment
+        ///#SomeComment
+        ///
+        ///#Blockdescription
+        ///Show	#Flasks - Endgame - Life/Mana - Divine/Eternal - Q10+ - Normal
+        ///	Class &quot;Life Flasks&quot; &quot;Mana Flasks&quot;
+        ///	Rarity Normal
+        ///	DropLevel &gt;= 60
+        ///	Quality &gt;= 10
+        ///	SetFontSize 28
+        ///	SetTextColor 240 240 240	#Normal Item Highlight
+        ///
+        ///#commentymccommentface
+        ///    
+        ///Show	#Flasks - Endgame - Life/Mana - Divine/Eternal - Q10+ - Normal
+        ///	Class &quot;Life Flasks&quot; &quot;Mana Flasks&quot;
+        ///	Rarity Normal
+        ///	DropL [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string testscript2 {
+            get {
+                return ResourceManager.GetString("testscript2", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ###BETA VERSION 1.0.0.1-8
         ///#Please test and let me know via pm on reddit /u/brute_force or @Thiole in game if i am online
diff --git a/Filtration.Parser.Tests/Properties/Resources.resx b/Filtration.Parser.Tests/Properties/Resources.resx
index 9797aeb..1e13abb 100644
--- a/Filtration.Parser.Tests/Properties/Resources.resx
+++ b/Filtration.Parser.Tests/Properties/Resources.resx
@@ -118,10 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ThioleItemFilter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ThioleItemFilter.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
   <data name="testscript" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\testscript.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="testscript2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\testscript2.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="ThioleItemFilter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ThioleItemFilter.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Filtration.Parser.Tests/Resources/testscript2.txt b/Filtration.Parser.Tests/Resources/testscript2.txt
new file mode 100644
index 0000000..f9b3a9c
--- /dev/null
+++ b/Filtration.Parser.Tests/Resources/testscript2.txt
@@ -0,0 +1,31 @@
+#Script description
+#Script description
+#Script description
+#Script description
+
+#Blockdescription
+Show	#Flasks - Endgame - Life/Mana - Divine/Eternal - Q10+ - Normal
+	Class "Life Flasks" "Mana Flasks"
+	Rarity Normal
+	SetFontSize 28
+
+    
+    
+# commentymccommentface
+    
+Show
+	Class "Life Flasks" "Mana Flasks"
+	Rarity Normal
+	DropLevel >= 60
+
+#commment
+#morecomment
+#blah
+
+#anothercomment
+
+#notpartofblockdescription    
+#blockdescription2
+Show	#TestBlock
+	Class "Life Flasks" "Mana Flasks"
+	Rarity Normal	
\ No newline at end of file
diff --git a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
index c888564..55b8e32 100644
--- a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
+++ b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs
@@ -26,6 +26,54 @@ namespace Filtration.Parser.Tests.Services
             _testUtility = new ItemFilterBlockTranslatorTestUtility();
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlockComment_ReturnsItemFilterBlockCommentWithSpacesNotRemoved()
+        {
+            //Arrange
+            var testInputString = "#  This is a comment\r\n# Line 2 \r\n # Test";
+
+            //Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterCommentBlock(testInputString, Mock.Of<IItemFilterScript>());
+
+            //Assert
+            Assert.AreEqual("  This is a comment\r\n Line 2 \r\n Test", result.Comment);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_ActionBlockItemCommentIsNull()
+        {
+
+            // Arrange
+            var inputString = "Show # Test - Test2 - Test3" + Environment.NewLine;
+
+            var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
+            _testUtility.MockBlockGroupHierarchyBuilder
+                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()))
+                .Returns(inputBlockGroup);
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
+
+            //Assert
+            Assert.IsTrue(string.IsNullOrEmpty(result.ActionBlockItem.Comment));
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_BlockGroupsDisabled_ActionBlockItemCommentIsSetCorrectly()
+        {
+
+            // Arrange
+            var testInputExpectedComment = " this is a comment that should be preserved";
+
+            var inputString = $"Show #{testInputExpectedComment}" + Environment.NewLine;
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled == false));
+
+            //Assert
+            Assert.AreEqual(testInputExpectedComment, result.ActionBlockItem.Comment);
+        }
+
         [Test]
         public void TranslateStringToItemFilterBlock_NotDisabled_SetsBlockEnabledTrue()
         {
@@ -34,7 +82,7 @@ namespace Filtration.Parser.Tests.Services
                               "    ItemLevel >= 55";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(true, result.Enabled);
@@ -48,7 +96,7 @@ namespace Filtration.Parser.Tests.Services
                               "    ItemLevel >= 55";
             
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(2, result.BlockItems.Count);
@@ -64,7 +112,7 @@ namespace Filtration.Parser.Tests.Services
                               "    ItemLevel >= 55";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is ItemLevelBlockItem));
@@ -74,7 +122,7 @@ namespace Filtration.Parser.Tests.Services
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_BlockGroupComment_CallsBlockGroupHierarchyBuilder()
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_ShowBlock_SetsBlockGroupIsCheckedCorrectly()
         {
             // Arrange
             var inputString = "Show # TestBlockGroup" + Environment.NewLine;
@@ -82,29 +130,14 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
             _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
-            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
-
-            // Assert
-            _testUtility.MockBlockGroupHierarchyBuilder.Verify();
-        }
-
-        [Test]
-        public void TranslateStringToItemFilterBlock_ShowBlock_SetsBlockGroupIsCheckedCorrectly()
-        {
-            // Arrange
-            var inputString = "Show # TestBlockGroup" + Environment.NewLine;
-            var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
-
-            // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
-            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
             Assert.AreEqual(true, inputBlockGroup.IsChecked);
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_HideBlock_SetsBlockGroupIsCheckedCorrectly()
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_HideBlock_SetsBlockGroupIsCheckedCorrectly()
         {
             // Arrange
             var inputString = "Hide # TestBlockGroup" + Environment.NewLine;
@@ -112,56 +145,108 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
             _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
-            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
             Assert.AreEqual(false, inputBlockGroup.IsChecked);
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_NoBlockGroupComment_CallsBlockGroupHierarchyBuilder()
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_BlockGroupComment_CallsBlockGroupHierarchyBuilder()
+        {
+            // Arrange
+            var inputString = "Show # TestBlockGroup" + Environment.NewLine;
+            var inputBlockGroup = new ItemFilterBlockGroup("TestBlockGroup", null);
+
+            // Act
+            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(inputBlockGroup).Verifiable();
+            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
+
+            // Assert
+            _testUtility.MockBlockGroupHierarchyBuilder.Verify();
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_NoBlockGroupComment_DoesNotCallBlockGroupHierarchyBuilder()
         {
             // Arrange
             var inputString = "Show" + Environment.NewLine;
 
             // Act
             _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Verifiable();
-            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
             _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()), Times.Never);
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_BlockGroupCommentWithNoGroups_DoesNotThrow()
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_BlockGroupCommentWithNoGroups_DoesNotThrow()
         {
             // Arrange
             var inputString = "Show    #" + Environment.NewLine;
 
             // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Verifiable();
-            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
             _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()), Times.Never);
         }
 
         [Test]
-        public void TranslateStringToItemFilterBlock_BlockGroupComment_SetsBlockItemGroupCorrectly()
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_BlockGroupComment_SetsBlockItemGroupCorrectly()
         {
             // Arrange
             var inputString = "Show # Test Block Group - Test Sub Block Group - Test Another Block Group" + Environment.NewLine;
             var testBlockGroup = new ItemFilterBlockGroup("zzzzz", null);
 
             // Act
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>())).Returns(testBlockGroup).Verifiable();
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            _testUtility.MockBlockGroupHierarchyBuilder
+                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.Is<IEnumerable<string>>(s => s.Contains("Test Block Group") && s.Contains("Test Sub Block Group") && s.Contains("Test Another Block Group"))))
+                .Returns(testBlockGroup)
+                .Verifiable();
+
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
 
             // Assert
             Assert.AreEqual(testBlockGroup, result.BlockGroup);
             _testUtility.MockBlockGroupHierarchyBuilder.Verify();
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_BlockGroupsEnabled_BlockGroupComment_NoSpacingAroundHyphens_SetsBlockItemGroupCorrectly()
+        {
+            // Arrange
+            var inputString = "Show # AAA-BBB-CCC" + Environment.NewLine;
+            var testBlockGroup = new ItemFilterBlockGroup("zzzzz", null);
+
+            // Act
+            _testUtility.MockBlockGroupHierarchyBuilder
+                .Setup(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.Is<IEnumerable<string>>(s => s.Contains("AAA-BBB-CCC"))))
+                .Returns(testBlockGroup)
+                .Verifiable();
+
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled));
+
+            // Assert
+            Assert.AreEqual(testBlockGroup, result.BlockGroup);
+            _testUtility.MockBlockGroupHierarchyBuilder.Verify();
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_BlockGroupsDisabled_BlockGroupComment_DoesNotCallBlockGroupHierarchyBuilder()
+        {
+            // Arrange
+            var inputString = "Show # AAA - BBB - CCC" + Environment.NewLine;
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.BlockGroupsEnabled == false));
+
+            // Assert
+            Assert.IsNull(result.BlockGroup);
+            _testUtility.MockBlockGroupHierarchyBuilder.Verify(b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()), Times.Never);
+        }
+
         [Test]
         public void TranslateStringToItemFilterBlock_Hide_ReturnsCorrectObject()
         {
@@ -169,7 +254,7 @@ namespace Filtration.Parser.Tests.Services
             var inputString = "Hide" + Environment.NewLine;
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is ActionBlockItem));
@@ -185,7 +270,7 @@ namespace Filtration.Parser.Tests.Services
                               "    ItemLevel >= 55";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual("This is a test Block", result.Description);
@@ -205,7 +290,7 @@ namespace Filtration.Parser.Tests.Services
                               "    ItemLevel >= 55";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual("Second Line", result.Description);
@@ -223,7 +308,7 @@ namespace Filtration.Parser.Tests.Services
                               "    DropLevel = 40";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -241,7 +326,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Corrupted True";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -309,7 +394,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Identified True";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -326,7 +411,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Quality < 18";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -344,7 +429,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Rarity > Normal";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -362,7 +447,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Rarity Normal";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is RarityBlockItem));
@@ -379,7 +464,7 @@ namespace Filtration.Parser.Tests.Services
                               @"    Class ""Test Class 1"" ""TestOneWordClassInQuotes"" TestOneWordClassNotInQuotes ""Test Class 2""";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is ClassBlockItem));
@@ -398,7 +483,7 @@ namespace Filtration.Parser.Tests.Services
                               @"    BaseType ""Test Base Type 1"" ""TestOneWordBaseTypeInQuotes"" TestOneWordBaseTypeNotInQuotes ""Test BaseType 2""";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is BaseTypeBlockItem));
@@ -417,7 +502,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Sockets > 2";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -435,7 +520,7 @@ namespace Filtration.Parser.Tests.Services
                               "    LinkedSockets > 1";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -453,7 +538,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Width = 1";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -471,7 +556,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Height <= 3";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
 
@@ -489,7 +574,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Height <=3";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is HeightBlockItem));
@@ -506,7 +591,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SocketGroup RRGB";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is SocketGroupBlockItem));
@@ -524,7 +609,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetTextColor 255 20 100";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is TextColorBlockItem));
@@ -542,7 +627,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetTextColor 65 0 255 12";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is TextColorBlockItem));
@@ -561,7 +646,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetBackgroundColor 255 20 100";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is BackgroundColorBlockItem));
@@ -580,7 +665,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetBorderColor 255 20 100";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is BorderColorBlockItem));
@@ -599,8 +684,8 @@ namespace Filtration.Parser.Tests.Services
 
             // Act
 
-            Assert.DoesNotThrow(() => _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null));
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            Assert.DoesNotThrow(() => _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript));
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is BorderColorBlockItem));
@@ -620,7 +705,7 @@ namespace Filtration.Parser.Tests.Services
             var testInputThemeComponentCollection = new ThemeComponentCollection { testComponent };
             
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, testInputThemeComponentCollection);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.ThemeComponentCollection == testInputThemeComponentCollection));
 
             // Assert
             var blockItem = result.BlockItems.OfType<TextColorBlockItem>().First();
@@ -638,7 +723,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetFontSize 15";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is FontSizeBlockItem));
@@ -655,7 +740,7 @@ namespace Filtration.Parser.Tests.Services
                               "    PlayAlertSound 4";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is SoundBlockItem));
@@ -673,7 +758,7 @@ namespace Filtration.Parser.Tests.Services
                               "    PlayAlertSound 2 95";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is SoundBlockItem));
@@ -717,21 +802,6 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual("7", blockItem.Value);
             Assert.AreEqual(95, blockItem.SecondValue);
         }
-
-        [Test]
-        public void TranslateStringToItemFilterBlock_SectionComment_ReturnsItemFilterSectionObjectWithCorrectDescription()
-        {
-            // Arrange
-            const string testInputSectionDescription = "Wonderful items that you definitely won't want to miss!";
-            var inputString = "# Section: " + testInputSectionDescription;
-
-            // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
-
-            // Assert
-            Assert.IsInstanceOf<ItemFilterSection>(result);
-            Assert.AreEqual(testInputSectionDescription, result.Description);
-        }
         
         [Test]
         public void TranslateStringToItemFilterBlock_Everything_ReturnsCorrectObject()
@@ -764,7 +834,7 @@ namespace Filtration.Parser.Tests.Services
                               "    PlayAlertSound 3" + Environment.NewLine;
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual("Test filter with everything", result.Description);
@@ -861,7 +931,7 @@ namespace Filtration.Parser.Tests.Services
                               "    Quality < 17";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(2, result.BlockItems.Count(b => b is ItemLevelBlockItem));
@@ -890,7 +960,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetTextColor 255 20 100";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is TextColorBlockItem));
@@ -911,7 +981,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetFontSize 27" + Environment.NewLine;
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is FontSizeBlockItem));
@@ -930,7 +1000,7 @@ namespace Filtration.Parser.Tests.Services
                               "    PlayAlertSound 2" + Environment.NewLine;
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is SoundBlockItem));
@@ -948,7 +1018,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetBackgroundColor 255 20 100";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is BackgroundColorBlockItem));
@@ -967,7 +1037,7 @@ namespace Filtration.Parser.Tests.Services
                               "    SetBorderColor 255 20 100";
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is BorderColorBlockItem));
@@ -995,7 +1065,7 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 4));
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is RarityBlockItem));
@@ -1022,7 +1092,7 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 4));
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is ActionBlockItem));
@@ -1057,7 +1127,7 @@ namespace Filtration.Parser.Tests.Services
             _testUtility.TestBlock.BlockItems.Add(new WidthBlockItem(FilterPredicateOperator.Equal, 4));
 
             // Act
-            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null);
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
 
             // Assert
             Assert.AreEqual(1, result.BlockItems.Count(b => b is ActionBlockItem));
@@ -1105,6 +1175,22 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(expectedResult, result);
         }
 
+        [Test]
+        public void TranslateItemFilterBlockToString_HasActionBlockComment_ReturnsCorrectString()
+        {
+            // Arrange
+            var testInputActionBlockComment = "this is a test";
+            var expectedResult = $"Show #{testInputActionBlockComment}";
+
+            _testUtility.TestBlock.BlockItems.OfType<ActionBlockItem>().First().Comment = testInputActionBlockComment;
+
+            // Act
+            var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
+
+            // Assert
+            Assert.AreEqual(expectedResult, result);
+        }
+
         [Test]
         public void TranslateItemFilterBlockToString_FilterTypeHide_ReturnsCorrectString()
         {
@@ -1581,22 +1667,6 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(expectedResult, result);
         }
 
-        [Test]
-        public void TranslateItemFilterBlockToString_Section_ReturnsCorrectString()
-        {
-            // Arrange
-            const string testInputSectionText = "Ermagerd it's a section!";
-            var expectedResult = "# Section: " + testInputSectionText;
-
-            _testUtility.TestBlock = new ItemFilterSection { Description = testInputSectionText };
-
-            // Act
-            var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
-
-            // Assert
-            Assert.AreEqual(expectedResult, result);
-        }
-
         [Test]
         public void TranslateItemFilterBlockToString_DisabledBlock_ReturnsCorrectString()
         {
@@ -1893,6 +1963,7 @@ namespace Filtration.Parser.Tests.Services
             // Assert
             
         }
+        
         private class ItemFilterBlockTranslatorTestUtility
         {
             public ItemFilterBlockTranslatorTestUtility()
@@ -1902,6 +1973,7 @@ namespace Filtration.Parser.Tests.Services
 
                 // Mock setups
                 MockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
+                MockItemFilterScript = Mock.Of<IItemFilterScript>(i => i.ItemFilterScriptSettings.ThemeComponentCollection == new ThemeComponentCollection());
 
                 // Class under test instantiation
                 Translator = new ItemFilterBlockTranslator(MockBlockGroupHierarchyBuilder.Object);
@@ -1910,6 +1982,8 @@ namespace Filtration.Parser.Tests.Services
             public ItemFilterBlock TestBlock { get; set; }
             public Mock<IBlockGroupHierarchyBuilder> MockBlockGroupHierarchyBuilder { get; }
             public ItemFilterBlockTranslator Translator { get; }
+
+            public IItemFilterScript MockItemFilterScript { get; }
         }
     }
 }
diff --git a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
index bec3bd6..32ac065 100644
--- a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
+++ b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs
@@ -1,14 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.Factories;
 using Filtration.ObjectModel.ThemeEditor;
 using Filtration.Parser.Interface.Services;
 using Filtration.Parser.Services;
 using Filtration.Parser.Tests.Properties;
 using Filtration.Properties;
+using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 
@@ -17,12 +20,9 @@ namespace Filtration.Parser.Tests.Services
     [TestFixture]
     public class TestItemFilterScriptTranslator
     {
-        private ItemFilterScriptTranslatorTestUtility _testUtility;
-
         [SetUp]
         public void ItemFilterScriptTranslatorTestSetup()
         {
-            _testUtility = new ItemFilterScriptTranslatorTestUtility();
             Settings.Default.Reset();
         }
 
@@ -31,15 +31,16 @@ namespace Filtration.Parser.Tests.Services
         {
             // Arrange
             var testInput = Resources.testscript;
-
-            _testUtility.MockItemFilterBlockTranslator.Setup(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>(), It.IsAny<ThemeComponentCollection>())).Verifiable();
+            
+            var mockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: mockItemFilterBlockTranslator.Object);
 
             // Act
-            var script = _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+            var script = translator.TranslateStringToItemFilterScript(testInput);
 
             // Assert
             Assert.AreEqual(5, script.ItemFilterBlocks.Count);
-            _testUtility.MockItemFilterBlockTranslator.Verify();
+            mockItemFilterBlockTranslator.Verify(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>(), It.IsAny<IItemFilterScript>(), false));
         }
 
         [Test]
@@ -54,11 +55,10 @@ namespace Filtration.Parser.Tests.Services
                                         Environment.NewLine +
                                         "End Script Description";
 
-            var mockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
-            mockItemFilterBlockTranslator.Setup(t => t.TranslateStringToItemFilterBlock(It.IsAny<string>(), It.IsAny<ThemeComponentCollection>())).Verifiable();
+            var translator = CreateItemFilterScriptTranslator();
 
             // Act
-            var script = _testUtility.ScriptTranslator.TranslateStringToItemFilterScript(testInput);
+            var script = translator.TranslateStringToItemFilterScript(testInput);
 
             // Assert
             Assert.AreEqual(expectedDescription, script.Description);
@@ -70,8 +70,8 @@ namespace Filtration.Parser.Tests.Services
             // Arrange
             var testInput = Resources.ThioleItemFilter;
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator, _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             translator.TranslateStringToItemFilterScript(testInput);
@@ -80,6 +80,36 @@ namespace Filtration.Parser.Tests.Services
             // Not crashing out when loading a huge script means this integration test has passed!
         }
 
+        [Test]
+        public void TranslateStringToItemFilterScript_Blah()
+        {
+            // Arrange
+            var testInput = Resources.testscript2;
+
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
+
+            // Act
+            var result = translator.TranslateStringToItemFilterScript(testInput);
+
+            // Assert
+            var expectedResult = Mock.Of<IItemFilterScript>(s => s.ItemFilterBlocks == new ObservableCollection<IItemFilterBlockBase>
+            {
+                Mock.Of<IItemFilterBlock>(c => c.Description == "Blockdescription"),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == " commentymccommentface"),
+                Mock.Of<IItemFilterBlock>(),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "commment\r\nmorecomment\r\nblah"),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "anothercomment"),
+                Mock.Of<IItemFilterCommentBlock>(c => c.Comment == "notpartofblockdescription    "),
+                Mock.Of<IItemFilterBlock>(c => c.Description == "blockdescription2")
+            } && s.ItemFilterBlockGroups == new ObservableCollection<ItemFilterBlockGroup> { new ItemFilterBlockGroup("Root", null, false) }
+            && s.ThemeComponents == new ThemeComponentCollection() 
+            && s.ItemFilterScriptSettings == new ItemFilterScriptSettings(new ThemeComponentCollection())
+            && s.Description == "Script description\r\nScript description\r\nScript description\r\nScript description");
+
+            result.ShouldBeEquivalentTo(expectedResult);
+        }
+
         [Test]
         public void TranslateItemFilterScriptToString_OneBlock_CallsTranslator()
         {
@@ -92,15 +122,20 @@ namespace Filtration.Parser.Tests.Services
             const string blockOutput = "Test Script Output";
 
             testScript.ItemFilterBlocks.Add(testBlock);
+            
+            var mockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
+            mockItemFilterBlockTranslator
+                .Setup(t => t.TranslateItemFilterBlockToString(testBlock))
+                .Returns(blockOutput)
+                .Verifiable();
 
-            _testUtility.MockItemFilterBlockTranslator.Setup(t => t.TranslateItemFilterBlockToString(testBlock)).Returns(blockOutput).Verifiable();
-
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: mockItemFilterBlockTranslator.Object);
 
             // Act
-            _testUtility.ScriptTranslator.TranslateItemFilterScriptToString(testScript);
+            translator.TranslateItemFilterScriptToString(testScript);
 
             // Assert
-            _testUtility.MockItemFilterBlockTranslator.Verify();
+            mockItemFilterBlockTranslator.Verify();
         }
 
         [Test]
@@ -129,9 +164,8 @@ namespace Filtration.Parser.Tests.Services
                                  "    Width = 3" + Environment.NewLine +
                                  "    SetFontSize 7" + Environment.NewLine;
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateItemFilterScriptToString(script);
@@ -174,9 +208,8 @@ namespace Filtration.Parser.Tests.Services
                                  "    Width = 3" + Environment.NewLine +
                                  "    SetFontSize 7" + Environment.NewLine + Environment.NewLine;
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateItemFilterScriptToString(script);
@@ -198,40 +231,15 @@ namespace Filtration.Parser.Tests.Services
                                  Environment.NewLine +
                                  "# Test script description" + Environment.NewLine + Environment.NewLine;
 
+            var translator = CreateItemFilterScriptTranslator();
+
             // Act
-            var result = _testUtility.ScriptTranslator.TranslateItemFilterScriptToString(script);
+            var result = translator.TranslateItemFilterScriptToString(script);
 
             // Assert
             Assert.AreEqual(expectedOutput, result);
         }
 
-        [Test]
-        public void TranslateStringToItemFilterScript_SectionDirectlyBeforeBlockWithoutDescription_ReturnsCorrectObject()
-        {
-            // Arrange
-            var testInputScript = "# My Script" + Environment.NewLine +
-                                  Environment.NewLine +
-                                  "# Section: Chance Bases" + Environment.NewLine +
-                                  "Show" + Environment.NewLine +
-                                  "    BaseType \"Lapis Amulet\" \"Amber Amulet\"" + Environment.NewLine +
-                                  "    SetBorderColor 255 0 255" + Environment.NewLine +
-                                  "    SetFontSize 25";
-
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
-
-            // Act
-            var result = translator.TranslateStringToItemFilterScript(testInputScript);
-
-            // Assert
-            Assert.AreEqual(2, result.ItemFilterBlocks.Count);
-            var block = result.ItemFilterBlocks.First(l => l.GetType() != typeof(ItemFilterSection));
-            Assert.AreEqual(4, block.BlockItems.Count);
-            var baseTypeItem = block.BlockItems.OfType<BaseTypeBlockItem>().First();
-            Assert.AreEqual(2, baseTypeItem.Items.Count);
-        }
-
         [Test]
         public void TranslateStringToItemFilterScript_OneLineDescriptionNoBlockDescriptionAddsDescriptionToScript()
         {
@@ -240,16 +248,15 @@ namespace Filtration.Parser.Tests.Services
                                   Environment.NewLine +
                                   "Show" + Environment.NewLine +
                                   "BaseType \"Maelström Staff\"" + Environment.NewLine + Environment.NewLine;
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateStringToItemFilterScript(testInputScript);
 
             // Assert
             Assert.AreEqual("Script edited with Filtration - https://github.com/ben-wallis/Filtration", result.Description);
-            var firstBlock = result.ItemFilterBlocks.First();
+            var firstBlock = result.ItemFilterBlocks.OfType<ItemFilterBlock>().First();
             Assert.IsNull(firstBlock.Description);
         }
 
@@ -274,9 +281,8 @@ namespace Filtration.Parser.Tests.Services
                                   "    SetTextColor 255 255 0";
 
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateStringToItemFilterScript(testInputScript);
@@ -306,9 +312,8 @@ namespace Filtration.Parser.Tests.Services
                                   "    SetTextColor 255 255 0";
 
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateStringToItemFilterScript(testInputScript);
@@ -316,9 +321,9 @@ namespace Filtration.Parser.Tests.Services
             // Assert
             Assert.AreEqual(3, result.ItemFilterBlocks.Count);
 
-            var firstBlock = result.ItemFilterBlocks.First();
-            var secondBlock = result.ItemFilterBlocks.Skip(1).First();
-            var thirdBlock = result.ItemFilterBlocks.Skip(2).First();
+            var firstBlock = result.ItemFilterBlocks.OfType<ItemFilterBlock>().First();
+            var secondBlock = result.ItemFilterBlocks.OfType<ItemFilterBlock>().Skip(1).First();
+            var thirdBlock = result.ItemFilterBlocks.OfType<ItemFilterBlock>().Skip(2).First();
 
             Assert.AreEqual(3, firstBlock.BlockItems.Count);
             Assert.AreEqual(5, secondBlock.BlockItems.Count);
@@ -340,19 +345,20 @@ namespace Filtration.Parser.Tests.Services
                                   "#Disabled Block End";
 
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(Mock.Of<IBlockGroupHierarchyBuilder>());
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateStringToItemFilterScript(testInputScript);
 
             // Assert
             Assert.AreEqual(2, result.ItemFilterBlocks.Count);
-            var secondBlock = result.ItemFilterBlocks.Skip(1).First();
+            var secondBlock = result.ItemFilterBlocks.OfType<ItemFilterBlock>().Skip(1).First();
             Assert.AreEqual("This is a disabled block", secondBlock.Description);
         }
 
+        // TODO: Reinstate this test
+        [Ignore("Ignored until toggling block group parsing can be controlled from the filter script input")]
         [Test]
         public void TranslateStringToItemFilterScript_DisabledBlockWithBlockGroup_ReturnsCorrectBlock()
         {
@@ -368,39 +374,37 @@ namespace Filtration.Parser.Tests.Services
                                   "#Disabled Block End";
 
 
-            var blockTranslator = new ItemFilterBlockTranslator(_testUtility.MockBlockGroupHierarchyBuilder.Object);
-            _testUtility.MockBlockGroupHierarchyBuilder.Setup(
-                b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()))
+            var mockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
+            mockBlockGroupHierarchyBuilder.Setup(
+                    b => b.IntegrateStringListIntoBlockGroupHierarchy(It.IsAny<IEnumerable<string>>()))
                 .Returns(new ItemFilterBlockGroup("My Block Group", null));
 
-            var translator = new ItemFilterScriptTranslator(blockTranslator,
-                _testUtility.MockBlockGroupHierarchyBuilder.Object);
+            var blockTranslator = new ItemFilterBlockTranslator(mockBlockGroupHierarchyBuilder.Object);
+            
+            var translator = CreateItemFilterScriptTranslator(itemFilterBlockTranslator: blockTranslator);
 
             // Act
             var result = translator.TranslateStringToItemFilterScript(testInputScript);
 
             // Assert
             Assert.AreEqual(2, result.ItemFilterBlocks.Count);
-            var secondBlock = result.ItemFilterBlocks.Skip(1).First();
+            var secondBlock = result.ItemFilterBlocks.OfType<ItemFilterBlock>().Skip(1).First();
             Assert.AreEqual("This is a disabled block", secondBlock.Description);
             Assert.AreEqual("My Block Group", secondBlock.BlockGroup.GroupName);
         }
 
-        private class ItemFilterScriptTranslatorTestUtility
+        private ItemFilterScriptTranslator CreateItemFilterScriptTranslator(IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder = null,
+                                                                            IItemFilterBlockTranslator itemFilterBlockTranslator = null,
+                                                                            IItemFilterScriptFactory itemFilterScriptFactory = null)
         {
-            public ItemFilterScriptTranslatorTestUtility()
-            {
-                // Mock setups
-                MockItemFilterBlockTranslator = new Mock<IItemFilterBlockTranslator>();
-                MockBlockGroupHierarchyBuilder = new Mock<IBlockGroupHierarchyBuilder>();
+            var mockItemFilterScriptFactory = new Mock<IItemFilterScriptFactory>();
+            mockItemFilterScriptFactory
+                .Setup(i => i.Create())
+                .Returns(new ItemFilterScript());
 
-                // Class under test instantiation
-                ScriptTranslator = new ItemFilterScriptTranslator(MockItemFilterBlockTranslator.Object, MockBlockGroupHierarchyBuilder.Object);
-            }
-
-            public ItemFilterScriptTranslator ScriptTranslator { get; }
-            public Mock<IItemFilterBlockTranslator> MockItemFilterBlockTranslator { get; }
-            public Mock<IBlockGroupHierarchyBuilder> MockBlockGroupHierarchyBuilder { get; }
+            return new ItemFilterScriptTranslator(blockGroupHierarchyBuilder ?? new Mock<IBlockGroupHierarchyBuilder>().Object,
+                                                  itemFilterBlockTranslator ?? new Mock<IItemFilterBlockTranslator>().Object,
+                                                  itemFilterScriptFactory ?? mockItemFilterScriptFactory.Object);
         }
     }
 }
diff --git a/Filtration.Parser.Tests/packages.config b/Filtration.Parser.Tests/packages.config
index ded3f06..59fe830 100644
--- a/Filtration.Parser.Tests/packages.config
+++ b/Filtration.Parser.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.13.1" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="4.19.2" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.Parser/Filtration.Parser.csproj b/Filtration.Parser/Filtration.Parser.csproj
index c8291d2..2a8d160 100644
--- a/Filtration.Parser/Filtration.Parser.csproj
+++ b/Filtration.Parser/Filtration.Parser.csproj
@@ -35,9 +35,8 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
index e40b224..fba4077 100644
--- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
+++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
@@ -29,64 +29,70 @@ namespace Filtration.Parser.Services
             _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
         }
 
+        // Converts a string into an ItemFilterCommentBlock maintaining newlines and spaces but removing # characters
+        public IItemFilterCommentBlock TranslateStringToItemFilterCommentBlock(string inputString, IItemFilterScript parentItemFilterScript)
+        {
+            var itemFilterCommentBlock = new ItemFilterCommentBlock(parentItemFilterScript);
+
+            foreach (var line in new LineReader(() => new StringReader(inputString)))
+            {
+                var trimmedLine = line.TrimStart(' ').TrimStart('#');
+                itemFilterCommentBlock.Comment += trimmedLine + Environment.NewLine;
+            }
+
+            itemFilterCommentBlock.Comment = itemFilterCommentBlock.Comment.TrimEnd('\r', '\n');
+
+            return itemFilterCommentBlock;
+        }
+
         // This method converts a string into a ItemFilterBlock. This is used for pasting ItemFilterBlocks 
         // and reading ItemFilterScripts from a file.
-        public IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, ThemeComponentCollection masterComponentCollection)
+        public IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, IItemFilterScript parentItemFilterScript, bool initialiseBlockGroupHierarchyBuilder = false)
         {
-            _masterComponentCollection = masterComponentCollection;
-            var block = new ItemFilterBlock();
+            if (initialiseBlockGroupHierarchyBuilder)
+            {
+                _blockGroupHierarchyBuilder.Initialise(parentItemFilterScript.ItemFilterBlockGroups.First());
+            }
+
+            _masterComponentCollection = parentItemFilterScript.ItemFilterScriptSettings.ThemeComponentCollection;
+            var block = new ItemFilterBlock(parentItemFilterScript);
             var showHideFound = false;
 
             foreach (var line in new LineReader(() => new StringReader(inputString)))
             {
-
-                if (line.StartsWith(@"# Section:"))
-                {
-                    var section = new ItemFilterSection
-                    {
-                        Description = line.Substring(line.IndexOf(":", StringComparison.Ordinal) + 1).Trim()
-                    };
-                    return section;
-                }
-
                 if (line.StartsWith(@"#") && !showHideFound)
                 {
                     block.Description = line.TrimStart('#').TrimStart(' ');
                     continue;
                 }
 
-                var adjustedLine = line.Replace("#", " # ");
-                var trimmedLine = adjustedLine.TrimStart(' ').TrimEnd(' ');
-
+                var trimmedLine = line.Trim();
                 var spaceOrEndOfLinePos = trimmedLine.IndexOf(" ", StringComparison.Ordinal) > 0 ? trimmedLine.IndexOf(" ", StringComparison.Ordinal) : trimmedLine.Length;
 
                 var lineOption = trimmedLine.Substring(0, spaceOrEndOfLinePos);
                 switch (lineOption)
                 {
                     case "Show":
-                        showHideFound = true;
-                        block.Action = BlockAction.Show;
-                        block.Enabled = true;
-                        AddBlockGroupToBlock(block, trimmedLine);
-                        break;
                     case "Hide":
-                        showHideFound = true;
-                        block.Action = BlockAction.Hide;
-                        block.Enabled = true;
-                        AddBlockGroupToBlock(block, trimmedLine);
-                        break;
                     case "ShowDisabled":
-                        showHideFound = true;
-                        block.Action = BlockAction.Show;
-                        block.Enabled = false;
-                        AddBlockGroupToBlock(block, trimmedLine);
-                        break;
                     case "HideDisabled":
+                    {
                         showHideFound = true;
-                        block.Action = BlockAction.Hide;
-                        block.Enabled = false;
-                        AddBlockGroupToBlock(block, trimmedLine);
+                        block.Action = lineOption.StartsWith("Show") ? BlockAction.Show : BlockAction.Hide;
+                        block.Enabled = !lineOption.EndsWith("Disabled");
+
+                        // If block groups are enabled for this script, the comment after Show/Hide is parsed as a block
+                        // group hierarchy, if block groups are disabled it is preserved as a simple text comment.
+                        if (parentItemFilterScript.ItemFilterScriptSettings.BlockGroupsEnabled)
+                        {
+                            AddBlockGroupToBlock(block, trimmedLine);
+                        }
+                        else
+                        {
+                            block.ActionBlockItem.Comment = GetTextAfterFirstComment(trimmedLine);
+                        }
                         break;
+                    }
                     case "ItemLevel":
                     {
                         AddNumericFilterPredicateItemToBlockItems<ItemLevelBlockItem>(block, trimmedLine);
@@ -417,11 +423,11 @@ namespace Filtration.Parser.Services
         
         private void AddBlockGroupToBlock(IItemFilterBlock block, string inputString)
         {
-            var blockGroupStart = inputString.IndexOf("#", StringComparison.Ordinal);
-            if (blockGroupStart <= 0) return;
+            var blockGroupText = GetTextAfterFirstComment(inputString);
+            var blockGroups = blockGroupText.Split(new[] { " - " }, StringSplitOptions.RemoveEmptyEntries)
+                                            .Select(s => s.Trim())
+                                            .ToList();
 
-            var blockGroupText = inputString.Substring(blockGroupStart + 1);
-            var blockGroups = blockGroupText.Split('-').ToList();
             if (blockGroups.Count(b => !string.IsNullOrEmpty(b.Trim())) > 0)
             {
                 block.BlockGroup = _blockGroupHierarchyBuilder.IntegrateStringListIntoBlockGroupHierarchy(blockGroups);
@@ -429,6 +435,14 @@ namespace Filtration.Parser.Services
             }
         }
 
+        private static string GetTextAfterFirstComment(string inputString)
+        {
+            var blockGroupStart = inputString.IndexOf("#", StringComparison.Ordinal);
+            if (blockGroupStart <= 0) return string.Empty;
+
+            return inputString.Substring(blockGroupStart + 1);
+        }
+
         private static Color GetColorFromString(string inputString)
         {
             var argbValues = Regex.Matches(inputString, @"\s+(\d+)");
@@ -455,15 +469,31 @@ namespace Filtration.Parser.Services
             return new Color();
         }
 
+        public string TranslateItemFilterBlockBaseToString(IItemFilterBlockBase itemFilterBlockBase)
+        {
+            var itemFilterBlock = itemFilterBlockBase as IItemFilterBlock;
+            if (itemFilterBlock != null) return TranslateItemFilterBlockToString(itemFilterBlock);
+
+            var itemFilterCommentBlock = itemFilterBlockBase as IItemFilterCommentBlock;
+            if (itemFilterCommentBlock != null) return TranslateItemFilterCommentBlockToString(itemFilterCommentBlock);
+
+            throw new InvalidOperationException("Unable to translate unknown ItemFilterBlock type");
+        }
+
+        // TODO: Private
+        public string TranslateItemFilterCommentBlockToString(IItemFilterCommentBlock itemFilterCommentBlock)
+        {
+            // TODO: Handle multi-line
+            // TODO: Tests
+            // TODO: # Section: text?
+            return $"#{itemFilterCommentBlock.Comment}";
+        }
+        
         // This method converts an ItemFilterBlock object into a string. This is used for copying a ItemFilterBlock
         // to the clipboard, and when saving a ItemFilterScript.
+        // TODO: Private
         public string TranslateItemFilterBlockToString(IItemFilterBlock block)
         {
-            if (block.GetType() == typeof (ItemFilterSection))
-            {
-                return "# Section: " + block.Description;
-            }
-
             var outputString = string.Empty;
 
             if (!block.Enabled)
@@ -482,6 +512,10 @@ namespace Filtration.Parser.Services
             {
                 outputString += " # " + block.BlockGroup;
             }
+            else if (!string.IsNullOrEmpty(block.ActionBlockItem?.Comment))
+            {
+                outputString += " #" + block.ActionBlockItem.Comment;
+            }
 
             // ReSharper disable once LoopCanBeConvertedToQuery
             foreach (var blockItem in block.BlockItems.Where(b => b.GetType() != typeof(ActionBlockItem)).OrderBy(b => b.SortOrder))
diff --git a/Filtration.Parser/Services/ItemFilterScriptTranslator.cs b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs
index 03dccde..2c7d8b9 100644
--- a/Filtration.Parser/Services/ItemFilterScriptTranslator.cs
+++ b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs
@@ -2,27 +2,53 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Filtration.Common.Utilities;
 using Filtration.ObjectModel;
+using Filtration.ObjectModel.Factories;
 using Filtration.Parser.Interface.Services;
 using Filtration.Properties;
 
 namespace Filtration.Parser.Services
 {
+
+    internal class ItemFilterBlockBoundary
+    {
+        public ItemFilterBlockBoundary(int startLine, ItemFilterBlockBoundaryType itemFilterBlockBoundaryType)
+        {
+            StartLine = startLine;
+            BoundaryType = itemFilterBlockBoundaryType;
+        }
+
+        public int StartLine { get; set; }
+        public ItemFilterBlockBoundaryType BoundaryType { get; set; }
+
+    }
+
+    internal enum ItemFilterBlockBoundaryType
+    {
+        ScriptDescription,
+        ItemFilterBlock,
+        CommentBlock
+    }
+
     internal class ItemFilterScriptTranslator : IItemFilterScriptTranslator
     {
         private readonly IItemFilterBlockTranslator _blockTranslator;
+        private readonly IItemFilterScriptFactory _itemFilterScriptFactory;
         private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder;
 
-        public ItemFilterScriptTranslator(IItemFilterBlockTranslator blockTranslator,
-                                          IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder)
+        public ItemFilterScriptTranslator(IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder,
+                                          IItemFilterBlockTranslator blockTranslator,
+                                          IItemFilterScriptFactory itemFilterScriptFactory)
         {
-            _blockTranslator = blockTranslator;
             _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
+            _blockTranslator = blockTranslator;
+            _itemFilterScriptFactory = itemFilterScriptFactory;
         }
 
-        public string PreprocessDisabledBlocks(string inputString)
+        public static string PreprocessDisabledBlocks(string inputString)
         {
             bool inDisabledBlock = false;
             var showHideFound = false;
@@ -82,9 +108,9 @@ namespace Filtration.Parser.Services
             return lines.Aggregate((c, n) => c + Environment.NewLine + n);
         }
 
-        public ItemFilterScript TranslateStringToItemFilterScript(string inputString)
+        public IItemFilterScript TranslateStringToItemFilterScript(string inputString)
         {
-            var script = new ItemFilterScript();
+            var script = _itemFilterScriptFactory.Create();
             _blockGroupHierarchyBuilder.Initialise(script.ItemFilterBlockGroups.First());
 
             inputString = inputString.Replace("\t", "");
@@ -98,12 +124,12 @@ namespace Filtration.Parser.Services
             var lines = Regex.Split(inputString, "\r\n|\r|\n");
 
             // Process the script header
-            for (var i = 0; i < conditionBoundaries.First.Value; i++)
+            for (var i = 0; i < conditionBoundaries.Skip(1).First().StartLine; i++)
             {
                 if (lines[i].StartsWith("#"))
                 {
                     script.Description += lines[i].Substring(1).Trim(' ') + Environment.NewLine;
-                }    
+                }
             }
 
             if (!string.IsNullOrEmpty(script.Description))
@@ -115,47 +141,94 @@ namespace Filtration.Parser.Services
             // and add that object to the ItemFilterBlocks list 
             for (var boundary = conditionBoundaries.First; boundary != null; boundary = boundary.Next)
             {
-                var begin = boundary.Value;
-                var end = boundary.Next?.Value ?? lines.Length;
+                if (boundary.Value.BoundaryType == ItemFilterBlockBoundaryType.ScriptDescription)
+                {
+                    continue;
+                }
+
+                var begin = boundary.Value.StartLine;
+                var end = boundary.Next?.Value.StartLine ?? lines.Length;
                 var block = new string[end - begin];
                 Array.Copy(lines, begin, block, 0, end - begin);
                 var blockString = string.Join("\r\n", block);
-                script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterBlock(blockString, script.ThemeComponents));
+
+                if (boundary.Value.BoundaryType == ItemFilterBlockBoundaryType.ItemFilterBlock)
+                {
+                    script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterBlock(blockString, script));
+                }
+                else
+                {
+                    script.ItemFilterBlocks.Add(_blockTranslator.TranslateStringToItemFilterCommentBlock(blockString, script));
+                }
             }
 
             _blockGroupHierarchyBuilder.Cleanup();
             return script;
         }
-
-        private static LinkedList<int> IdentifyBlockBoundaries(string inputString)
+        
+        private static LinkedList<ItemFilterBlockBoundary> IdentifyBlockBoundaries(string inputString)
         {
-            var blockBoundaries = new LinkedList<int>();
+            var blockBoundaries = new LinkedList<ItemFilterBlockBoundary>();
             var previousLine = string.Empty;
-            var currentLine = 0;
+            var currentLine = -1;
+            
+            var currentItemFilterBlockBoundary = new ItemFilterBlockBoundary(0, ItemFilterBlockBoundaryType.ScriptDescription);
 
             foreach (var line in new LineReader(() => new StringReader(inputString)))
             {
                 currentLine++;
-                var trimmedLine = line.TrimStart(' ').TrimEnd(' ');
-                if (trimmedLine.StartsWith("Show") || trimmedLine.StartsWith("Hide") ||
-                    trimmedLine.StartsWith("# Section:"))
+                var trimmedLine = line.Trim(' ');
+                
+                if (string.IsNullOrWhiteSpace(trimmedLine))
+                {
+                    previousLine = line;
+                    continue;
+                }
+
+                // A line starting with a comment when we're inside a ItemFilterBlock boundary represents the end of that block 
+                // as ItemFilterBlocks cannot have comment lines after the block description
+                if (trimmedLine.StartsWith("#") && currentItemFilterBlockBoundary.BoundaryType == ItemFilterBlockBoundaryType.ItemFilterBlock)
+                {
+                    blockBoundaries.AddLast(currentItemFilterBlockBoundary);
+                    currentItemFilterBlockBoundary = new ItemFilterBlockBoundary(currentLine, ItemFilterBlockBoundaryType.CommentBlock);
+                }
+                // A line starting with a comment where the previous line was null represents the start of a new comment (unless we're on the first
+                // line in which case it's not a new comment).
+                else if (trimmedLine.StartsWith("#") && string.IsNullOrWhiteSpace(previousLine) && currentItemFilterBlockBoundary.BoundaryType != ItemFilterBlockBoundaryType.ScriptDescription)
+                {
+                    if (blockBoundaries.Count > 0)
+                    {
+                        blockBoundaries.AddLast(currentItemFilterBlockBoundary);
+                    }
+                    currentItemFilterBlockBoundary = new ItemFilterBlockBoundary(currentLine, ItemFilterBlockBoundaryType.CommentBlock);
+                }
+
+                else if (trimmedLine.StartsWith("Show") || trimmedLine.StartsWith("Hide"))
                 {
                     // If the line previous to the Show or Hide line is a comment then we should include that in the block
                     // as it represents the block description.
                     // currentLine > 2 caters for an edge case where the script description is a single line and the first
                     // block has no description. This prevents the script description from being assigned to the first block's description.
-                    blockBoundaries.AddLast(previousLine.StartsWith("#") && !previousLine.StartsWith("# Section:") &&
-                                            currentLine > 2
-                        ? currentLine - 2
-                        : currentLine - 1);
+                    if (!(currentItemFilterBlockBoundary.StartLine == currentLine - 1 && currentItemFilterBlockBoundary.BoundaryType == ItemFilterBlockBoundaryType.CommentBlock))
+                    {
+                        blockBoundaries.AddLast(currentItemFilterBlockBoundary);
+                    }
+                    currentItemFilterBlockBoundary = new ItemFilterBlockBoundary(previousLine.StartsWith("#") && currentLine > 2 ? currentLine - 1 : currentLine,
+                        ItemFilterBlockBoundaryType.ItemFilterBlock);
                 }
+
                 previousLine = line;
             }
 
+            if (blockBoundaries.Last.Value != currentItemFilterBlockBoundary)
+            {
+                blockBoundaries.AddLast(currentItemFilterBlockBoundary);
+            }
+
             return blockBoundaries;
         }
 
-        public string TranslateItemFilterScriptToString(ItemFilterScript script)
+        public string TranslateItemFilterScriptToString(IItemFilterScript script)
         {
             var outputString = string.Empty;
 
@@ -178,7 +251,7 @@ namespace Filtration.Parser.Services
             // ReSharper disable once LoopCanBeConvertedToQuery
             foreach (var block in script.ItemFilterBlocks)
             {
-                outputString += _blockTranslator.TranslateItemFilterBlockToString(block) + Environment.NewLine;
+                outputString += _blockTranslator.TranslateItemFilterBlockToString(block as ItemFilterBlock) + Environment.NewLine;
 
                 if (Settings.Default.ExtraLineBetweenBlocks)
                 {
diff --git a/Filtration.Parser/packages.config b/Filtration.Parser/packages.config
index fce0733..89d6418 100644
--- a/Filtration.Parser/packages.config
+++ b/Filtration.Parser/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net461" />
+  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.Tests/Filtration.Tests.csproj b/Filtration.Tests/Filtration.Tests.csproj
index 0e6db22..4d15320 100644
--- a/Filtration.Tests/Filtration.Tests.csproj
+++ b/Filtration.Tests/Filtration.Tests.csproj
@@ -35,21 +35,17 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
diff --git a/Filtration.Tests/Repositories/TestItemFilterScriptRepository.cs b/Filtration.Tests/Repositories/TestItemFilterScriptRepository.cs
index 5563451..12a911e 100644
--- a/Filtration.Tests/Repositories/TestItemFilterScriptRepository.cs
+++ b/Filtration.Tests/Repositories/TestItemFilterScriptRepository.cs
@@ -2,9 +2,11 @@
 using System.IO;
 using System.Threading.Tasks;
 using Filtration.ObjectModel;
+using Filtration.ObjectModel.Factories;
 using Filtration.Repositories;
 using Filtration.Services;
 using Filtration.ViewModels;
+using Filtration.ViewModels.Factories;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -29,7 +31,8 @@ namespace Filtration.Tests.Repositories
             var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
             mockItemFilterScriptViewModelFactory.Setup(f => f.Create()).Returns(mockItemFilterScriptViewModel.Object);
 
-            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+            var repository = CreateItemFilterScriptRepository(itemFilterPersistenceService: mockPersistenceService.Object,
+                                                              itemFilterScriptViewModelFactory: mockItemFilterScriptViewModelFactory.Object);
 
             // Act
             var result = await repository.LoadScriptFromFileAsync(testInputPath);
@@ -50,7 +53,8 @@ namespace Filtration.Tests.Repositories
 
             var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
 
-            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+            var repository = CreateItemFilterScriptRepository(itemFilterPersistenceService: mockPersistenceService.Object,
+                                                              itemFilterScriptViewModelFactory: mockItemFilterScriptViewModelFactory.Object);
 
             // Act
             Func<Task<IItemFilterScriptViewModel>> result = async () => await repository.LoadScriptFromFileAsync(testInputPath);
@@ -70,7 +74,8 @@ namespace Filtration.Tests.Repositories
 
             var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
 
-            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+            var repository = CreateItemFilterScriptRepository(itemFilterPersistenceService: mockPersistenceService.Object,
+                                                              itemFilterScriptViewModelFactory: mockItemFilterScriptViewModelFactory.Object);
 
             // Act
             repository.SetItemFilterScriptDirectory(testInputPath);
@@ -90,7 +95,8 @@ namespace Filtration.Tests.Repositories
 
             var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
 
-            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
+            var repository = CreateItemFilterScriptRepository(itemFilterPersistenceService: mockPersistenceService.Object,
+                                                              itemFilterScriptViewModelFactory: mockItemFilterScriptViewModelFactory.Object);
 
             // Act
             string result =  repository.GetItemFilterScriptDirectory();
@@ -111,13 +117,23 @@ namespace Filtration.Tests.Repositories
             var mockItemFilterScriptViewModelFactory = new Mock<IItemFilterScriptViewModelFactory>();
             mockItemFilterScriptViewModelFactory.Setup(f => f.Create()).Returns(mockItemFilterScriptViewModel.Object);
 
-            var repository = new ItemFilterScriptRepository(mockPersistenceService.Object, mockItemFilterScriptViewModelFactory.Object);
-            
+            var repository = CreateItemFilterScriptRepository(itemFilterPersistenceService: mockPersistenceService.Object,
+                                                              itemFilterScriptViewModelFactory: mockItemFilterScriptViewModelFactory.Object);
+
             // Act
             IItemFilterScriptViewModel result = repository.NewScript();
 
             // Assert
             Assert.AreEqual(mockItemFilterScriptViewModel.Object, result);
         }
+
+        private ItemFilterScriptRepository CreateItemFilterScriptRepository(IItemFilterPersistenceService itemFilterPersistenceService = null,
+                                                                            IItemFilterScriptFactory itemFilterScriptFactory = null,
+                                                                            IItemFilterScriptViewModelFactory itemFilterScriptViewModelFactory = null)
+        {
+            return new ItemFilterScriptRepository(itemFilterPersistenceService ?? new Mock<IItemFilterPersistenceService>().Object,
+                                                  itemFilterScriptFactory ?? new Mock<IItemFilterScriptFactory>().Object,
+                                                  itemFilterScriptViewModelFactory ?? new Mock<IItemFilterScriptViewModelFactory>().Object);
+        }
     }
 }
diff --git a/Filtration.Tests/app.config b/Filtration.Tests/app.config
index 576244b..15eab9e 100644
--- a/Filtration.Tests/app.config
+++ b/Filtration.Tests/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.2.3" newVersion="2.1.2.3" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.4" newVersion="2.2.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Filtration.Tests/packages.config b/Filtration.Tests/packages.config
index ded3f06..59fe830 100644
--- a/Filtration.Tests/packages.config
+++ b/Filtration.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="FluentAssertions" version="4.13.1" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="FluentAssertions" version="4.19.2" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj b/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
index da3c05f..88b49fc 100644
--- a/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
+++ b/Filtration.ThemeEditor.Tests/Filtration.ThemeEditor.Tests.csproj
@@ -35,13 +35,11 @@
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
diff --git a/Filtration.ThemeEditor.Tests/packages.config b/Filtration.ThemeEditor.Tests/packages.config
index c5d64ff..4b97194 100644
--- a/Filtration.ThemeEditor.Tests/packages.config
+++ b/Filtration.ThemeEditor.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
-  <package id="Moq" version="4.5.21" targetFramework="net461" />
-  <package id="NUnit" version="3.4.1" targetFramework="net461" />
+  <package id="Moq" version="4.5.30" targetFramework="net461" />
+  <package id="NUnit" version="3.6.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
index 7af0956..0cc1a04 100644
--- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -31,16 +31,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
       <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
@@ -58,8 +57,7 @@
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/Filtration.ThemeEditor/Providers/ThemeProvider.cs b/Filtration.ThemeEditor/Providers/ThemeProvider.cs
index 9cac475..238c392 100644
--- a/Filtration.ThemeEditor/Providers/ThemeProvider.cs
+++ b/Filtration.ThemeEditor/Providers/ThemeProvider.cs
@@ -11,8 +11,8 @@ namespace Filtration.ThemeEditor.Providers
 {
     public interface IThemeProvider
     {
-        IThemeEditorViewModel NewThemeForScript(ItemFilterScript script);
-        IThemeEditorViewModel MasterThemeForScript(ItemFilterScript script);
+        IThemeEditorViewModel NewThemeForScript(IItemFilterScript script);
+        IThemeEditorViewModel MasterThemeForScript(IItemFilterScript script);
         Task<IThemeEditorViewModel> LoadThemeFromFile(string filePath);
         Task<Theme> LoadThemeModelFromFile(string filePath);
         Task SaveThemeAsync(IThemeEditorViewModel themeEditorViewModel, string filePath);
@@ -29,7 +29,7 @@ namespace Filtration.ThemeEditor.Providers
             _themePersistenceService = themePersistenceService;
         }
 
-        public IThemeEditorViewModel NewThemeForScript(ItemFilterScript script)
+        public IThemeEditorViewModel NewThemeForScript(IItemFilterScript script)
         {
             var themeComponentCollection = script.ThemeComponents.Aggregate(new ThemeComponentCollection(),
                 (c, component) =>
@@ -45,7 +45,7 @@ namespace Filtration.ThemeEditor.Providers
             return themeViewModel;
         }
 
-        public IThemeEditorViewModel MasterThemeForScript(ItemFilterScript script)
+        public IThemeEditorViewModel MasterThemeForScript(IItemFilterScript script)
         {
             var themeViewModel = _themeViewModelFactory.Create();
             themeViewModel.InitialiseForMasterTheme(script);
diff --git a/Filtration.ThemeEditor/Services/ThemeService.cs b/Filtration.ThemeEditor/Services/ThemeService.cs
index 95c22b9..6ebaa94 100644
--- a/Filtration.ThemeEditor/Services/ThemeService.cs
+++ b/Filtration.ThemeEditor/Services/ThemeService.cs
@@ -12,7 +12,7 @@ namespace Filtration.ThemeEditor.Services
 {
     public interface IThemeService
     {
-        void ApplyThemeToScript(Theme theme, ItemFilterScript script);
+        void ApplyThemeToScript(Theme theme, IItemFilterScript script);
     }
 
     public class ThemeService : IThemeService
@@ -24,7 +24,7 @@ namespace Filtration.ThemeEditor.Services
             _messageBoxService = messageBoxService;
         }
 
-        public void ApplyThemeToScript(Theme theme, ItemFilterScript script)
+        public void ApplyThemeToScript(Theme theme, IItemFilterScript script)
         {
             var mismatchedComponents = false;
             foreach (var component in theme.Components)
@@ -44,7 +44,7 @@ namespace Filtration.ThemeEditor.Services
                         break;
                 }
 
-                foreach (var block in script.ItemFilterBlocks)
+                foreach (var block in script.ItemFilterBlocks.OfType<ItemFilterBlock>())
                 {
                     foreach (var blockItem in block.BlockItems.Where(i => i.GetType() == targetType))
                     {
diff --git a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
index dfb0490..ab9f796 100644
--- a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
+++ b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
@@ -26,9 +26,9 @@ namespace Filtration.ThemeEditor.ViewModels
         RelayCommand CloseCommand { get; }
 
         void InitialiseForNewTheme(ThemeComponentCollection themeComponentCollection);
-        void InitialiseForMasterTheme(ItemFilterScript script);
+        void InitialiseForMasterTheme(IItemFilterScript script);
         bool IsMasterTheme { get; }
-        ItemFilterScript IsMasterThemeForScript { get; }
+        IItemFilterScript IsMasterThemeForScript { get; }
         string Title { get; }
         string FilePath { get; set; }
         string Filename { get; }
@@ -72,7 +72,7 @@ namespace Filtration.ThemeEditor.ViewModels
 
         public bool IsMasterTheme => Components.IsMasterCollection;
 
-        public ItemFilterScript IsMasterThemeForScript { get; private set; }
+        public IItemFilterScript IsMasterThemeForScript { get; private set; }
 
         public void InitialiseForNewTheme(ThemeComponentCollection themeComponentCollection)
         {
@@ -80,7 +80,7 @@ namespace Filtration.ThemeEditor.ViewModels
             _filenameIsFake = true;
         }
 
-        public void InitialiseForMasterTheme(ItemFilterScript script)
+        public void InitialiseForMasterTheme(IItemFilterScript script)
         {
             Components = script.ThemeComponents;
             IsMasterThemeForScript = script;
diff --git a/Filtration.ThemeEditor/packages.config b/Filtration.ThemeEditor/packages.config
index 5f23e20..c5e8141 100644
--- a/Filtration.ThemeEditor/packages.config
+++ b/Filtration.ThemeEditor/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="4.2.1" targetFramework="net461" />
+  <package id="AutoMapper" version="6.0.2" targetFramework="net461" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
+  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
   <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.3.7" targetFramework="net461" />
+  <package id="NLog" version="4.4.9" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.sln b/Filtration.sln
index 220be32..e7dc0d1 100644
--- a/Filtration.sln
+++ b/Filtration.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration", "Filtration\Filtration.csproj", "{55E0A34C-E039-43D7-A024-A4045401CDDA}"
 EndProject
diff --git a/Filtration.sln.DotSettings b/Filtration.sln.DotSettings
index c7dfe84..c6806ba 100644
--- a/Filtration.sln.DotSettings
+++ b/Filtration.sln.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Filtration_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Filtration_002EObjectModel_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Filtration.ItemFilterPreview.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.ObjectModel.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.ThemeEditor.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Filtration.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Filtration/App.config b/Filtration/App.config
index 9be4e10..ebcbc98 100644
--- a/Filtration/App.config
+++ b/Filtration/App.config
@@ -4,7 +4,7 @@
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="Filtration.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <section name="Filtration.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
@@ -41,7 +41,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.2.3" newVersion="2.1.2.3" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.4" newVersion="2.2.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Filtration/App.xaml b/Filtration/App.xaml
index 3161653..6e05def 100644
--- a/Filtration/App.xaml
+++ b/Filtration/App.xaml
@@ -45,6 +45,9 @@
                     <converters:BooleanToBlockActionInverseConverter x:Key="BooleanToBlockActionInverseConverter" />
                     <converters:AvailableThemeComponentsConverter x:Key="AvailableThemeComponentsConverter" />
                 </ResourceDictionary>
+                <ResourceDictionary>
+                    <RoutedCommand x:Key="OpenScriptRoutedCommand" />
+                </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Filtration/App.xaml.cs b/Filtration/App.xaml.cs
index 19c8f2e..6690e58 100644
--- a/Filtration/App.xaml.cs
+++ b/Filtration/App.xaml.cs
@@ -36,34 +36,18 @@ namespace Filtration
                 .Single();
 
             _container.Kernel.ComponentModelBuilder.RemoveContributor(propInjector);
-            
+
             _container.AddFacility<TypedFactoryFacility>();
             _container.Install(FromAssembly.InThisApplication());
             _container.Install(FromAssembly.Named("Filtration.Parser")); // Not directly referenced so manually call its installers
 
-
-            Mapper.Configuration.ConstructServicesUsing(_container.Resolve);
-
-            Mapper.CreateMap<ItemFilterBlockGroup, ItemFilterBlockGroupViewModel>()
-                .ForMember(destination => destination.ChildGroups, options => options.ResolveUsing(
-                    delegate(ResolutionResult resolutionResult)
-                    {
-                        var context = resolutionResult.Context;
-                        var showAdvanced = (bool) context.Options.Items["showAdvanced"];
-                        var group = (ItemFilterBlockGroup) context.SourceValue;
-                        if (showAdvanced)
-                            return group.ChildGroups;
-                        else
-                            return group.ChildGroups.Where(c => c.Advanced == false);
-                    }))
-                .ForMember(dest => dest.SourceBlockGroup,
-                        opts => opts.MapFrom(from => from))
-                .ForMember(dest => dest.IsExpanded, 
-                        opts => opts.UseValue(false));
-
-            Mapper.CreateMap<Theme, IThemeEditorViewModel>().ConstructUsingServiceLocator();
-            Mapper.CreateMap<ThemeComponent, ThemeComponentViewModel>().ReverseMap();
-            Mapper.CreateMap<IThemeEditorViewModel, Theme>();
+            Mapper.Initialize(cfg =>
+            {
+                cfg.ConstructServicesUsing(_container.Resolve);
+                cfg.CreateMap<Theme, IThemeEditorViewModel>().ConstructUsingServiceLocator();
+                cfg.CreateMap<ThemeComponent, ThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<IThemeEditorViewModel, Theme>();
+            });
 
             Mapper.AssertConfigurationIsValid();
 
@@ -73,7 +57,7 @@ namespace Filtration
             var updateCheckService = _container.Resolve<IUpdateCheckService>();
             updateCheckService.CheckForUpdates();
         }
-        
+
         private static void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
             Logger.Fatal(e.Exception);
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 3e5a43e..73b1f40 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -57,20 +57,18 @@
     <ApplicationIcon>Resources\filtration.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="ControlzEx, Version=2.1.2.3, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.2.1.2.3\lib\net45\ControlzEx.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ControlzEx, Version=2.2.0.4, Culture=neutral, PublicKeyToken=f08b075e934b7045, processorArchitecture=MSIL">
+      <HintPath>..\packages\ControlzEx.2.2.0.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
     <Reference Include="Fluent, Version=4.0.3.394, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
       <HintPath>..\packages\Fluent.Ribbon.4.0.3.394\lib\net45\Fluent.dll</HintPath>
@@ -94,8 +92,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\NLog.4.4.9\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -109,8 +106,7 @@
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.2.1.2.3\lib\net45\System.Windows.Interactivity.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\ControlzEx.2.2.0.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -200,19 +196,23 @@
     <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
       <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Utilities\AutoMapperHelpers.cs" />
-    <Compile Include="Utilities\BlockGroupMapper.cs" />
+		<Compile Include="Utility\RoutedCommandHandler.cs" />
+    <Compile Include="Utility\RoutedCommandHandlers.cs" />
     <Compile Include="ViewModels\AvalonDockWorkspaceViewModel.cs" />
+    <Compile Include="ViewModels\Factories\IItemFilterCommentBlockViewModelFactory.cs" />
+    <Compile Include="ViewModels\Factories\ItemFilterBlockBaseViewModelFactory.cs" />
+    <Compile Include="ViewModels\ItemFilterBlockViewModelBase.cs" />
+    <Compile Include="ViewModels\ItemFilterCommentBlockViewModel.cs" />
     <Compile Include="ViewModels\SettingsPageViewModel.cs" />
     <Compile Include="ViewModels\ToolPanes\BlockGroupBrowserViewModel.cs" />
-    <Compile Include="ViewModels\IItemFilterScriptViewModelFactory.cs" />
-    <Compile Include="ViewModels\IItemFilterBlockViewModelFactory.cs" />
+    <Compile Include="ViewModels\Factories\IItemFilterScriptViewModelFactory.cs" />
+    <Compile Include="ViewModels\Factories\IItemFilterBlockViewModelFactory.cs" />
     <Compile Include="ViewModels\ItemFilterBlockGroupViewModel.cs" />
     <Compile Include="ViewModels\ItemFilterBlockViewModel.cs" />
     <Compile Include="ViewModels\ItemFilterScriptViewModel.cs" />
     <Compile Include="ViewModels\ToolPanes\BlockOutputPreviewViewModel.cs" />
     <Compile Include="ViewModels\ReplaceColorsViewModel.cs" />
-    <Compile Include="ViewModels\ToolPanes\SectionBrowserViewModel.cs" />
+    <Compile Include="ViewModels\ToolPanes\CommentBlockBrowserViewModel.cs" />
     <Compile Include="ViewModels\StartPageViewModel.cs" />
     <Compile Include="ViewModels\ToolPanes\ToolViewModel.cs" />
     <Compile Include="ViewModels\UpdateAvailableViewModel.cs" />
@@ -241,7 +241,6 @@
     <Compile Include="Views\ToolPanes\BlockGroupBrowserView.xaml.cs">
       <DependentUpon>BlockGroupBrowserView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\BlockTemplateSelector.cs" />
     <Compile Include="Views\ItemFilterScriptView.xaml.cs">
       <DependentUpon>ItemFilterScriptView.xaml</DependentUpon>
     </Compile>
@@ -251,8 +250,8 @@
     <Compile Include="UserControls\NumericFilterPredicateControl.xaml.cs">
       <DependentUpon>NumericFilterPredicateControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\ItemFilterSectionView.xaml.cs">
-      <DependentUpon>ItemFilterSectionView.xaml</DependentUpon>
+		<Compile Include="Views\ItemFilterCommentBlockView.xaml.cs">
+      <DependentUpon>ItemFilterCommentBlockView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
@@ -266,9 +265,6 @@
     <Compile Include="Views\ToolPanes\BlockOutputPreviewView.xaml.cs">
       <DependentUpon>BlockOutputPreviewView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\ToolPanes\SectionBrowserView.xaml.cs">
-      <DependentUpon>SectionBrowserView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\StartPageView.xaml.cs">
       <DependentUpon>StartPageView.xaml</DependentUpon>
     </Compile>
@@ -331,7 +327,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\ToolPanes\SectionBrowserView.xaml">
+		<Page Include="Views\ToolPanes\CommentBlockBrowserView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -343,7 +339,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\ItemFilterSectionView.xaml">
+		<Page Include="Views\ItemFilterCommentBlockView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Filtration/NLog.xsd b/Filtration/NLog.xsd
index c489255..c9cbd05 100644
--- a/Filtration/NLog.xsd
+++ b/Filtration/NLog.xsd
@@ -42,12 +42,32 @@
     </xs:attribute>
     <xs:attribute name="throwExceptions" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Pass NLog internal exceptions to the application. Default value is: false.</xs:documentation>
+        <xs:documentation>Throw an exception when there is an internal error. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="throwConfigExceptions" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Throw an exception when there is a configuration error. If not set, determined by throwExceptions.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="keepVariablesOnReload" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Gets or sets a value indicating whether Variables should be kept on configuration reload. Default value is: false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="internalLogToTrace" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Write internal NLog messages to the the System.Diagnostics.Trace. Default value is: false</xs:documentation>
+        <xs:documentation>Write internal NLog messages to the System.Diagnostics.Trace. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogIncludeTimestamp" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Write timestamps for internal NLog messages. Default value is: true.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="useInvariantCulture" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Use InvariantCulture as default culture instead of CurrentCulture.  Default value is: false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
@@ -174,7 +194,7 @@
   <xs:complexType name="NLogInclude">
     <xs:attribute name="file" type="SimpleLayoutAttribute" use="required">
       <xs:annotation>
-        <xs:documentation>Name of the file to be included. The name is relative to the name of the current config file.</xs:documentation>
+        <xs:documentation>Name of the file to be included. You could use * wildcard. The name is relative to the name of the current config file.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="ignoreErrors" type="xs:boolean" use="optional" default="false">
@@ -244,41 +264,17 @@
       <xs:minLength value="1" />
     </xs:restriction>
   </xs:simpleType>
-  <xs:complexType name="AspResponse">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="addComments" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="addComments" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to add &lt;!-- --&gt; comments around all written texts.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:complexType name="AsyncWrapper">
     <xs:complexContent>
       <xs:extension base="WrapperTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="batchSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="fullBatchSizeWriteLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="overflowAction" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction" />
           <xs:element name="queueLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="timeToSleepBetweenBatches" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -290,6 +286,11 @@
             <xs:documentation>Number of log events that should be processed in a batch by the lazy writer thread.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="fullBatchSizeWriteLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Limit of full s to write before yielding into  Performance is better when writing many small batches, than writing a single large batch</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="overflowAction" type="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction">
           <xs:annotation>
             <xs:documentation>Action to be taken when the lazy writer thread request queue count exceeds the set limit.</xs:documentation>
@@ -305,6 +306,11 @@
             <xs:documentation>Time in milliseconds to sleep between batches.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -320,12 +326,30 @@
       <xs:extension base="WrapperTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="asyncFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="asyncFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Delay the flush until the LogEvent has been confirmed as written</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="condition" type="Condition">
+          <xs:annotation>
+            <xs:documentation>Condition expression. Log events who meet this condition will cause a flush on the wrapped target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -337,6 +361,7 @@
           <xs:element name="bufferSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="flushTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="slidingTimeout" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -358,6 +383,11 @@
             <xs:documentation>Indicates whether to use sliding timeout.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -368,23 +398,26 @@
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
           <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -401,6 +434,11 @@
             <xs:documentation>Instance of  that is used to format log messages.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxMessageSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Maximum message size in bytes.</xs:documentation>
@@ -421,6 +459,11 @@
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="keepConnection" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
@@ -431,11 +474,6 @@
             <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="maxConnections" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="address" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Network address.</xs:documentation>
@@ -446,19 +484,24 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="ndcItemSeparator" type="xs:string">
+        <xs:attribute name="includeNLogData" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>NDC item separator.</xs:documentation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeMdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
@@ -471,16 +514,21 @@
             <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
+        <xs:attribute name="ndcItemSeparator" type="xs:string">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
+            <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
+        <xs:attribute name="includeMdlc" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -525,8 +573,10 @@
           <xs:element name="useDefaultRowHighlightingRules" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="highlight-row" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.ConsoleRowHighlightingRule" />
           <xs:element name="highlight-word" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.ConsoleWordHighlightingRule" />
+          <xs:element name="detectConsoleAvailable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="errorStream" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -553,6 +603,11 @@
             <xs:documentation>Indicates whether to use default row highlighting rules.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="detectConsoleAvailable" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-check if the console is available. - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="encoding" type="xs:string">
           <xs:annotation>
             <xs:documentation>The encoding for writing messages to the .</xs:documentation>
@@ -563,6 +618,11 @@
             <xs:documentation>Indicates whether the error stream (stderr) should be used instead of the output stream (stdout).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -664,7 +724,9 @@
           <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="error" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="detectConsoleAvailable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -691,11 +753,21 @@
             <xs:documentation>Indicates whether to send the log messages to the standard error instead of the standard output.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="detectConsoleAvailable" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-check if the console is available - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="encoding" type="xs:string">
           <xs:annotation>
             <xs:documentation>The encoding for writing messages to the .</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -704,77 +776,83 @@
       <xs:extension base="Target">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="connectionString" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="connectionStringName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="dbDatabase" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="dbHost" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="dbPassword" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="dbProvider" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="dbUserName" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="useTransactions" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="dbUserName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="dbProvider" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="dbPassword" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="dbDatabase" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="connectionStringName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="connectionString" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="dbHost" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="installConnectionString" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="install-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
           <xs:element name="uninstall-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseParameterInfo" />
           <xs:element name="commandText" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="commandType" minOccurs="0" maxOccurs="1" type="System.Data.CommandType" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseParameterInfo" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="connectionString" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="connectionStringName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the connection string (as specified in &lt;connectionStrings&gt; configuration section.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbDatabase" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbHost" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbPassword" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbProvider" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the database provider.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbUserName" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep the database connection open between the log events.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="useTransactions" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Obsolete - value will be ignored! The logging code always runs outside of transaction. Gets or sets a value indicating whether to use database transactions. Some data providers require this.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="dbUserName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbProvider" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the database provider.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbPassword" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep the database connection open between the log events.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbDatabase" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionStringName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the connection string (as specified in &lt;connectionStrings&gt; configuration section.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionString" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbHost" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="installConnectionString" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="commandText" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Text of the SQL command to be run on each log level.</xs:documentation>
@@ -866,6 +944,7 @@
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -887,6 +966,11 @@
             <xs:documentation>Footer.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -896,6 +980,7 @@
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -907,6 +992,11 @@
             <xs:documentation>Layout used to format log messages.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -924,6 +1014,7 @@
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.EventLogTargetOverflowAction" />
           <xs:element name="entryType" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxMessageLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -975,6 +1066,11 @@
             <xs:documentation>Message length limit to write to the Event Log.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -991,6 +1087,7 @@
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="returnToFirstOnSuccess" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1002,6 +1099,11 @@
             <xs:documentation>Indicates whether to return to the first target after any successful write.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1022,7 +1124,12 @@
           <xs:element name="enableArchiveFileCompression" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxArchiveFiles" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="forceManaged" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="archiveFileKind" minOccurs="0" maxOccurs="1" type="NLog.Targets.FilePathKind" />
           <xs:element name="cleanupFileName" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="discardAll" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="fileNameKind" minOccurs="0" maxOccurs="1" type="NLog.Targets.FilePathKind" />
+          <xs:element name="forceMutexConcurrentWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="writeFooterOnArchivingOnly" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="fileName" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="archiveDateFormat" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="archiveOldFileOnStartup" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -1032,15 +1139,16 @@
           <xs:element name="deleteOldFileOnStartup" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="replaceFileContentsOnEachWrite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="concurrentWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="concurrentWriteAttemptDelay" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="keepFileOpen" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxLogFilenames" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="networkWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="openFileCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="openFileCacheTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="bufferSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="autoFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="concurrentWriteAttemptDelay" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="concurrentWriteAttempts" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="keepFileOpen" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1104,7 +1212,12 @@
         </xs:attribute>
         <xs:attribute name="forceManaged" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Gets or set a value indicating whether a managed file stream is forced, instead of used the native implementation.</xs:documentation>
+            <xs:documentation>Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveFileKind" type="NLog.Targets.FilePathKind">
+          <xs:annotation>
+            <xs:documentation>Is the  an absolute or relative path?</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="cleanupFileName" type="xs:boolean">
@@ -1112,6 +1225,26 @@
             <xs:documentation>Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="discardAll" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="fileNameKind" type="NLog.Targets.FilePathKind">
+          <xs:annotation>
+            <xs:documentation>Is the  an absolute or relative path?</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="forceMutexConcurrentWrites" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Value indicationg whether file creation calls should be synchronized by a system global mutex.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="writeFooterOnArchivingOnly" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether the footer should be written only when the file is archived.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="fileName" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Name of the file to write to.</xs:documentation>
@@ -1157,9 +1290,9 @@
             <xs:documentation>Indicates whether concurrent writes to the log file by multiple processes on the same host.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="concurrentWriteAttemptDelay" type="xs:integer">
+        <xs:attribute name="keepFileOpen" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Delay in milliseconds to wait before attempting to write to the file again.</xs:documentation>
+            <xs:documentation>Indicates whether to keep log file open instead of opening and closing it on each logging event.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="maxLogFilenames" type="xs:integer">
@@ -1182,6 +1315,11 @@
             <xs:documentation>Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="bufferSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Log file buffer size in bytes.</xs:documentation>
@@ -1192,16 +1330,16 @@
             <xs:documentation>Indicates whether to automatically flush the file buffers after each log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="concurrentWriteAttemptDelay" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Delay in milliseconds to wait before attempting to write to the file again.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="concurrentWriteAttempts" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Number of times the write is appended on the file before NLog discards the log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="keepFileOpen" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep log file open instead of opening and closing it on each logging event.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1221,6 +1359,20 @@
       <xs:enumeration value="Day" />
       <xs:enumeration value="Hour" />
       <xs:enumeration value="Minute" />
+      <xs:enumeration value="Sunday" />
+      <xs:enumeration value="Monday" />
+      <xs:enumeration value="Tuesday" />
+      <xs:enumeration value="Wednesday" />
+      <xs:enumeration value="Thursday" />
+      <xs:enumeration value="Friday" />
+      <xs:enumeration value="Saturday" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.FilePathKind">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Unknown" />
+      <xs:enumeration value="Relative" />
+      <xs:enumeration value="Absolute" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="NLog.Targets.Win32FileAttributes">
@@ -1249,6 +1401,7 @@
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1260,6 +1413,11 @@
             <xs:documentation>Condition expression. Log events who meet this condition will be forwarded to the wrapped target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1275,6 +1433,7 @@
           <xs:element name="password" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="revertToSelf" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="userName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1316,6 +1475,11 @@
             <xs:documentation>Username to change context to.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1342,6 +1506,38 @@
       <xs:enumeration value="NewCredentials" />
     </xs:restriction>
   </xs:simpleType>
+  <xs:complexType name="LimitingWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="interval" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="messageLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="interval" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Interval in which messages will be written up to the  number of messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="messageLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum allowed number of messages written per .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:complexType name="LogReceiverService">
     <xs:complexContent>
       <xs:extension base="Target">
@@ -1354,6 +1550,7 @@
           <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
           <xs:element name="useBinaryEncoding" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1390,6 +1587,11 @@
             <xs:documentation>Indicates whether to use binary message encoding.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1397,6 +1599,7 @@
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
       <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
       <xs:element name="type" minOccurs="0" maxOccurs="1" type="xs:string" />
     </xs:choice>
     <xs:attribute name="layout" type="SimpleLayoutAttribute">
@@ -1409,11 +1612,16 @@
         <xs:documentation>Name of the parameter.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="type" type="xs:string">
+    <xs:attribute name="parameterType" type="xs:string">
       <xs:annotation>
         <xs:documentation>Type of the parameter.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the parameter. Obsolete alias for </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
   <xs:complexType name="Mail">
     <xs:complexContent>
@@ -1432,9 +1640,10 @@
           <xs:element name="body" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="subject" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="from" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="replaceNewlineWithBrTagInHtml" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="priority" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="timeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="priority" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="replaceNewlineWithBrTagInHtml" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="smtpServer" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="smtpAuthentication" minOccurs="0" maxOccurs="1" type="NLog.Targets.SmtpAuthenticationMode" />
           <xs:element name="smtpUserName" minOccurs="0" maxOccurs="1" type="Layout" />
@@ -1510,9 +1719,9 @@
             <xs:documentation>Sender's email address (e.g. joe@domain.com).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="replaceNewlineWithBrTagInHtml" type="xs:boolean">
+        <xs:attribute name="timeout" type="xs:integer">
           <xs:annotation>
-            <xs:documentation>Indicates whether NewLine characters in the body should be replaced with  tags.</xs:documentation>
+            <xs:documentation>Indicates the SMTP client timeout.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="priority" type="SimpleLayoutAttribute">
@@ -1520,9 +1729,14 @@
             <xs:documentation>Priority used for sending mails.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="timeout" type="xs:integer">
+        <xs:attribute name="replaceNewlineWithBrTagInHtml" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates the SMTP client timeout.</xs:documentation>
+            <xs:documentation>Indicates whether NewLine characters in the body should be replaced with  tags.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="smtpServer" type="SimpleLayoutAttribute">
@@ -1593,6 +1807,7 @@
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1604,6 +1819,11 @@
             <xs:documentation>Layout used to format log messages.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1616,6 +1836,7 @@
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="useXmlEncoding" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="checkIfQueueExists" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="createQueueIfNotExists" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="label" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="queue" minOccurs="0" maxOccurs="1" type="Layout" />
@@ -1646,6 +1867,11 @@
             <xs:documentation>Indicates whether to check if a queue exists before writing to it.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="createQueueIfNotExists" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to create the queue if it doesn't exists.</xs:documentation>
@@ -1677,6 +1903,7 @@
           <xs:element name="className" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="methodName" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1693,6 +1920,11 @@
             <xs:documentation>Method name. The method must be public and static. Use the AssemblyQualifiedName , https://msdn.microsoft.com/en-us/library/system.type.assemblyqualifiedname(v=vs.110).aspx e.g.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1703,6 +1935,7 @@
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
@@ -1712,6 +1945,7 @@
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1728,6 +1962,11 @@
             <xs:documentation>Encoding to be used.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxMessageSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Maximum message size in bytes.</xs:documentation>
@@ -1773,6 +2012,11 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1783,23 +2027,26 @@
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
           <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1816,6 +2063,11 @@
             <xs:documentation>Instance of  that is used to format log messages.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxMessageSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Maximum message size in bytes.</xs:documentation>
@@ -1836,6 +2088,11 @@
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="keepConnection" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
@@ -1846,11 +2103,6 @@
             <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="maxConnections" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="address" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Network address.</xs:documentation>
@@ -1861,29 +2113,14 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeSourceInfo" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ndcItemSeparator" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>NDC item separator.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="includeNdc" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeCallSite" type="xs:boolean">
+        <xs:attribute name="includeSourceInfo" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="appInfo" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
+            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeNLogData" type="xs:boolean">
@@ -1896,6 +2133,31 @@
             <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeCallSite" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="appInfo" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ndcItemSeparator" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>NDC item separator.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1906,6 +2168,7 @@
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="formatMessage" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1922,6 +2185,11 @@
             <xs:documentation>Indicates whether to perform layout calculation.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1931,6 +2199,7 @@
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1942,6 +2211,11 @@
             <xs:documentation>Layout used to format log messages.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -1957,6 +2231,7 @@
           <xs:element name="counterType" minOccurs="0" maxOccurs="1" type="System.Diagnostics.PerformanceCounterType" />
           <xs:element name="incrementValue" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="instanceName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -1998,6 +2273,11 @@
             <xs:documentation>Performance counter instance name.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2040,6 +2320,7 @@
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="defaultFilter" minOccurs="0" maxOccurs="1" type="Condition" />
           <xs:element name="when" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.Wrappers.FilteringRule" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -2051,6 +2332,11 @@
             <xs:documentation>Default filter to be applied when no specific rule matches.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2075,12 +2361,18 @@
       <xs:extension base="CompoundTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2089,6 +2381,7 @@
       <xs:extension base="WrapperTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="repeatCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -2096,6 +2389,11 @@
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="repeatCount" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Number of times to repeat each log message.</xs:documentation>
@@ -2109,6 +2407,7 @@
       <xs:extension base="WrapperTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="retryCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="retryDelayMilliseconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
         </xs:choice>
@@ -2117,6 +2416,11 @@
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="retryCount" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Number of retries that should be attempted on the wrapped target in case of a failure.</xs:documentation>
@@ -2135,12 +2439,18 @@
       <xs:extension base="CompoundTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2149,12 +2459,18 @@
       <xs:extension base="CompoundTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2164,6 +2480,7 @@
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -2175,6 +2492,11 @@
             <xs:documentation>Layout used to format log messages.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2185,11 +2507,16 @@
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="includeBOM" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="escapeDataNLogLegacy" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="escapeDataRfc3986" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="methodName" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="namespace" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="protocol" minOccurs="0" maxOccurs="1" type="NLog.Targets.WebServiceProtocol" />
           <xs:element name="url" minOccurs="0" maxOccurs="1" type="xs:anyURI" />
+          <xs:element name="xmlRoot" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="xmlRootNamespace" minOccurs="0" maxOccurs="1" type="xs:string" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -2201,11 +2528,26 @@
             <xs:documentation>Should we include the BOM (Byte-order-mark) for UTF? Influences the  property. This will only work for UTF-8.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="encoding" type="xs:string">
           <xs:annotation>
             <xs:documentation>Encoding.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="escapeDataNLogLegacy" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Value whether escaping be done according to the old NLog style (Very non-standard)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="escapeDataRfc3986" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="methodName" type="xs:string">
           <xs:annotation>
             <xs:documentation>Web service method name. Only used with Soap.</xs:documentation>
@@ -2226,6 +2568,16 @@
             <xs:documentation>Web service URL.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="xmlRoot" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the root XML element, if POST of XML document chosen. If so, this property must not be null. (see  and ).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="xmlRootNamespace" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>(optional) root namespace of the XML document, if POST of XML document chosen. (see  and ).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -2235,6 +2587,8 @@
       <xs:enumeration value="Soap12" />
       <xs:enumeration value="HttpPost" />
       <xs:enumeration value="HttpGet" />
+      <xs:enumeration value="JsonPost" />
+      <xs:enumeration value="XmlPost" />
     </xs:restriction>
   </xs:simpleType>
   <xs:complexType name="CompoundLayout">
@@ -2345,9 +2699,21 @@
       <xs:extension base="Layout">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
+          <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
+        <xs:attribute name="excludeProperties" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>List of property names to exclude when  is true</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="renderEmptyObject" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Option to render the empty object value {}</xs:documentation>
@@ -2364,6 +2730,7 @@
   <xs:complexType name="NLog.Layouts.JsonAttribute">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="escapeUnicode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
       <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
       <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
     </xs:choice>
@@ -2372,6 +2739,11 @@
         <xs:documentation>Determines wether or not this attribute will be Json encoded.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="escapeUnicode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to escape non-ascii characters</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
     <xs:attribute name="layout" type="SimpleLayoutAttribute">
       <xs:annotation>
         <xs:documentation>Layout that will be rendered as the attribute's value.</xs:documentation>
@@ -2412,7 +2784,26 @@
   <xs:complexType name="Log4JXmlEventLayout">
     <xs:complexContent>
       <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
diff --git a/Filtration/Repositories/ItemFilterScriptRepository.cs b/Filtration/Repositories/ItemFilterScriptRepository.cs
index e119daa..2348b2a 100644
--- a/Filtration/Repositories/ItemFilterScriptRepository.cs
+++ b/Filtration/Repositories/ItemFilterScriptRepository.cs
@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
 using Filtration.ObjectModel;
+using Filtration.ObjectModel.Factories;
 using Filtration.Services;
 using Filtration.ViewModels;
+using Filtration.ViewModels.Factories;
 
 namespace Filtration.Repositories
 {
@@ -16,12 +18,15 @@ namespace Filtration.Repositories
     internal class ItemFilterScriptRepository : IItemFilterScriptRepository
     {
         private readonly IItemFilterPersistenceService _itemFilterPersistenceService;
+        private readonly IItemFilterScriptFactory _itemFilterScriptFactory;
         private readonly IItemFilterScriptViewModelFactory _itemFilterScriptViewModelFactory;
 
         public ItemFilterScriptRepository(IItemFilterPersistenceService itemFilterPersistenceService,
+                                          IItemFilterScriptFactory itemFilterScriptFactory,
                                           IItemFilterScriptViewModelFactory itemFilterScriptViewModelFactory)
         {
             _itemFilterPersistenceService = itemFilterPersistenceService;
+            _itemFilterScriptFactory = itemFilterScriptFactory;
             _itemFilterScriptViewModelFactory = itemFilterScriptViewModelFactory;
         }
 
@@ -37,7 +42,7 @@ namespace Filtration.Repositories
 
         public IItemFilterScriptViewModel NewScript()
         {
-            var newScript = new ItemFilterScript();
+            var newScript = _itemFilterScriptFactory.Create();
             var newViewModel = _itemFilterScriptViewModelFactory.Create();
             newViewModel.Initialise(newScript, true);
 
diff --git a/Filtration/Resources/Icons/redo_icon.png b/Filtration/Resources/Icons/redo_icon.png
new file mode 100644
index 0000000..8618cdb
Binary files /dev/null and b/Filtration/Resources/Icons/redo_icon.png differ
diff --git a/Filtration/Resources/Icons/undo_icon.png b/Filtration/Resources/Icons/undo_icon.png
new file mode 100644
index 0000000..01177b7
Binary files /dev/null and b/Filtration/Resources/Icons/undo_icon.png differ
diff --git a/Filtration/Services/ItemFilterPersistenceService.cs b/Filtration/Services/ItemFilterPersistenceService.cs
index 27646ec..14cd9dc 100644
--- a/Filtration/Services/ItemFilterPersistenceService.cs
+++ b/Filtration/Services/ItemFilterPersistenceService.cs
@@ -11,8 +11,8 @@ namespace Filtration.Services
     {
         void SetItemFilterScriptDirectory(string path);
         string ItemFilterScriptDirectory { get; }
-        Task<ItemFilterScript> LoadItemFilterScriptAsync(string filePath);
-        Task SaveItemFilterScriptAsync(ItemFilterScript script);
+        Task<IItemFilterScript> LoadItemFilterScriptAsync(string filePath);
+        Task SaveItemFilterScriptAsync(IItemFilterScript script);
         string DefaultPathOfExileDirectory();
     }
 
@@ -59,9 +59,9 @@ namespace Filtration.Services
             Settings.Default.DefaultFilterDirectory = path;
         }
 
-        public async Task<ItemFilterScript> LoadItemFilterScriptAsync(string filePath)
+        public async Task<IItemFilterScript> LoadItemFilterScriptAsync(string filePath)
         {
-            ItemFilterScript loadedScript = null;
+            IItemFilterScript loadedScript = null;
             await Task.Run(() =>
             {
                 loadedScript = _itemFilterScriptTranslator.TranslateStringToItemFilterScript(
@@ -76,7 +76,7 @@ namespace Filtration.Services
             return loadedScript;
         }
 
-        public async Task SaveItemFilterScriptAsync(ItemFilterScript script)
+        public async Task SaveItemFilterScriptAsync(IItemFilterScript script)
         {
             await Task.Run(() =>
             {
diff --git a/Filtration/Services/StaticDataService.cs b/Filtration/Services/StaticDataService.cs
index 36c5356..0d9467d 100644
--- a/Filtration/Services/StaticDataService.cs
+++ b/Filtration/Services/StaticDataService.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows;
 using Filtration.Common.Services;
 using Filtration.Common.Utilities;
-using Filtration.Utilities;
 
 namespace Filtration.Services
 {
diff --git a/Filtration/Utilities/AutoMapperHelpers.cs b/Filtration/Utilities/AutoMapperHelpers.cs
deleted file mode 100644
index 73b46e8..0000000
--- a/Filtration/Utilities/AutoMapperHelpers.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Linq;
-using Filtration.ViewModels;
-
-namespace Filtration.Utilities
-{
-    internal class AutoMapperHelpers
-    {
-        public static void ItemFilterBlockGroupViewModelPostMap(ItemFilterBlockGroupViewModel viewModel)
-        {
-            foreach (var childViewModel in viewModel.ChildGroups)
-            {
-                ItemFilterBlockGroupViewModelPostMap(childViewModel);
-            }
-
-            if (viewModel.ChildGroups.Count > 0)
-            {
-                if (viewModel.ChildGroups.All(g => g.IsChecked == true))
-                {
-                    viewModel.IsChecked = true;
-                }
-                else if (viewModel.ChildGroups.Any(g => g.IsChecked == true || g.IsChecked == null))
-                {
-                    viewModel.IsChecked = null;
-                }
-                else
-                {
-                    viewModel.IsChecked = false;
-                }
-            }
-        }
-    }
-}
diff --git a/Filtration/Utilities/BlockGroupMapper.cs b/Filtration/Utilities/BlockGroupMapper.cs
deleted file mode 100644
index 267f376..0000000
--- a/Filtration/Utilities/BlockGroupMapper.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using AutoMapper;
-using Filtration.ObjectModel;
-using Filtration.ViewModels;
-
-namespace Filtration.Utilities
-{
-    internal interface IBlockGroupMapper
-    {
-        ObservableCollection<ItemFilterBlockGroupViewModel> MapBlockGroupsToViewModels(
-            ObservableCollection<ItemFilterBlockGroup> blockGroups, bool showAdvanced);
-    }
-
-    internal class BlockGroupMapper : IBlockGroupMapper
-    {
-        public ObservableCollection<ItemFilterBlockGroupViewModel> MapBlockGroupsToViewModels(
-            ObservableCollection<ItemFilterBlockGroup> blockGroups, bool showAdvanced)
-        {
-            
-            var mappedViewModels = Mapper.Map<ObservableCollection<ItemFilterBlockGroupViewModel>>(blockGroups, opts => opts.Items["showAdvanced"] = showAdvanced);
-            AutoMapperHelpers.ItemFilterBlockGroupViewModelPostMap(mappedViewModels.First());
-            return mappedViewModels.First().ChildGroups;
-        }
-    }
-}
diff --git a/Filtration/Utility/RoutedCommandHandler.cs b/Filtration/Utility/RoutedCommandHandler.cs
new file mode 100644
index 0000000..8a806ea
--- /dev/null
+++ b/Filtration/Utility/RoutedCommandHandler.cs
@@ -0,0 +1,73 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace Filtration.Utility
+{
+    /// <summary>
+    ///  Allows associated a routed command with a non-routed command.  Used by
+    ///  <see cref="RoutedCommandHandlers"/>.
+    /// </summary>
+    public class RoutedCommandHandler : Freezable
+    {
+        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
+            "Command",
+            typeof(ICommand),
+            typeof(RoutedCommandHandler),
+            new PropertyMetadata(default(ICommand)));
+
+        /// <summary> The command that should be executed when the RoutedCommand fires. </summary>
+        public ICommand Command
+        {
+            get => (ICommand)GetValue(CommandProperty);
+            set => SetValue(CommandProperty, value);
+        }
+
+        public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register(
+            "IsActive", typeof(bool), typeof(RoutedCommandHandler), new PropertyMetadata(default(bool)));
+
+        public bool IsActive
+        {
+            get { return (bool) GetValue(IsActiveProperty); }
+            set { SetValue(IsActiveProperty, value); }
+        }
+
+        /// <summary> The command that triggers <see cref="ICommand"/>. </summary>
+        public ICommand RoutedCommand { get; set; }
+
+        /// <inheritdoc />
+        protected override Freezable CreateInstanceCore()
+        {
+            return new RoutedCommandHandler();
+        }
+
+        /// <summary>
+        ///  Register this handler to respond to the registered RoutedCommand for the
+        ///  given element.
+        /// </summary>
+        /// <param name="owner"> The element for which we should register the command
+        ///  binding for the current routed command. </param>
+        internal void Register(FrameworkElement owner)
+        {
+            var binding = new CommandBinding(RoutedCommand, HandleExecuted, HandleCanExecute);
+            owner.CommandBindings.Add(binding);
+        }
+
+        /// <summary> Proxy to the current Command.CanExecute(object). </summary>
+        private void HandleCanExecute(object sender, CanExecuteRoutedEventArgs e)
+        {
+            if (!IsActive) return;
+
+            e.CanExecute = Command?.CanExecute(e.Parameter) != null;
+            e.Handled = true;
+        }
+
+        /// <summary> Proxy to the current Command.Execute(object). </summary>
+        private void HandleExecuted(object sender, ExecutedRoutedEventArgs e)
+        {
+            if (!IsActive) return;
+
+            Command?.Execute(e.Parameter);
+            e.Handled = true;
+        }
+    }
+}
diff --git a/Filtration/Utility/RoutedCommandHandlers.cs b/Filtration/Utility/RoutedCommandHandlers.cs
new file mode 100644
index 0000000..ce250fa
--- /dev/null
+++ b/Filtration/Utility/RoutedCommandHandlers.cs
@@ -0,0 +1,79 @@
+using System.Collections;
+using System.Collections.Specialized;
+using System.Windows;
+
+namespace Filtration.Utility
+{
+    /// <summary>
+    ///  Holds a collection of <see cref="RoutedCommandHandler"/> that should be
+    ///  turned into CommandBindings.
+    /// </summary>
+    public class RoutedCommandHandlers : FreezableCollection<RoutedCommandHandler>
+    {
+        /// <summary>
+        ///  Hide this from WPF so that it's forced to go through
+        ///  <see cref="GetCommands"/> and we can auto-create the collection
+        ///  if it doesn't already exist.  This isn't strictly necessary but it makes
+        ///  the XAML much nicer.
+        /// </summary>
+        private static readonly DependencyProperty CommandsProperty = DependencyProperty.RegisterAttached(
+            "CommandsPrivate",
+            typeof(RoutedCommandHandlers),
+            typeof(RoutedCommandHandlers),
+            new PropertyMetadata(default(RoutedCommandHandlers)));
+
+        /// <summary>
+        ///  Gets the collection of RoutedCommandHandler for a given element, creating
+        ///  it if it doesn't already exist.
+        /// </summary>
+        public static RoutedCommandHandlers GetCommands(FrameworkElement element)
+        {
+            RoutedCommandHandlers handlers = (RoutedCommandHandlers)element.GetValue(CommandsProperty);
+            if (handlers == null)
+            {
+                handlers = new RoutedCommandHandlers(element);
+                element.SetValue(CommandsProperty, handlers);
+            }
+
+            return handlers;
+        }
+
+        private readonly FrameworkElement _owner;
+
+        /// <summary> Each collection is tied to a specific element. </summary>
+        /// <param name="owner"> The element for which this collection is created. </param>
+        public RoutedCommandHandlers(FrameworkElement owner)
+        {
+            _owner = owner;
+
+            // because we auto-create the collection, we don't know when items will be
+            // added.  So, we observe ourself for changes manually. 
+            var self = (INotifyCollectionChanged)this;
+            self.CollectionChanged += (sender, args) =>
+            {
+                // note this does not handle deletions, that's left as an exercise for the
+                // reader, but most of the time, that's not needed! 
+                ((RoutedCommandHandlers)sender).HandleAdditions(args.NewItems);
+            };
+        }
+
+        /// <summary> Invoked when new items are added to the collection. </summary>
+        /// <param name="newItems"> The new items that were added. </param>
+        private void HandleAdditions(IList newItems)
+        {
+            if (newItems == null)
+                return;
+
+            foreach (RoutedCommandHandler routedHandler in newItems)
+            {
+                routedHandler.Register(_owner);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override Freezable CreateInstanceCore()
+        {
+            return new RoutedCommandHandlers(_owner);
+        }
+    }
+}
diff --git a/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs b/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs
index 521463e..74759c2 100644
--- a/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs
+++ b/Filtration/ViewModels/AvalonDockWorkspaceViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows;
 using Filtration.Common.ViewModels;
 using Filtration.Interface;
 using Filtration.ThemeEditor.ViewModels;
@@ -18,7 +19,7 @@ namespace Filtration.ViewModels
         ReadOnlyObservableCollection<IDocument> OpenDocuments { get; }
         IItemFilterScriptViewModel ActiveScriptViewModel { get; }
         IThemeEditorViewModel ActiveThemeViewModel { get; }
-        ISectionBrowserViewModel SectionBrowserViewModel { get; }
+        ICommentBlockBrowserViewModel CommentBlockBrowserViewModel { get; }
         IBlockGroupBrowserViewModel BlockGroupBrowserViewModel { get; }
         IBlockOutputPreviewViewModel BlockOutputPreviewViewModel { get; }
         void AddDocument(IDocument document);
@@ -29,7 +30,7 @@ namespace Filtration.ViewModels
 
     internal class AvalonDockWorkspaceViewModel : ViewModelBase, IAvalonDockWorkspaceViewModel
     {
-        private readonly ISectionBrowserViewModel _sectionBrowserViewModel;
+        private readonly ICommentBlockBrowserViewModel _commentBlockBrowserViewModel;
         private readonly IBlockGroupBrowserViewModel _blockGroupBrowserViewModel;
         private readonly IBlockOutputPreviewViewModel _blockOutputPreviewViewModel;
 
@@ -38,16 +39,16 @@ namespace Filtration.ViewModels
         private IThemeEditorViewModel _activeThemeViewModel;
         private readonly ObservableCollection<IDocument> _openDocuments;
 
-        public AvalonDockWorkspaceViewModel(ISectionBrowserViewModel sectionBrowserViewModel,
+        public AvalonDockWorkspaceViewModel(ICommentBlockBrowserViewModel commentBlockBrowserViewModel,
             IBlockGroupBrowserViewModel blockGroupBrowserViewModel,
             IStartPageViewModel startPageViewModel,
             IBlockOutputPreviewViewModel blockOutputPreviewViewModel)
         {
-            _sectionBrowserViewModel = sectionBrowserViewModel;
+            _commentBlockBrowserViewModel = commentBlockBrowserViewModel;
             _blockGroupBrowserViewModel = blockGroupBrowserViewModel;
             _blockOutputPreviewViewModel = blockOutputPreviewViewModel;
 
-            _sectionBrowserViewModel.Initialise(this);
+            _commentBlockBrowserViewModel.Initialise(this);
             _blockGroupBrowserViewModel.Initialise(this);
             _blockOutputPreviewViewModel.Initialise(this);
 
@@ -94,13 +95,13 @@ namespace Filtration.ViewModels
         public IThemeEditorViewModel ActiveThemeViewModel => _activeThemeViewModel;
         public IBlockGroupBrowserViewModel BlockGroupBrowserViewModel => _blockGroupBrowserViewModel;
         public IBlockOutputPreviewViewModel BlockOutputPreviewViewModel => _blockOutputPreviewViewModel;
-        public ISectionBrowserViewModel SectionBrowserViewModel => _sectionBrowserViewModel;
+        public ICommentBlockBrowserViewModel CommentBlockBrowserViewModel => _commentBlockBrowserViewModel;
 
         private List<IToolViewModel> _tools;
 
         public IEnumerable<IToolViewModel> Tools => _tools ?? (_tools = new List<IToolViewModel>
         {
-            _sectionBrowserViewModel,
+            _commentBlockBrowserViewModel,
             _blockGroupBrowserViewModel,
             _blockOutputPreviewViewModel
         });
@@ -116,7 +117,7 @@ namespace Filtration.ViewModels
                 _activeThemeViewModel = (IThemeEditorViewModel) document;
             }
 
-            _openDocuments.Add(document);
+            Application.Current.Dispatcher.Invoke(() => _openDocuments.Add(document));
             ActiveDocument = document;
         }
 
@@ -129,7 +130,7 @@ namespace Filtration.ViewModels
 
             if (document.IsScript && ActiveDocument == document)
             {
-                _sectionBrowserViewModel.ClearDown();
+                _commentBlockBrowserViewModel.ClearDown();
                 _blockGroupBrowserViewModel.ClearDown();
                 _blockOutputPreviewViewModel.ClearDown();
             }
diff --git a/Filtration/ViewModels/IItemFilterBlockViewModelFactory.cs b/Filtration/ViewModels/Factories/IItemFilterBlockViewModelFactory.cs
similarity index 80%
rename from Filtration/ViewModels/IItemFilterBlockViewModelFactory.cs
rename to Filtration/ViewModels/Factories/IItemFilterBlockViewModelFactory.cs
index 349fd9b..9c43c78 100644
--- a/Filtration/ViewModels/IItemFilterBlockViewModelFactory.cs
+++ b/Filtration/ViewModels/Factories/IItemFilterBlockViewModelFactory.cs
@@ -1,4 +1,4 @@
-namespace Filtration.ViewModels
+namespace Filtration.ViewModels.Factories
 {
     internal interface IItemFilterBlockViewModelFactory
     {
diff --git a/Filtration/ViewModels/Factories/IItemFilterCommentBlockViewModelFactory.cs b/Filtration/ViewModels/Factories/IItemFilterCommentBlockViewModelFactory.cs
new file mode 100644
index 0000000..947fd52
--- /dev/null
+++ b/Filtration/ViewModels/Factories/IItemFilterCommentBlockViewModelFactory.cs
@@ -0,0 +1,8 @@
+namespace Filtration.ViewModels.Factories
+{
+    internal interface IItemFilterCommentBlockViewModelFactory
+    {
+        IItemFilterCommentBlockViewModel Create();
+        void Release(IItemFilterCommentBlockViewModel itemFilterCommentBlockViewModel);
+    }
+}
\ No newline at end of file
diff --git a/Filtration/ViewModels/IItemFilterScriptViewModelFactory.cs b/Filtration/ViewModels/Factories/IItemFilterScriptViewModelFactory.cs
similarity index 81%
rename from Filtration/ViewModels/IItemFilterScriptViewModelFactory.cs
rename to Filtration/ViewModels/Factories/IItemFilterScriptViewModelFactory.cs
index f488b44..ddb0fd4 100644
--- a/Filtration/ViewModels/IItemFilterScriptViewModelFactory.cs
+++ b/Filtration/ViewModels/Factories/IItemFilterScriptViewModelFactory.cs
@@ -1,4 +1,4 @@
-namespace Filtration.ViewModels
+namespace Filtration.ViewModels.Factories
 {
     internal interface IItemFilterScriptViewModelFactory
     {
diff --git a/Filtration/ViewModels/Factories/ItemFilterBlockBaseViewModelFactory.cs b/Filtration/ViewModels/Factories/ItemFilterBlockBaseViewModelFactory.cs
new file mode 100644
index 0000000..6e55a3d
--- /dev/null
+++ b/Filtration/ViewModels/Factories/ItemFilterBlockBaseViewModelFactory.cs
@@ -0,0 +1,37 @@
+using System;
+using Filtration.ObjectModel;
+
+namespace Filtration.ViewModels.Factories
+{
+    internal interface IItemFilterBlockBaseViewModelFactory
+    {
+        IItemFilterBlockViewModelBase Create(IItemFilterBlockBase itemFilterBlockBase);
+    }
+
+    internal class ItemFilterBlockBaseViewModelFactory : IItemFilterBlockBaseViewModelFactory
+    {
+        private readonly IItemFilterBlockViewModelFactory _itemFilterBlockViewModelFactory;
+        private readonly IItemFilterCommentBlockViewModelFactory _itemFilterCommentBlockViewModelFactory;
+
+        public ItemFilterBlockBaseViewModelFactory(IItemFilterBlockViewModelFactory itemFilterBlockViewModelFactory,
+                                                   IItemFilterCommentBlockViewModelFactory itemFilterCommentBlockViewModelFactory)
+        {
+            _itemFilterBlockViewModelFactory = itemFilterBlockViewModelFactory;
+            _itemFilterCommentBlockViewModelFactory = itemFilterCommentBlockViewModelFactory;
+        }
+
+        public IItemFilterBlockViewModelBase Create(IItemFilterBlockBase itemFilterBlockBase)
+        {
+            if (itemFilterBlockBase is IItemFilterBlock)
+            {
+                return _itemFilterBlockViewModelFactory.Create();
+            }
+            if (itemFilterBlockBase is IItemFilterCommentBlock)
+            {
+                return _itemFilterCommentBlockViewModelFactory.Create();
+            }
+
+            throw new InvalidOperationException("Unknown IItemFilterBlockBase type");
+        }
+    }
+}
diff --git a/Filtration/ViewModels/ItemFilterBlockGroupViewModel.cs b/Filtration/ViewModels/ItemFilterBlockGroupViewModel.cs
index b3c8132..54b7243 100644
--- a/Filtration/ViewModels/ItemFilterBlockGroupViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockGroupViewModel.cs
@@ -18,6 +18,42 @@ namespace Filtration.ViewModels
             ChildGroups = new ObservableCollection<ItemFilterBlockGroupViewModel>();
         }
 
+        public ItemFilterBlockGroupViewModel(ItemFilterBlockGroup itemFilterBlockGroup, bool showAdvanced, ItemFilterBlockGroupViewModel parent)
+        {
+            GroupName = itemFilterBlockGroup.GroupName;
+            ParentGroup = parent;
+            Advanced = itemFilterBlockGroup.Advanced;
+            SourceBlockGroup = itemFilterBlockGroup;
+            IsChecked = itemFilterBlockGroup.IsChecked;
+
+            ChildGroups = new ObservableCollection<ItemFilterBlockGroupViewModel>();
+            foreach (var childGroup in itemFilterBlockGroup.ChildGroups.Where(c => showAdvanced || !c.Advanced))
+            {
+                ChildGroups.Add(new ItemFilterBlockGroupViewModel(childGroup, showAdvanced, this));
+            }
+
+            if (ChildGroups.Any())
+            {
+                SetIsCheckedBasedOnChildGroups();
+            }
+        }
+
+        private void SetIsCheckedBasedOnChildGroups()
+        {
+            if (ChildGroups.All(g => g.IsChecked == true))
+            {
+                IsChecked = true;
+            }
+            else if (ChildGroups.Any(g => g.IsChecked == true || g.IsChecked == null))
+            {
+                IsChecked = null;
+            }
+            else
+            {
+                IsChecked = false;
+            }
+        }
+
         public string GroupName { get; internal set; }
         public ItemFilterBlockGroupViewModel ParentGroup { get; internal set; }
         public ObservableCollection<ItemFilterBlockGroupViewModel> ChildGroups { get; internal set; }
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
index 39d3428..936d738 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@@ -4,23 +4,18 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Windows.Media;
-using Filtration.Common.ViewModels;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.Services;
 using Filtration.Views;
-using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
 using Xceed.Wpf.Toolkit;
 
 namespace Filtration.ViewModels
 {
-    internal interface IItemFilterBlockViewModel
+    internal interface IItemFilterBlockViewModel : IItemFilterBlockViewModelBase
     {
-        event EventHandler BlockBecameDirty;
-        void Initialise(IItemFilterBlock itemFilterBlock, ItemFilterScriptViewModel parentScriptViewModel);
-        bool IsDirty { get; set; }
         bool IsExpanded { get; set; }
         IItemFilterBlock Block { get; }
         bool BlockEnabled { get; set; }
@@ -28,17 +23,16 @@ namespace Filtration.ViewModels
         void RefreshBlockPreview();
     }
 
-    internal class ItemFilterBlockViewModel : ViewModelBase, IItemFilterBlockViewModel
+    internal class ItemFilterBlockViewModel : ItemFilterBlockViewModelBase, IItemFilterBlockViewModel
     {
         private readonly IStaticDataService _staticDataService;
         private readonly IReplaceColorsViewModel _replaceColorsViewModel;
         private readonly MediaPlayer _mediaPlayer = new MediaPlayer();
-        private ItemFilterScriptViewModel _parentScriptViewModel;
+        private IItemFilterScriptViewModel _parentScriptViewModel;
 
         private bool _displaySettingsPopupOpen;
         private bool _isExpanded;
         private bool _audioVisualBlockItemsGridVisible;
-        private bool _isDirty;
 
         public ItemFilterBlockViewModel(IStaticDataService staticDataService, IReplaceColorsViewModel replaceColorsViewModel)
         {
@@ -65,10 +59,9 @@ namespace Filtration.ViewModels
             PlayPositionalSoundCommand = new RelayCommand(OnPlayPositionalSoundCommand, () => HasPositionalSound);
         }
 
-        public event EventHandler BlockBecameDirty;
-
-        public void Initialise(IItemFilterBlock itemFilterBlock, ItemFilterScriptViewModel parentScriptViewModel)
+        public override void Initialise(IItemFilterBlockBase itemFilterBlockBase, IItemFilterScriptViewModel parentScriptViewModel)
         {
+            var itemFilterBlock = itemFilterBlockBase as IItemFilterBlock;
             if (itemFilterBlock == null || parentScriptViewModel == null)
             {
                 throw new ArgumentNullException(nameof(itemFilterBlock));
@@ -77,52 +70,43 @@ namespace Filtration.ViewModels
             _parentScriptViewModel = parentScriptViewModel;
 
             Block = itemFilterBlock;
+
             itemFilterBlock.BlockItems.CollectionChanged += OnBlockItemsCollectionChanged;
 
             foreach (var blockItem in itemFilterBlock.BlockItems)
             {
                 blockItem.PropertyChanged += OnBlockItemChanged;
             }
+
+
+            base.Initialise(itemFilterBlock, parentScriptViewModel);
         }
 
-        public RelayCommand CopyBlockCommand { get; private set; }
-        public RelayCommand PasteBlockCommand { get; private set; }
-        public RelayCommand CopyBlockStyleCommand { get; private set; }
-        public RelayCommand PasteBlockStyleCommand { get; private set; }
-        public RelayCommand AddBlockCommand { get; private set; }
-        public RelayCommand AddSectionCommand { get; private set; }
-        public RelayCommand DeleteBlockCommand { get; private set; }
-        public RelayCommand MoveBlockUpCommand { get; private set; }
-        public RelayCommand MoveBlockDownCommand { get; private set; }
-        public RelayCommand MoveBlockToTopCommand { get; private set; }
-        public RelayCommand MoveBlockToBottomCommand { get; private set; }
-        public RelayCommand ToggleBlockActionCommand { get; private set; }
-        public RelayCommand ReplaceColorsCommand { get; private set; }
-        public RelayCommand<Type> AddFilterBlockItemCommand { get; private set; }
-        public RelayCommand<IItemFilterBlockItem> RemoveFilterBlockItemCommand { get; private set; }
-        public RelayCommand PlaySoundCommand { get; private set; }
-        public RelayCommand PlayPositionalSoundCommand { get; private set; }
-        public RelayCommand SwitchBlockItemsViewCommand { get; private set; }
+        public RelayCommand CopyBlockCommand { get; }
+        public RelayCommand PasteBlockCommand { get; }
+        public RelayCommand CopyBlockStyleCommand { get; }
+        public RelayCommand PasteBlockStyleCommand { get; }
+        public RelayCommand AddBlockCommand { get; }
+        public RelayCommand AddSectionCommand { get; }
+        public RelayCommand DeleteBlockCommand { get; }
+        public RelayCommand MoveBlockUpCommand { get; }
+        public RelayCommand MoveBlockDownCommand { get; }
+        public RelayCommand MoveBlockToTopCommand { get; }
+        public RelayCommand MoveBlockToBottomCommand { get; }
+        public RelayCommand ToggleBlockActionCommand { get; }
+        public RelayCommand ReplaceColorsCommand { get; }
+        public RelayCommand<Type> AddFilterBlockItemCommand { get; }
+        public RelayCommand<IItemFilterBlockItem> RemoveFilterBlockItemCommand { get; }
+        public RelayCommand PlaySoundCommand { get; }
+        public RelayCommand PlayPositionalSoundCommand { get; }
+        public RelayCommand SwitchBlockItemsViewCommand { get; }
 
         public IItemFilterBlock Block { get; private set; }
 
-        public bool IsDirty
-        {
-            get { return _isDirty; }
-            set
-            {
-                if (value != _isDirty)
-                {
-                    _isDirty = value;
-                    RaisePropertyChanged();
-                    BlockBecameDirty?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
 
         public bool IsExpanded
         {
-            get { return _isExpanded; }
+            get => _isExpanded;
             set
             {
                 _isExpanded = value;
@@ -312,7 +296,7 @@ namespace Filtration.ViewModels
 
         private void OnAddSectionCommand()
         {
-            _parentScriptViewModel.AddSection(this);
+            _parentScriptViewModel.AddCommentBlock(this);
         }
 
         private void OnDeleteBlockCommand()
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs b/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs
new file mode 100644
index 0000000..347da48
--- /dev/null
+++ b/Filtration/ViewModels/ItemFilterBlockViewModelBase.cs
@@ -0,0 +1,42 @@
+using System;
+using Filtration.ObjectModel;
+using GalaSoft.MvvmLight;
+
+namespace Filtration.ViewModels
+{
+    internal interface IItemFilterBlockViewModelBase
+    {
+        void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel);
+        IItemFilterBlockBase BaseBlock { get; }
+        bool IsDirty { get; set; }
+        event EventHandler BlockBecameDirty;
+    }
+
+    internal abstract class ItemFilterBlockViewModelBase : ViewModelBase, IItemFilterBlockViewModelBase
+    {
+        private bool _isDirty;
+
+        public virtual void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
+        {
+            BaseBlock = itemfilterBlock;
+        }
+
+        public event EventHandler BlockBecameDirty;
+
+        public IItemFilterBlockBase BaseBlock { get; protected set; }
+        
+        public bool IsDirty
+        {
+            get => _isDirty;
+            set
+            {
+                if (value != _isDirty)
+                {
+                    _isDirty = value;
+                    RaisePropertyChanged();
+                    BlockBecameDirty?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs b/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs
new file mode 100644
index 0000000..84b292c
--- /dev/null
+++ b/Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs
@@ -0,0 +1,29 @@
+using Filtration.ObjectModel;
+
+namespace Filtration.ViewModels
+{
+    internal interface IItemFilterCommentBlockViewModel : IItemFilterBlockViewModelBase
+    {
+        IItemFilterCommentBlock ItemFilterCommentBlock { get; }
+        string Comment { get; }
+    }
+
+    internal class ItemFilterCommentBlockViewModel : ItemFilterBlockViewModelBase, IItemFilterCommentBlockViewModel
+    {
+        public ItemFilterCommentBlockViewModel()
+        {
+        }
+
+        public override void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
+        {
+            ItemFilterCommentBlock = itemfilterBlock as IItemFilterCommentBlock;
+            BaseBlock = ItemFilterCommentBlock;
+
+            base.Initialise(itemfilterBlock, itemFilterScriptViewModel);
+        }
+
+        public IItemFilterCommentBlock ItemFilterCommentBlock { get; private set; }
+
+        public string Comment => ItemFilterCommentBlock.Comment;
+    }
+}
\ No newline at end of file
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 3aa590a..e76f10f 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,8 +16,11 @@ using Filtration.Common.ViewModels;
 using Filtration.Interface;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Commands;
+using Filtration.ObjectModel.Commands.ItemFilterScript;
 using Filtration.Parser.Interface.Services;
 using Filtration.Services;
+using Filtration.ViewModels.Factories;
 using GalaSoft.MvvmLight.CommandWpf;
 using GalaSoft.MvvmLight.Messaging;
 using NLog;
@@ -24,17 +29,17 @@ namespace Filtration.ViewModels
 {
     internal interface IItemFilterScriptViewModel : IEditableDocument
     {
-        ItemFilterScript Script { get; }
-        IItemFilterBlockViewModel SelectedBlockViewModel { get; set; }
-        IItemFilterBlockViewModel SectionBrowserSelectedBlockViewModel { get; set; }
-        IEnumerable<IItemFilterBlockViewModel> ItemFilterSectionViewModels { get; }
+        IItemFilterScript Script { get; }
+        IItemFilterBlockViewModelBase SelectedBlockViewModel { get; set; }
+        IItemFilterCommentBlockViewModel CommentBlockBrowserBrowserSelectedBlockViewModel { get; set; }
+        IEnumerable<IItemFilterCommentBlockViewModel> ItemFilterCommentBlockViewModels { get; }
         Predicate<IItemFilterBlockViewModel> BlockFilterPredicate { get; set; }
         
         bool ShowAdvanced { get; }
         string Description { get; set; }
         string DisplayName { get; }
         
-        void Initialise(ItemFilterScript itemFilterScript, bool newScript);
+        void Initialise(IItemFilterScript itemFilterScript, bool newScript);
         void RemoveDirtyFlag();
         void SetDirtyFlag();
         bool HasSelectedEnabledBlock();
@@ -58,19 +63,24 @@ namespace Filtration.ViewModels
         RelayCommand<bool> ToggleShowAdvancedCommand { get; }
         RelayCommand ClearFilterCommand { get; }
 
-        void AddSection(IItemFilterBlockViewModel targetBlockViewModel);
-        void AddBlock(IItemFilterBlockViewModel targetBlockViewModel);
-        void CopyBlock(IItemFilterBlockViewModel targetBlockViewModel);
+        void AddCommentBlock(IItemFilterBlockViewModelBase targetBlockViewModel);
+        void AddBlock(IItemFilterBlockViewModelBase targetBlockViewModel);
+        void CopyBlock(IItemFilterBlockViewModelBase targetBlockViewModel);
         void CopyBlockStyle(IItemFilterBlockViewModel targetBlockViewModel);
-        void PasteBlock(IItemFilterBlockViewModel targetBlockViewModel);
+        void PasteBlock(IItemFilterBlockViewModelBase targetBlockViewModel);
         void PasteBlockStyle(IItemFilterBlockViewModel targetBlockViewModel);
+        void DeleteBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase);
+        void MoveBlockToTop(IItemFilterBlockViewModelBase targetBlockViewModelBase);
+        void MoveBlockUp(IItemFilterBlockViewModelBase targetBlockViewModelBase);
+        void MoveBlockDown(IItemFilterBlockViewModelBase targetBlockViewModelBase);
+        void MoveBlockToBottom(IItemFilterBlockViewModelBase targetBlockViewModelBase);
     }
 
     internal class ItemFilterScriptViewModel : PaneViewModel, IItemFilterScriptViewModel
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        private readonly IItemFilterBlockViewModelFactory _itemFilterBlockViewModelFactory;
+        private readonly IItemFilterBlockBaseViewModelFactory _itemFilterBlockBaseViewModelFactory;
         private readonly IItemFilterBlockTranslator _blockTranslator;
         private readonly IAvalonDockWorkspaceViewModel _avalonDockWorkspaceViewModel;
         private readonly IItemFilterPersistenceService _persistenceService;
@@ -79,13 +89,14 @@ namespace Filtration.ViewModels
         private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder;
 
         private bool _isDirty;
-        private IItemFilterBlockViewModel _selectedBlockViewModel;
-        private IItemFilterBlockViewModel _sectionBrowserSelectedBlockViewModel;
-        private readonly ObservableCollection<IItemFilterBlockViewModel> _itemFilterBlockViewModels;
+        private IItemFilterBlockViewModelBase _selectedBlockViewModel;
+        private IItemFilterCommentBlockViewModel _sectionBrowserSelectedBlockViewModel;
+        private readonly ObservableCollection<IItemFilterBlockViewModelBase> _itemFilterBlockViewModels;
         private ICollectionView _itemFilterBlockViewModelsCollectionView;
         private Predicate<IItemFilterBlockViewModel> _blockFilterPredicate;
+        private ICommandManager _scriptCommandManager;
 
-        public ItemFilterScriptViewModel(IItemFilterBlockViewModelFactory itemFilterBlockViewModelFactory,
+        public ItemFilterScriptViewModel(IItemFilterBlockBaseViewModelFactory itemFilterBlockBaseViewModelFactory,
                                          IItemFilterBlockTranslator blockTranslator,
                                          IAvalonDockWorkspaceViewModel avalonDockWorkspaceViewModel,
                                          IItemFilterPersistenceService persistenceService,
@@ -93,7 +104,7 @@ namespace Filtration.ViewModels
                                          IClipboardService clipboardService,
                                          IBlockGroupHierarchyBuilder blockGroupHierarchyBuilder)
         {
-            _itemFilterBlockViewModelFactory = itemFilterBlockViewModelFactory;
+            _itemFilterBlockBaseViewModelFactory = itemFilterBlockBaseViewModelFactory;
             _blockTranslator = blockTranslator;
             _avalonDockWorkspaceViewModel = avalonDockWorkspaceViewModel;
             _avalonDockWorkspaceViewModel.ActiveDocumentChanged += OnActiveDocumentChanged;
@@ -101,18 +112,23 @@ namespace Filtration.ViewModels
             _messageBoxService = messageBoxService;
             _clipboardService = clipboardService;
             _blockGroupHierarchyBuilder = blockGroupHierarchyBuilder;
-            _itemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModel>();
-            
+            _itemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModelBase>();
+
+            _avalonDockWorkspaceViewModel.ActiveDocumentChanged += (s, e) =>
+            {
+                RaisePropertyChanged(nameof(IsActiveDocument));
+            };
+
             ToggleShowAdvancedCommand = new RelayCommand<bool>(OnToggleShowAdvancedCommand);
             ClearFilterCommand = new RelayCommand(OnClearFilterCommand, () => BlockFilterPredicate != null);
             CloseCommand = new RelayCommand(async () => await OnCloseCommand());
             DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand, () => SelectedBlockViewModel != null);
-            MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => SelectedBlockViewModel != null);
-            MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand, () => SelectedBlockViewModel != null);
-            MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand, () => SelectedBlockViewModel != null);
-            MoveBlockToBottomCommand = new RelayCommand(OnMoveBlockToBottomCommand, () => SelectedBlockViewModel != null);
+            MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => SelectedBlockViewModel != null && ItemFilterBlockViewModels.IndexOf(SelectedBlockViewModel) > 0);
+            MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand, () => SelectedBlockViewModel != null && ItemFilterBlockViewModels.IndexOf(SelectedBlockViewModel) > 0);
+            MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand, () => SelectedBlockViewModel != null && ItemFilterBlockViewModels.IndexOf(SelectedBlockViewModel) < ItemFilterBlockViewModels.Count);
+            MoveBlockToBottomCommand = new RelayCommand(OnMoveBlockToBottomCommand, () => SelectedBlockViewModel != null && ItemFilterBlockViewModels.IndexOf(SelectedBlockViewModel) < ItemFilterBlockViewModels.Count);
             AddBlockCommand = new RelayCommand(OnAddBlockCommand);
-            AddSectionCommand = new RelayCommand(OnAddSectionCommand, () => SelectedBlockViewModel != null);
+            AddSectionCommand = new RelayCommand(OnAddCommentBlockCommand, () => SelectedBlockViewModel != null);
             DisableBlockCommand = new RelayCommand(OnDisableBlockCommand, HasSelectedEnabledBlock);
             EnableBlockCommand = new RelayCommand(OnEnableBlockCommand, HasSelectedDisabledBlock);
             CopyBlockCommand = new RelayCommand(OnCopyBlockCommand, () => SelectedBlockViewModel != null);
@@ -129,6 +145,94 @@ namespace Filtration.ViewModels
             IconSource = icon;
         }
 
+        public void Initialise(IItemFilterScript itemFilterScript, bool newScript)
+        {
+            ItemFilterBlockViewModels.Clear();
+
+            Script = itemFilterScript;
+            _scriptCommandManager = Script.CommandManager;
+            AddItemFilterBlockViewModels(Script.ItemFilterBlocks, -1);
+            
+            Script.ItemFilterBlocks.CollectionChanged += ItemFilterBlocksOnCollectionChanged;
+
+            _filenameIsFake = newScript;
+
+            if (newScript)
+            {
+                Script.FilePath = "Untitled.filter";
+            }
+            
+            Title = Filename;
+            ContentId = "ScriptContentId";
+        }
+
+        private void ItemFilterBlocksOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
+        {
+            switch (notifyCollectionChangedEventArgs.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                {
+                    AddItemFilterBlockViewModels(notifyCollectionChangedEventArgs.NewItems.Cast<IItemFilterBlockBase>(), notifyCollectionChangedEventArgs.NewStartingIndex);
+                    break;
+                }
+                case NotifyCollectionChangedAction.Remove:
+                {
+                    RemoveItemFilterBlockviewModels(notifyCollectionChangedEventArgs.OldItems.Cast<IItemFilterBlockBase>());
+                    break;
+                }
+                default:
+                {
+                    Debugger.Break(); // Unhandled NotifyCollectionChangedAction
+                    break;
+                }
+            }
+        }
+
+        private void AddItemFilterBlockViewModels(IEnumerable<IItemFilterBlockBase> itemFilterBlocks, int addAtIndex)
+        {
+            var firstNewViewModel = true;
+
+            foreach (var itemFilterBlock in itemFilterBlocks)
+            {
+                var vm = _itemFilterBlockBaseViewModelFactory.Create(itemFilterBlock);
+                vm.Initialise(itemFilterBlock, this);
+                vm.BlockBecameDirty += OnBlockBecameDirty;
+
+                if (addAtIndex == -1)
+                {
+                    ItemFilterBlockViewModels.Add(vm);
+                }
+                else
+                {
+                    ItemFilterBlockViewModels.Insert(addAtIndex, vm);
+                }
+
+                if (firstNewViewModel)
+                {
+                    SelectedBlockViewModel = vm;
+                    firstNewViewModel = false;
+                }
+            }
+        }
+
+        private void RemoveItemFilterBlockviewModels(IEnumerable<IItemFilterBlockBase> itemFilterBlocks)
+        {
+            foreach (var itemFilterBlock in itemFilterBlocks)
+            {
+                var itemFilterBlockViewModel = ItemFilterBlockViewModels.FirstOrDefault(f => f.BaseBlock == itemFilterBlock);
+                if (itemFilterBlockViewModel == null)
+                {
+                    throw new InvalidOperationException("Item Filter Block removed from model but does not exist in view model!");
+                }
+
+                ItemFilterBlockViewModels.Remove(itemFilterBlockViewModel);
+                if (SelectedBlockViewModel == itemFilterBlockViewModel)
+                {
+                    SelectedBlockViewModel = null;
+                }
+            }
+        }
+
         public RelayCommand<bool> ToggleShowAdvancedCommand { get; }
         public RelayCommand ClearFilterCommand { get; }
         public RelayCommand CloseCommand { get; }
@@ -148,7 +252,19 @@ namespace Filtration.ViewModels
         public RelayCommand ExpandAllBlocksCommand { get; }
         public RelayCommand CollapseAllBlocksCommand { get; }
 
-        public ObservableCollection<IItemFilterBlockViewModel> ItemFilterBlockViewModels
+        public bool IsActiveDocument
+        {
+            get
+            {
+                var isActiveDocument = _avalonDockWorkspaceViewModel.ActiveScriptViewModel == this;
+                Debug.WriteLine($"IsActiveDocument: {isActiveDocument}");
+
+                return isActiveDocument;
+
+            }
+        }
+
+        public ObservableCollection<IItemFilterBlockViewModelBase> ItemFilterBlockViewModels
         {
             get
             {
@@ -162,6 +278,8 @@ namespace Filtration.ViewModels
 
         private bool BlockFilter(object item)
         {
+            if (!(item is IItemFilterBlockViewModelBase)) return false;
+            if (item is IItemFilterCommentBlockViewModel) return true;
             var blockViewModel = item as IItemFilterBlockViewModel;
 
             if (BlockFilterPredicate != null)
@@ -190,62 +308,60 @@ namespace Filtration.ViewModels
 
         public Predicate<IItemFilterBlockViewModel> BlockFilterPredicate
         {
-            get { return _blockFilterPredicate; }
+            get => _blockFilterPredicate;
             set
             {
                 _blockFilterPredicate = value;
-                RaisePropertyChanged("ItemFilterBlockViewModels");
+                RaisePropertyChanged(nameof(ItemFilterBlockViewModels));
             }
         }
 
-        public IEnumerable<IItemFilterBlockViewModel> ItemFilterSectionViewModels
-        {
-            get { return ItemFilterBlockViewModels.Where(b => b.Block.GetType() == typeof (ItemFilterSection)); }
-        }
+        public IEnumerable<IItemFilterCommentBlockViewModel> ItemFilterCommentBlockViewModels => ItemFilterBlockViewModels.OfType<IItemFilterCommentBlockViewModel>();
 
         public bool IsScript => true;
         public bool IsTheme => false;
 
         public string Description
         {
-            get { return Script.Description; }
-            set
-            {
-                Script.Description = value;
-                IsDirty = true;
-                RaisePropertyChanged();
-            }
+            get => Script.Description;
+            set => _scriptCommandManager.ExecuteCommand(new SetScriptDescriptionCommand(Script, value));
         }
 
         public bool ShowAdvanced
         {
-            get { return _showAdvanced; }
+            get => _showAdvanced;
             private set
             {
                 _showAdvanced = value;
                 RaisePropertyChanged();
-                RaisePropertyChanged("ItemFilterBlockViewModels");
+                RaisePropertyChanged(nameof(ItemFilterBlockViewModels));
             }
         }
 
-        public bool HasSelectedBlock()
-        {
-            return SelectedBlockViewModel != null;
-        }
-
         public bool HasSelectedEnabledBlock()
         {
-            return HasSelectedBlock() && !(SelectedBlockViewModel.Block is ItemFilterSection) && SelectedBlockViewModel.BlockEnabled;
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
+            if (selectedBlockViewModel == null) return false;
+
+            return HasSelectedBlock() && selectedBlockViewModel.BlockEnabled;
         }
 
         public bool HasSelectedDisabledBlock()
         {
-            return HasSelectedBlock() && !(SelectedBlockViewModel.Block is ItemFilterSection) && !SelectedBlockViewModel.BlockEnabled;
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
+            if (selectedBlockViewModel == null) return false;
+
+            return HasSelectedBlock() && !selectedBlockViewModel.BlockEnabled;
         }
 
-        public IItemFilterBlockViewModel SelectedBlockViewModel
+        private bool HasSelectedBlock()
         {
-            get { return _selectedBlockViewModel; }
+            return SelectedBlockViewModel != null;
+        }
+
+        public IItemFilterBlockViewModelBase SelectedBlockViewModel
+        {
+            get => _selectedBlockViewModel;
             set
             {
                 if (value != _selectedBlockViewModel)
@@ -257,9 +373,9 @@ namespace Filtration.ViewModels
             }
         }
 
-        public IItemFilterBlockViewModel SectionBrowserSelectedBlockViewModel
+        public IItemFilterCommentBlockViewModel CommentBlockBrowserBrowserSelectedBlockViewModel
         {
-            get { return _sectionBrowserSelectedBlockViewModel; }
+            get => _sectionBrowserSelectedBlockViewModel;
             set
             {
                 _sectionBrowserSelectedBlockViewModel = value;
@@ -268,11 +384,11 @@ namespace Filtration.ViewModels
             }
         }
 
-        public ItemFilterScript Script { get; private set; }
+        public IItemFilterScript Script { get; private set; }
 
         public bool IsDirty
         {
-            get { return _isDirty || HasDirtyChildren; }
+            get => _isDirty || HasDirtyChildren;
             set
             {
                 if (_isDirty != value)
@@ -295,15 +411,15 @@ namespace Filtration.ViewModels
         {
             CleanChildren();
             IsDirty = false;
-            RaisePropertyChanged("Filename");
-            RaisePropertyChanged("DisplayName");
+            RaisePropertyChanged(nameof(Filename));
+            RaisePropertyChanged(nameof(DisplayName));
         }
 
         public void SetDirtyFlag()
         {
             IsDirty = true;
-            RaisePropertyChanged("Filename");
-            RaisePropertyChanged("DisplayName");
+            RaisePropertyChanged(nameof(Filename));
+            RaisePropertyChanged(nameof(DisplayName));
         }
 
         public string DisplayName => !string.IsNullOrEmpty(Filename) ? Filename : Description;
@@ -314,36 +430,7 @@ namespace Filtration.ViewModels
 
         private bool _filenameIsFake;
         private bool _showAdvanced;
-
-        public void Initialise(ItemFilterScript itemFilterScript, bool newScript)
-        {
-            ItemFilterBlockViewModels.Clear();
-
-            Script = itemFilterScript;
-            foreach (var block in Script.ItemFilterBlocks)
-            {
-                var vm = _itemFilterBlockViewModelFactory.Create();
-                vm.Initialise(block, this);
-                vm.BlockBecameDirty += OnBlockBecameDirty;
-                ItemFilterBlockViewModels.Add(vm);
-            }
-           
-            _filenameIsFake = newScript;
-
-            if (newScript)
-            {
-                Script.FilePath = "Untitled.filter";
-            }
-
-            if (ItemFilterBlockViewModels.Count > 0)
-            {
-                SelectedBlockViewModel = ItemFilterBlockViewModels.First();
-            }
-
-            Title = Filename;
-            ContentId = "ScriptContentId";
-        }
-
+        
         public async Task SaveAsync()
         {
             if (!ValidateScript()) return;
@@ -426,7 +513,7 @@ namespace Filtration.ViewModels
             var unusedThemeComponents =
                 Script.ThemeComponents.Where(
                     t =>
-                        Script.ItemFilterBlocks.Count(
+                        Script.ItemFilterBlocks.OfType<ItemFilterBlock>().Count(
                             b => b.BlockItems.OfType<ColorBlockItem>().Count(i => i.ThemeComponent == t) > 0) == 0).ToList();
 
             if (unusedThemeComponents.Count <= 0) return true;
@@ -550,23 +637,25 @@ namespace Filtration.ViewModels
             CopyBlock(SelectedBlockViewModel);
         }
 
-        public void CopyBlock(IItemFilterBlockViewModel targetBlockViewModel)
+        public void CopyBlock(IItemFilterBlockViewModelBase targetBlockViewModel)
         {
             try
             {
-                _clipboardService.SetClipboardText(
-                    _blockTranslator.TranslateItemFilterBlockToString(SelectedBlockViewModel.Block));
+                _clipboardService.SetClipboardText(_blockTranslator.TranslateItemFilterBlockBaseToString(SelectedBlockViewModel.BaseBlock));
             }
             catch
             {
-                _messageBoxService.Show("Clipboard Error", "Failed to access the clipboard, copy command not completed.",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
+                _messageBoxService.Show("Clipboard Error", "Failed to access the clipboard, copy command not completed.", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
         private void OnCopyBlockStyleCommand()
         {
-            CopyBlockStyle(SelectedBlockViewModel);
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
+            if (selectedBlockViewModel != null)
+            {
+                CopyBlockStyle(selectedBlockViewModel);
+            }
         }
 
         public void CopyBlockStyle(IItemFilterBlockViewModel targetBlockViewModel)
@@ -594,7 +683,11 @@ namespace Filtration.ViewModels
 
         private void OnPasteBlockStyleCommand()
         {
-            PasteBlockStyle(SelectedBlockViewModel);
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
+            if (selectedBlockViewModel != null)
+            {
+                PasteBlockStyle(selectedBlockViewModel);
+            }
         }
 
         public void PasteBlockStyle(IItemFilterBlockViewModel targetBlockViewModel)
@@ -614,45 +707,24 @@ namespace Filtration.ViewModels
             PasteBlock(SelectedBlockViewModel);
         }
 
-        public void PasteBlock(IItemFilterBlockViewModel targetBlockViewModel)
+        public void PasteBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
             try
             {
                 var clipboardText = _clipboardService.GetClipboardText();
                 if (string.IsNullOrEmpty(clipboardText)) return;
-                _blockGroupHierarchyBuilder.Initialise(Script.ItemFilterBlockGroups.First());
-
-                var translatedBlock = _blockTranslator.TranslateStringToItemFilterBlock(clipboardText, Script.ThemeComponents);
+                
+                var translatedBlock = _blockTranslator.TranslateStringToItemFilterBlock(clipboardText, Script, true); // TODO: Doesn't handle pasting comment blocks?
                 if (translatedBlock == null) return;
 
-                var vm = _itemFilterBlockViewModelFactory.Create();
-                vm.Initialise(translatedBlock, this);
-
-                if (ItemFilterBlockViewModels.Count > 0)
-                {
-                    Script.ItemFilterBlocks.Insert(Script.ItemFilterBlocks.IndexOf(targetBlockViewModel.Block) + 1,
-                        translatedBlock);
-                    ItemFilterBlockViewModels.Insert(ItemFilterBlockViewModels.IndexOf(targetBlockViewModel) + 1, vm);
-                }
-                else
-                {
-                    Script.ItemFilterBlocks.Add(translatedBlock);
-                    ItemFilterBlockViewModels.Add(vm);
-                }
-
-                vm.BlockBecameDirty += OnBlockBecameDirty;
-
-                SelectedBlockViewModel = vm;
-                IsDirty = true;
+                _scriptCommandManager.ExecuteCommand(new PasteBlockCommand(Script, translatedBlock, targetBlockViewModelBase.BaseBlock));
             }
             catch (Exception e)
             {
                 Logger.Error(e);
                 var innerException = e.InnerException?.Message ?? string.Empty;
 
-                _messageBoxService.Show("Paste Error",
-                    e.Message + Environment.NewLine + innerException, MessageBoxButton.OK,
-                    MessageBoxImage.Error);
+                _messageBoxService.Show("Paste Error", e.Message + Environment.NewLine + innerException, MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -661,40 +733,14 @@ namespace Filtration.ViewModels
             MoveBlockToTop(SelectedBlockViewModel);
         }
 
-        public void MoveBlockToTop(IItemFilterBlockViewModel targetBlockViewModel)
-        {
-            var currentIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModel);
-
-            if (currentIndex > 0)
-            {
-                var block = targetBlockViewModel.Block;
-                Script.ItemFilterBlocks.Remove(block);
-                Script.ItemFilterBlocks.Insert(0, block);
-                ItemFilterBlockViewModels.Move(currentIndex, 0);
-                IsDirty = true;
-                RaisePropertyChanged(nameof(ItemFilterSectionViewModels));
-            }
-        }
-
         private void OnMoveBlockUpCommand()
         {
             MoveBlockUp(SelectedBlockViewModel);
         }
 
-        public void MoveBlockUp(IItemFilterBlockViewModel targetBlockViewModel)
+        public void MoveBlockUp(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
-            var currentIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModel);
-
-            if (currentIndex > 0)
-            {
-                var block = targetBlockViewModel.Block;
-                var blockPos = Script.ItemFilterBlocks.IndexOf(block);
-                Script.ItemFilterBlocks.RemoveAt(blockPos);
-                Script.ItemFilterBlocks.Insert(blockPos - 1, block);
-                ItemFilterBlockViewModels.Move(currentIndex, currentIndex - 1);
-                IsDirty = true;
-                RaisePropertyChanged(nameof(ItemFilterSectionViewModels));
-            }
+            _scriptCommandManager.ExecuteCommand(new MoveBlockUpCommand(Script, targetBlockViewModelBase?.BaseBlock));
         }
 
         private void OnMoveBlockDownCommand()
@@ -702,20 +748,9 @@ namespace Filtration.ViewModels
             MoveBlockDown(SelectedBlockViewModel);
         }
 
-        public void MoveBlockDown(IItemFilterBlockViewModel targetBlockViewModel)
+        public void MoveBlockDown(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
-            var currentIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModel);
-
-            if (currentIndex < ItemFilterBlockViewModels.Count - 1)
-            {
-                var block = targetBlockViewModel.Block;
-                var blockPos = Script.ItemFilterBlocks.IndexOf(block);
-                Script.ItemFilterBlocks.RemoveAt(blockPos);
-                Script.ItemFilterBlocks.Insert(blockPos + 1, block);
-                ItemFilterBlockViewModels.Move(currentIndex, currentIndex + 1);
-                IsDirty = true;
-                RaisePropertyChanged(nameof(ItemFilterSectionViewModels));
-            }
+            _scriptCommandManager.ExecuteCommand(new MoveBlockDownCommand(Script, targetBlockViewModelBase?.BaseBlock));
         }
 
         private void OnMoveBlockToBottomCommand()
@@ -723,47 +758,35 @@ namespace Filtration.ViewModels
             MoveBlockToBottom(SelectedBlockViewModel);
         }
 
-        public void MoveBlockToBottom(IItemFilterBlockViewModel targetBlockViewModel)
-        {
-            var currentIndex = ItemFilterBlockViewModels.IndexOf(targetBlockViewModel);
-
-            if (currentIndex < ItemFilterBlockViewModels.Count - 1)
-            {
-                var block = targetBlockViewModel.Block;
-                Script.ItemFilterBlocks.Remove(block);
-                Script.ItemFilterBlocks.Add(block);
-                ItemFilterBlockViewModels.Move(currentIndex, ItemFilterBlockViewModels.Count - 1);
-                IsDirty = true;
-                RaisePropertyChanged(nameof(ItemFilterSectionViewModels));
-            }
-        }
-
         private void OnAddBlockCommand()
         {
             AddBlock(SelectedBlockViewModel);
         }
 
-        public void AddBlock(IItemFilterBlockViewModel targetBlockViewModel)
+        public void AddBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
         {
-            var vm = _itemFilterBlockViewModelFactory.Create();
-            var newBlock = new ItemFilterBlock();
-            vm.Initialise(newBlock, this);
+            _scriptCommandManager.ExecuteCommand(new AddBlockCommand(Script, targetBlockViewModelBase?.BaseBlock));
+            // TODO: Expand new viewmodel
+        }
 
-            if (targetBlockViewModel != null)
-            {
-                Script.ItemFilterBlocks.Insert(Script.ItemFilterBlocks.IndexOf(targetBlockViewModel.Block) + 1, newBlock);
-                ItemFilterBlockViewModels.Insert(ItemFilterBlockViewModels.IndexOf(targetBlockViewModel) + 1, vm);
-            }
-            else
-            {
-                Script.ItemFilterBlocks.Add(newBlock);
-                ItemFilterBlockViewModels.Add(vm);
-            }
+        public void AddCommentBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
+        {
+            _scriptCommandManager.ExecuteCommand(new AddCommentBlockCommand(Script, targetBlockViewModelBase.BaseBlock));
+        }
 
-            vm.BlockBecameDirty += OnBlockBecameDirty;
-            SelectedBlockViewModel = vm;
-            vm.IsExpanded = true;
-            IsDirty = true;
+        public void DeleteBlock(IItemFilterBlockViewModelBase targetBlockViewModelBase)
+        {
+            _scriptCommandManager.ExecuteCommand(new RemoveBlockCommand(Script, targetBlockViewModelBase.BaseBlock));
+        }
+
+        public void MoveBlockToBottom(IItemFilterBlockViewModelBase targetBlockViewModelBase)
+        {
+            _scriptCommandManager.ExecuteCommand(new MoveBlockToBottomCommand(Script, targetBlockViewModelBase.BaseBlock));
+        }
+
+        public void MoveBlockToTop(IItemFilterBlockViewModelBase targetBlockViewModelBase)
+        {
+            _scriptCommandManager.ExecuteCommand(new MoveBlockToTopCommand(Script, targetBlockViewModelBase.BaseBlock));
         }
 
         private void OnBlockBecameDirty(object sender, EventArgs e)
@@ -771,28 +794,14 @@ namespace Filtration.ViewModels
             SetDirtyFlag();
         }
 
-        private void OnAddSectionCommand()
+        private void OnAddCommentBlockCommand()
         {
-            AddSection(SelectedBlockViewModel);
-        }
-        
-        public void AddSection(IItemFilterBlockViewModel targetBlockViewModel)
-        {
-            var vm = _itemFilterBlockViewModelFactory.Create();
-            var newSection = new ItemFilterSection { Description = "New Section" };
-            vm.Initialise(newSection, this);
-
-            Script.ItemFilterBlocks.Insert(Script.ItemFilterBlocks.IndexOf(targetBlockViewModel.Block), newSection);
-            ItemFilterBlockViewModels.Insert(ItemFilterBlockViewModels.IndexOf(targetBlockViewModel), vm);
-            IsDirty = true;
-            SelectedBlockViewModel = vm;
-            RaisePropertyChanged(nameof(ItemFilterSectionViewModels));
-            Messenger.Default.Send(new NotificationMessage("SectionsChanged"));
+            AddCommentBlock(SelectedBlockViewModel);
         }
 
         private void OnExpandAllBlocksCommand()
         {
-            foreach (var blockViewModel in ItemFilterBlockViewModels)
+            foreach (var blockViewModel in ItemFilterBlockViewModels.OfType<IItemFilterBlockViewModel>())
             {
                 blockViewModel.IsExpanded = true;
             }
@@ -800,7 +809,7 @@ namespace Filtration.ViewModels
 
         private void OnCollapseAllBlocksCommand()
         {
-            foreach (var blockViewModel in ItemFilterBlockViewModels)
+            foreach (var blockViewModel in ItemFilterBlockViewModels.OfType<IItemFilterBlockViewModel>())
             {
                 blockViewModel.IsExpanded = false;
             }
@@ -811,49 +820,22 @@ namespace Filtration.ViewModels
             DeleteBlock(SelectedBlockViewModel);
         }
 
-        public void DeleteBlock(IItemFilterBlockViewModel targetBlockViewModel)
-        {
-            var result = _messageBoxService.Show("Delete Confirmation", "Are you sure you wish to delete this block?",
-                MessageBoxButton.YesNo,
-                MessageBoxImage.Question);
-            
-            if (result == MessageBoxResult.Yes)
-            {
-                var isSection = targetBlockViewModel.Block is ItemFilterSection;
-
-                Script.ItemFilterBlocks.Remove(targetBlockViewModel.Block);
-                ItemFilterBlockViewModels.Remove(targetBlockViewModel);
-                IsDirty = true;
-
-                targetBlockViewModel.BlockBecameDirty -= OnBlockBecameDirty;
-
-                if (isSection)
-                {
-                    Messenger.Default.Send(new NotificationMessage("SectionsChanged"));
-                }
-
-            }
-            SelectedBlockViewModel = null;
-        }
-
         private void OnDisableBlockCommand()
         {
-            DisableBlock(SelectedBlockViewModel);
-        }
-
-        private void DisableBlock(IItemFilterBlockViewModel targetBlockViewModel)
-        {
-            targetBlockViewModel.BlockEnabled = false;
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
+            if (selectedBlockViewModel != null)
+            {
+                selectedBlockViewModel.BlockEnabled = false;
+            }
         }
 
         private void OnEnableBlockCommand()
         {
-            EnableBlock(SelectedBlockViewModel);
-        }
-
-        private void EnableBlock(IItemFilterBlockViewModel targetBlockViewModel)
-        {
-            targetBlockViewModel.BlockEnabled = true;
+            var selectedBlockViewModel = SelectedBlockViewModel as IItemFilterBlockViewModel;
+            if (selectedBlockViewModel != null)
+            {
+                selectedBlockViewModel.BlockEnabled = true;
+            }
         }
     }
 }
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index 79444f5..7fe247c 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -85,6 +85,11 @@ namespace Filtration.ViewModels
             PasteCommand = new RelayCommand(OnPasteCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
             PasteBlockStyleCommand = new RelayCommand(OnPasteBlockStyleCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
 
+            // TODO: Only enabled if undo/redo available
+            UndoCommand = new RelayCommand(OnUndoCommand, () => ActiveDocumentIsScript);
+            RedoCommand = new RelayCommand(OnRedoCommand, () => ActiveDocumentIsScript);
+
+
             MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
             MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
             MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => ActiveDocumentIsScript && ActiveScriptHasSelectedBlock);
@@ -191,6 +196,9 @@ namespace Filtration.ViewModels
         public RelayCommand OpenAboutWindowCommand { get; }
         public RelayCommand ReplaceColorsCommand { get; }
 
+        public RelayCommand UndoCommand { get;}
+        public RelayCommand RedoCommand { get; }
+
         public RelayCommand EditMasterThemeCommand { get; }
         public RelayCommand CreateThemeCommand { get; }
         public RelayCommand ApplyThemeToScriptCommand { get; }
@@ -216,7 +224,7 @@ namespace Filtration.ViewModels
 
         public RelayCommand<bool> ToggleShowAdvancedCommand { get; }
         public RelayCommand ClearFiltersCommand { get; }
-        
+
         public ImageSource Icon { get; private set; }
 
         public IAvalonDockWorkspaceViewModel AvalonDockWorkspaceViewModel => _avalonDockWorkspaceViewModel;
@@ -334,7 +342,7 @@ namespace Filtration.ViewModels
                 return;
             }
 
-            await LoadScriptAsync(filePath);
+            await LoadScriptAsync(filePath); // TODO: fix crash
         }
 
         private async Task LoadScriptAsync(string scriptFilename)
@@ -346,20 +354,19 @@ namespace Filtration.ViewModels
             {
                 loadedViewModel = await _itemFilterScriptRepository.LoadScriptFromFileAsync(scriptFilename);
             }
-            catch (IOException e)
+            catch (Exception e)
             {
-                Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
-                if (Logger.IsErrorEnabled)
-                {
-                    Logger.Error(e);
-                }
+                Logger.Error(e);
                 _messageBoxService.Show("Script Load Error", "Error loading filter script - " + e.Message,
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
                 return;
             }
+            finally
+            {
+                Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
+            }
 
-            Messenger.Default.Send(new NotificationMessage("HideLoadingBanner"));
             _avalonDockWorkspaceViewModel.AddDocument(loadedViewModel);
         }
 
@@ -382,12 +389,9 @@ namespace Filtration.ViewModels
             {
                 loadedViewModel = await _themeProvider.LoadThemeFromFile(themeFilename);
             }
-            catch (IOException e)
+            catch (Exception e)
             {
-                if (Logger.IsErrorEnabled)
-                {
-                    Logger.Error(e);
-                }
+                Logger.Error(e);
                 _messageBoxService.Show("Theme Load Error", "Error loading filter theme - " + e.Message,
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
@@ -525,6 +529,16 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveScriptViewModel.PasteBlockStyleCommand.Execute(null);
         }
 
+        private void OnUndoCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.Script.CommandManager.Undo();
+        }
+
+        private void OnRedoCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveScriptViewModel.Script.CommandManager.Redo();
+        }
+
         private void OnNewScriptCommand()
         {
             var newViewModel = _itemFilterScriptRepository.NewScript();
diff --git a/Filtration/ViewModels/ReplaceColorsViewModel.cs b/Filtration/ViewModels/ReplaceColorsViewModel.cs
index 8c4b77e..a9dc2e7 100644
--- a/Filtration/ViewModels/ReplaceColorsViewModel.cs
+++ b/Filtration/ViewModels/ReplaceColorsViewModel.cs
@@ -1,7 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Media;
-using Filtration.Common.ViewModels;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.Views;
@@ -13,13 +12,13 @@ namespace Filtration.ViewModels
 {
     internal interface IReplaceColorsViewModel
     {
-        void Initialise(ItemFilterScript itemFilterScript, IItemFilterBlock initialiseFromBlock);
-        void Initialise(ItemFilterScript itemFilterScript);
+        void Initialise(IItemFilterScript itemFilterScript, IItemFilterBlock initialiseFromBlock);
+        void Initialise(IItemFilterScript itemFilterScript);
     }
 
     internal class ReplaceColorsViewModel : ViewModelBase, IReplaceColorsViewModel
     {
-        private ItemFilterScript _itemFilterScript;
+        private IItemFilterScript _itemFilterScript;
         private ReplaceColorsParameterSet _replaceColorsParameterSet;
 
         public ReplaceColorsViewModel()
@@ -29,7 +28,7 @@ namespace Filtration.ViewModels
 
         public RelayCommand ReplaceColorsCommand { get; private set; }
 
-        public void Initialise(ItemFilterScript itemFilterScript, IItemFilterBlock initialiseFromBlock)
+        public void Initialise(IItemFilterScript itemFilterScript, IItemFilterBlock initialiseFromBlock)
         {
             _replaceColorsParameterSet = new ReplaceColorsParameterSet();
 
@@ -67,7 +66,7 @@ namespace Filtration.ViewModels
 
         public Color NewTextColor
         {
-            get { return _replaceColorsParameterSet.NewTextColor; }
+            get => _replaceColorsParameterSet.NewTextColor;
             set
             {
                 _replaceColorsParameterSet.NewTextColor = value;
@@ -82,7 +81,7 @@ namespace Filtration.ViewModels
 
         public bool ReplaceTextColor
         {
-            get { return _replaceColorsParameterSet.ReplaceTextColor; }
+            get => _replaceColorsParameterSet.ReplaceTextColor;
             set
             {
                 _replaceColorsParameterSet.ReplaceTextColor = value;
@@ -92,7 +91,7 @@ namespace Filtration.ViewModels
 
         public Color NewBackgroundColor
         {
-            get { return _replaceColorsParameterSet.NewBackgroundColor; }
+            get => _replaceColorsParameterSet.NewBackgroundColor;
             set
             {
                 _replaceColorsParameterSet.NewBackgroundColor = value;
@@ -107,7 +106,7 @@ namespace Filtration.ViewModels
 
         public bool ReplaceBackgroundColor
         {
-            get { return _replaceColorsParameterSet.ReplaceBackgroundColor; }
+            get => _replaceColorsParameterSet.ReplaceBackgroundColor;
             set
             {
                 _replaceColorsParameterSet.ReplaceBackgroundColor = value;
@@ -117,7 +116,7 @@ namespace Filtration.ViewModels
 
         public Color NewBorderColor
         {
-            get { return _replaceColorsParameterSet.NewBorderColor; }
+            get => _replaceColorsParameterSet.NewBorderColor;
             set
             {
                 _replaceColorsParameterSet.NewBorderColor = value;
@@ -132,7 +131,7 @@ namespace Filtration.ViewModels
 
         public bool ReplaceBorderColor
         {
-            get { return _replaceColorsParameterSet.ReplaceBorderColor; }
+            get => _replaceColorsParameterSet.ReplaceBorderColor;
             set
             {
                 _replaceColorsParameterSet.ReplaceBorderColor = value;
@@ -142,7 +141,7 @@ namespace Filtration.ViewModels
 
         public ReplaceColorsParameterSet ReplaceColorsParameterSet => _replaceColorsParameterSet;
 
-        public void Initialise(ItemFilterScript itemFilterScript)
+        public void Initialise(IItemFilterScript itemFilterScript)
         {
             _replaceColorsParameterSet = new ReplaceColorsParameterSet();
             _itemFilterScript = itemFilterScript;
diff --git a/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs b/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
index 92d9152..a13f3c4 100644
--- a/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows.Media.Imaging;
-using Filtration.Utilities;
 using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Messaging;
 
@@ -15,13 +15,11 @@ namespace Filtration.ViewModels.ToolPanes
 
     internal class BlockGroupBrowserViewModel : ToolViewModel, IBlockGroupBrowserViewModel
     {
-        private readonly IBlockGroupMapper _blockGroupMapper;
         private ObservableCollection<ItemFilterBlockGroupViewModel> _blockGroupViewModelViewModels;
         private ItemFilterBlockGroupViewModel _selectedBlockGroupViewModel;
 
-        public BlockGroupBrowserViewModel(IBlockGroupMapper blockGroupMapper) : base("Block Group Browser")
+        public BlockGroupBrowserViewModel() : base("Block Group Browser")
         {
-            _blockGroupMapper = blockGroupMapper;
             FilterToSelectedBlockGroupCommand = new RelayCommand(OnFilterToSelectedBlockGroupCommand, () => SelectedBlockGroupViewModel != null);
 
             ContentId = ToolContentId;
@@ -60,7 +58,7 @@ namespace Filtration.ViewModels.ToolPanes
 
         public ItemFilterBlockGroupViewModel SelectedBlockGroupViewModel
         {
-            get { return _selectedBlockGroupViewModel; }
+            get => _selectedBlockGroupViewModel;
             set
             {
                 _selectedBlockGroupViewModel = value;
@@ -73,7 +71,7 @@ namespace Filtration.ViewModels.ToolPanes
         
         public ObservableCollection<ItemFilterBlockGroupViewModel> BlockGroupViewModels
         {
-            get { return _blockGroupViewModelViewModels; }
+            get => _blockGroupViewModelViewModels;
             private set
             {
                 _blockGroupViewModelViewModels = value;
@@ -94,9 +92,11 @@ namespace Filtration.ViewModels.ToolPanes
 
         private ObservableCollection<ItemFilterBlockGroupViewModel> RebuildBlockGroupViewModels(bool showAdvanced)
         {
-            return
-                _blockGroupMapper.MapBlockGroupsToViewModels(
-                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script.ItemFilterBlockGroups, showAdvanced);
+            // This assumes that there will only ever be a single root node.
+            return new ObservableCollection<ItemFilterBlockGroupViewModel>
+            (
+                new ItemFilterBlockGroupViewModel(AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script.ItemFilterBlockGroups.First(), showAdvanced, null).ChildGroups
+            );
         }
 
         private void OnFilterToSelectedBlockGroupCommand()
diff --git a/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs b/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs
index 4942333..0ae6ed7 100644
--- a/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs
@@ -73,8 +73,8 @@ namespace Filtration.ViewModels.ToolPanes
             }
 
             PreviewText =
-                _itemFilterBlockTranslator.TranslateItemFilterBlockToString(
-                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModel.Block);
+                _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(
+                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModel.BaseBlock);
         }
     }
 }
diff --git a/Filtration/ViewModels/ToolPanes/SectionBrowserViewModel.cs b/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
similarity index 60%
rename from Filtration/ViewModels/ToolPanes/SectionBrowserViewModel.cs
rename to Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
index c411a3f..4e015ba 100644
--- a/Filtration/ViewModels/ToolPanes/SectionBrowserViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
@@ -5,18 +5,18 @@ using GalaSoft.MvvmLight.Messaging;
 
 namespace Filtration.ViewModels.ToolPanes
 {
-    internal interface ISectionBrowserViewModel : IToolViewModel
+    internal interface ICommentBlockBrowserViewModel : IToolViewModel
     {
         void ClearDown();
         bool IsVisible { get; set; }
     }
 
-    internal class SectionBrowserViewModel : ToolViewModel, ISectionBrowserViewModel
+    internal class CommentBlockBrowserViewModel : ToolViewModel, ICommentBlockBrowserViewModel
     {
-        private IEnumerable<IItemFilterBlockViewModel> _sectionBlockViewModels;
-        private IItemFilterBlockViewModel _selectedSectionBlockViewModel;
+        private IEnumerable<IItemFilterCommentBlockViewModel> _itemFilterCommentBlockViewModels;
+        private IItemFilterCommentBlockViewModel _selectedItemFilterCommentBlockViewModel;
 
-        public SectionBrowserViewModel() : base("Section Browser")
+        public CommentBlockBrowserViewModel() : base("Section Browser")
         {
             ContentId = ToolContentId;
             var icon = new BitmapImage();
@@ -40,25 +40,25 @@ namespace Filtration.ViewModels.ToolPanes
 
         public const string ToolContentId = "SectionBrowserTool";
 
-        public IEnumerable<IItemFilterBlockViewModel> SectionBlockViewModels
+        public IEnumerable<IItemFilterCommentBlockViewModel> ItemFilterCommentBlockViewModels
         {
-            get { return _sectionBlockViewModels; }
+            get => _itemFilterCommentBlockViewModels;
             private set
             {
-                _sectionBlockViewModels = value;
+                _itemFilterCommentBlockViewModels = value;
                 RaisePropertyChanged();
             }
         }
 
-        public IItemFilterBlockViewModel SelectedSectionBlockViewModel
+        public IItemFilterCommentBlockViewModel SelectedItemFilterCommentBlockViewModel
         {
-            get { return _selectedSectionBlockViewModel; }
+            get => _selectedItemFilterCommentBlockViewModel;
             set
             {
-                _selectedSectionBlockViewModel = value;
+                _selectedItemFilterCommentBlockViewModel = value;
                 if (AvalonDockWorkspaceViewModel.ActiveDocument.IsScript)
                 {
-                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SectionBrowserSelectedBlockViewModel = value;
+                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.CommentBlockBrowserBrowserSelectedBlockViewModel = value;
                 }
                 RaisePropertyChanged();
             }
@@ -68,7 +68,7 @@ namespace Filtration.ViewModels.ToolPanes
         {
             if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel != null && AvalonDockWorkspaceViewModel.ActiveDocument.IsScript)
             {
-                SectionBlockViewModels = AvalonDockWorkspaceViewModel.ActiveScriptViewModel.ItemFilterSectionViewModels;
+                ItemFilterCommentBlockViewModels = AvalonDockWorkspaceViewModel.ActiveScriptViewModel.ItemFilterCommentBlockViewModels;
             }
             else
             {
@@ -78,8 +78,8 @@ namespace Filtration.ViewModels.ToolPanes
 
         public void ClearDown()
         {
-            SectionBlockViewModels = null;
-            SelectedSectionBlockViewModel = null;
+            ItemFilterCommentBlockViewModels = null;
+            SelectedItemFilterCommentBlockViewModel = null;
         }
     }
 }
diff --git a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
index 5bbd499..2ce3949 100644
--- a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
+++ b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
@@ -43,7 +43,7 @@
                     </viewsAvalonDock:PanesTemplateSelector.BlockGroupBrowserTemplate>
                     <viewsAvalonDock:PanesTemplateSelector.SectionBrowserTemplate>
                         <DataTemplate>
-                            <toolPanes:SectionBrowserView DataContext="{Binding}" />
+                            <toolPanes:CommentBlockBrowserView DataContext="{Binding}" />
                         </DataTemplate>
                     </viewsAvalonDock:PanesTemplateSelector.SectionBrowserTemplate>
                     <viewsAvalonDock:PanesTemplateSelector.BlockOutputPreviewTemplate>
diff --git a/Filtration/Views/AvalonDock/LayoutInitializer.cs b/Filtration/Views/AvalonDock/LayoutInitializer.cs
index 5be2905..b1654b3 100644
--- a/Filtration/Views/AvalonDock/LayoutInitializer.cs
+++ b/Filtration/Views/AvalonDock/LayoutInitializer.cs
@@ -15,7 +15,7 @@ namespace Filtration.Views.AvalonDock
             if (destinationContainer?.FindParent<LayoutFloatingWindow>() != null)
                 return false;
 
-            if (anchorableToShow.Content is SectionBrowserViewModel)
+            if (anchorableToShow.Content is CommentBlockBrowserViewModel)
             {
                 var toolsPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "SectionBrowserPane");
                 if (toolsPane != null)
diff --git a/Filtration/Views/AvalonDock/PanesTemplateSelector.cs b/Filtration/Views/AvalonDock/PanesTemplateSelector.cs
index 777aac6..a256dda 100644
--- a/Filtration/Views/AvalonDock/PanesTemplateSelector.cs
+++ b/Filtration/Views/AvalonDock/PanesTemplateSelector.cs
@@ -30,7 +30,7 @@ namespace Filtration.Views.AvalonDock
                 return ThemeTemplate;
             }
 
-            if (item is SectionBrowserViewModel)
+            if (item is CommentBlockBrowserViewModel)
             {
                 return SectionBrowserTemplate;
             }
diff --git a/Filtration/Views/BlockTemplateSelector.cs b/Filtration/Views/BlockTemplateSelector.cs
deleted file mode 100644
index 4237bfb..0000000
--- a/Filtration/Views/BlockTemplateSelector.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using Filtration.ObjectModel;
-using Filtration.ViewModels;
-
-namespace Filtration.Views
-{
-    public class BlockTemplateSelector : DataTemplateSelector
-    {
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
-        {
-            var viewModel = item as ItemFilterBlockViewModel;
-            var element = container as FrameworkElement;
-
-            if (viewModel == null || element == null)
-                return null;
-
-            if (viewModel.Block is ItemFilterSection)
-            {
-                return element.FindResource("ItemFilterSectionTemplate") as DataTemplate;
-            }
-
-            return element.FindResource("ItemFilterBlockTemplate") as DataTemplate;
-        }
-    }
-}
diff --git a/Filtration/Views/IconsDictionary.xaml b/Filtration/Views/IconsDictionary.xaml
index 281fa83..e3e426c 100644
--- a/Filtration/Views/IconsDictionary.xaml
+++ b/Filtration/Views/IconsDictionary.xaml
@@ -30,6 +30,8 @@
     <Image Source="/Filtration;component/Resources/Icons/PasteStyle.ico" x:Key="PasteStyleIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/filtration_icon.png" x:Key="FiltrationIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/Add.ico" x:Key="AddIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/undo_icon.png" x:Key="UndoIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/redo_icon.png" x:Key="RedoIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/ThemeComponentDelete.ico" x:Key="ThemeComponentDeleteIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/standby_enabled_icon.png" x:Key="StandbyEnabledIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/standby_disabled_icon.png" x:Key="StandbyDisabledIcon" x:Shared="False" />
diff --git a/Filtration/Views/ItemFilterSectionView.xaml b/Filtration/Views/ItemFilterCommentBlockView.xaml
similarity index 91%
rename from Filtration/Views/ItemFilterSectionView.xaml
rename to Filtration/Views/ItemFilterCommentBlockView.xaml
index 6310125..6531030 100644
--- a/Filtration/Views/ItemFilterSectionView.xaml
+++ b/Filtration/Views/ItemFilterCommentBlockView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Filtration.Views.ItemFilterSectionView"
+<UserControl x:Class="Filtration.Views.ItemFilterCommentBlockView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModels="clr-namespace:Filtration.ViewModels"
-             d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterBlockViewModel}"
+             d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterCommentBlockViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="50" d:DesignWidth="300">
     <UserControl.Resources>
@@ -45,7 +45,7 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <TextBox Grid.Column ="0" Text="{Binding BlockDescription, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextWrapping="Wrap" MinWidth="150"/>
+                <TextBox Grid.Column ="0" Text="{Binding Comment, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" VerticalAlignment="Center" TextWrapping="Wrap" MinWidth="150"/>
             </Grid>
         </Border>
     </Grid>
diff --git a/Filtration/Views/ItemFilterSectionView.xaml.cs b/Filtration/Views/ItemFilterCommentBlockView.xaml.cs
similarity index 51%
rename from Filtration/Views/ItemFilterSectionView.xaml.cs
rename to Filtration/Views/ItemFilterCommentBlockView.xaml.cs
index 4e241ed..8492b8a 100644
--- a/Filtration/Views/ItemFilterSectionView.xaml.cs
+++ b/Filtration/Views/ItemFilterCommentBlockView.xaml.cs
@@ -1,8 +1,8 @@
 namespace Filtration.Views
 {
-    public partial class ItemFilterSectionView
+    public partial class ItemFilterCommentBlockView
     {
-        public ItemFilterSectionView()
+        public ItemFilterCommentBlockView()
         {
             InitializeComponent();
         }
diff --git a/Filtration/Views/ItemFilterScriptView.xaml b/Filtration/Views/ItemFilterScriptView.xaml
index d6279ee..f258054 100644
--- a/Filtration/Views/ItemFilterScriptView.xaml
+++ b/Filtration/Views/ItemFilterScriptView.xaml
@@ -7,6 +7,7 @@
              xmlns:attachedProperties="clr-namespace:Filtration.Views.AttachedProperties"
              xmlns:viewModels="clr-namespace:Filtration.ViewModels"
              xmlns:userControls="clr-namespace:Filtration.UserControls"
+             xmlns:utility="clr-namespace:Filtration.Utility"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterScriptViewModel}"
              d:DesignHeight="300" d:DesignWidth="600">
@@ -16,19 +17,19 @@
         <KeyBinding Command="{Binding CopyBlockStyleCommand}" Modifiers="Shift+Control" Key="C" />
         <KeyBinding Command="{Binding PasteBlockStyleCommand}" Modifiers="Shift+Control" Key="V" />
     </UserControl.InputBindings>
+    <!--<utility:RoutedCommandHandlers.Commands>
+        <utility:RoutedCommandHandler RoutedCommand="{StaticResource MoveBlockUpRoutedCommand}" Command="{Binding MoveBlockUpCommand}" IsActive="{Binding IsActiveDocument}" />
+    </utility:RoutedCommandHandlers.Commands>-->
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary>
-                    <!-- ReSharper disable once Xaml.RedundantResource -->
-                    <DataTemplate x:Key="ItemFilterBlockTemplate">
+                    <DataTemplate DataType="{x:Type viewModels:ItemFilterBlockViewModel}">
                         <views:ItemFilterBlockView Margin="1" />
                     </DataTemplate>
-                    <!-- ReSharper disable once Xaml.RedundantResource -->
-                    <DataTemplate x:Key="ItemFilterSectionTemplate">
-                        <views:ItemFilterSectionView Margin="1" />
+                    <DataTemplate DataType="{x:Type viewModels:ItemFilterCommentBlockViewModel}">
+                        <views:ItemFilterCommentBlockView Margin="1" />
                     </DataTemplate>
-                    <views:BlockTemplateSelector x:Key="BlockTemplateSelector" />
                 </ResourceDictionary>
                 <ResourceDictionary Source="ExpanderStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
@@ -36,14 +37,14 @@
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/> 
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Border Grid.Row="0" BorderThickness="1" BorderBrush="DarkGray"  Margin="5,5,5,0">
             <StackPanel Margin="2,2,2,2">
                 <Expander Style="{StaticResource ExpanderRightAlignStyle}">
                     <Expander.Header>
-                        <TextBlock Text="Script Description" VerticalAlignment="Center" /> 
+                        <TextBlock Text="Script Description" VerticalAlignment="Center" />
                     </Expander.Header>
                     <Grid>
                         <TextBox Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}" Margin="5" MaxLines="20" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" />
@@ -59,9 +60,9 @@
                                                    BorderThickness="0"
                                                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                                    VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                                   ItemTemplateSelector="{StaticResource BlockTemplateSelector}"
-                                                   attachedProperties:SelectingItemAttachedProperty.SelectingItem="{Binding SectionBrowserSelectedBlockViewModel}"
-                                                   SelectedItem="{Binding SelectedBlockViewModel}" x:Name="BlocksListBox">
+                                                   attachedProperties:SelectingItemAttachedProperty.SelectingItem="{Binding CommentBlockBrowserBrowserSelectedBlockViewModel}"
+                                                   SelectedItem="{Binding SelectedBlockViewModel}">
+                    <!--ItemTemplateSelector="{StaticResource BlockTemplateSelector}"-->
                     <ListBox.InputBindings>
                         <KeyBinding Key="Delete" Command="{Binding DeleteBlockCommand}" />
                     </ListBox.InputBindings>
diff --git a/Filtration/Views/MainWindow.xaml b/Filtration/Views/MainWindow.xaml
index 46b6ac2..e914d0d 100644
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@@ -9,15 +9,24 @@
         xmlns:viewsAvalonDock="clr-namespace:Filtration.Views.AvalonDock"
         xmlns:views="clr-namespace:Filtration.Views"
         xmlns:gif="http://wpfanimatedgif.codeplex.com"
+        xmlns:utility="clr-namespace:Filtration.Utility"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
         Title="{Binding WindowTitle}" Height="762" Width="1126" IsIconVisible="True"
         Closing="MainWindow_OnClosing" Drop="MainWindow_OnDrop" AllowDrop="True">
+
     <fluent:RibbonWindow.InputBindings>
         <KeyBinding Command="{Binding SaveCommand}" Modifiers="Control" Key="S" />
         <KeyBinding Command="{Binding OpenScriptCommand}" Modifiers="Control" Key="O" />
         <KeyBinding Command="{Binding NewScriptCommand}" Modifiers="Control" Key="N" />
+        
+        <!-- Undo/Redo support incomplete -->
+        <!--<KeyBinding Command="{Binding UndoCommand}" Modifiers="Control" Key="Z" />
+        <KeyBinding Command="{Binding RedoCommand}" Modifiers="Control" Key="Y" />-->
     </fluent:RibbonWindow.InputBindings>
+    <utility:RoutedCommandHandlers.Commands>
+        <utility:RoutedCommandHandler RoutedCommand="{StaticResource OpenScriptRoutedCommand}" Command="{Binding OpenScriptCommand}" />
+    </utility:RoutedCommandHandlers.Commands>
     <DockPanel x:Name="RootDockPanel">
         <fluent:Ribbon DockPanel.Dock="Top" x:Name="RibbonRoot" IsEnabled="{Binding ShowLoadingBanner, Converter={StaticResource BoolInverterConverter}}">
             <fluent:Ribbon.Menu>
@@ -27,7 +36,7 @@
                             <fluent:BackstageTabItem.ContentTemplate>
                                 <DataTemplate>
                                     <StackPanel>
-                                    <TextBlock Margin="20">Recent Documents will go here in a future release.</TextBlock>
+                                        <TextBlock Margin="20">Recent Documents will go here in a future release.</TextBlock>
                                     </StackPanel>
                                 </DataTemplate>
                             </fluent:BackstageTabItem.ContentTemplate>
@@ -67,7 +76,7 @@
             </fluent:Ribbon.ContextualGroups>
             <fluent:RibbonTabItem Header="View">
                 <fluent:RibbonGroupBox Header="Tools">
-                    <fluent:ToggleButton Header="Section Browser" Width="150" Size="Middle" Icon="{StaticResource AddSectionIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.SectionBrowserViewModel.IsVisible}"/>
+                    <fluent:ToggleButton Header="Section Browser" Width="150" Size="Middle" Icon="{StaticResource AddSectionIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.CommentBlockBrowserViewModel.IsVisible}"/>
                     <fluent:ToggleButton Header="Block Group Browser" SizeDefinition="Middle" Icon="{StaticResource BlockGroupBrowserIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.BlockGroupBrowserViewModel.IsVisible}" />
                     <fluent:ToggleButton Header="Block Output Preview" SizeDefinition="Middle" Icon="{StaticResource BlockOutputPreviewIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.BlockOutputPreviewViewModel.IsVisible}" />
                 </fluent:RibbonGroupBox>
@@ -80,6 +89,12 @@
                     <fluent:Button Header="Paste Style" Command="{Binding PasteBlockStyleCommand}" Icon="{StaticResource PasteStyleIcon}" LargeIcon="{StaticResource PasteIcon}" SizeDefinition="Middle" ToolTip="Paste Style (Ctrl+Shift+V)" />
                     <fluent:Button Header="Copy Script" Command="{Binding CopyScriptCommand}" Icon="{StaticResource CopyIcon}" LargeIcon="{StaticResource PasteIcon}" SizeDefinition="Middle" />
                 </fluent:RibbonGroupBox>
+
+                <!-- Undo/Redo support incomplete -->
+                <!--<fluent:RibbonGroupBox Header="Undo">
+                    <fluent:Button Header="Undo" Command="{Binding UndoCommand}"  ToolTip="Undo" SizeDefinition="Middle" Icon="{StaticResource UndoIcon}" />
+                    <fluent:Button Header="Redo" Command="{Binding RedoCommand}" ToolTip="Redo" SizeDefinition="Middle" Icon="{StaticResource RedoIcon}" />
+                </fluent:RibbonGroupBox>-->
                 <fluent:RibbonGroupBox Header="Blocks">
                     <fluent:Button Header="Add Block" Command="{Binding AddBlockCommand}" SizeDefinition="Middle" Icon="{StaticResource AddBlockIcon}" />
                     <fluent:Button Header="Add Section" Command="{Binding AddSectionCommand}" SizeDefinition="Middle" Icon="{StaticResource AddSectionIcon}" />
@@ -146,4 +161,5 @@
         </Grid>
     </DockPanel>
 </fluent:RibbonWindow>
+ 
  
\ No newline at end of file
diff --git a/Filtration/Views/ToolPanes/SectionBrowserView.xaml b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
similarity index 70%
rename from Filtration/Views/ToolPanes/SectionBrowserView.xaml
rename to Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
index 5a34ece..13ec390 100644
--- a/Filtration/Views/ToolPanes/SectionBrowserView.xaml
+++ b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
@@ -1,19 +1,19 @@
-<UserControl x:Class="Filtration.Views.ToolPanes.SectionBrowserView"
+<UserControl x:Class="Filtration.Views.ToolPanes.CommentBlockBrowserView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:converters="clr-namespace:Filtration.Converters"
              xmlns:toolPanes="clr-namespace:Filtration.ViewModels.ToolPanes"
-             d:DataContext="{d:DesignInstance Type=toolPanes:SectionBrowserViewModel}"
+             d:DataContext="{d:DesignInstance Type=toolPanes:CommentBlockBrowserViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <converters:HashSignRemovalConverter x:Key="HashSignRemovalConverter" />
     </UserControl.Resources>
     <Grid>
-        <ListBox ItemsSource="{Binding SectionBlockViewModels}"
-                             SelectedItem="{Binding SelectedSectionBlockViewModel}"
+        <ListBox ItemsSource="{Binding ItemFilterCommentBlockViewModels}"
+                             SelectedItem="{Binding SelectedItemFilterCommentBlockViewModel}"
                              x:Name="SectionBrowserListBox"
                              ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
             <ListBox.Resources>
@@ -21,7 +21,7 @@
             </ListBox.Resources>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding BlockDescription, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding BlockDescription}" />
+                    <TextBlock Text="{Binding Comment, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Comment}" />
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
diff --git a/Filtration/Views/ToolPanes/SectionBrowserView.xaml.cs b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml.cs
similarity index 55%
rename from Filtration/Views/ToolPanes/SectionBrowserView.xaml.cs
rename to Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml.cs
index bd977be..5e9b6da 100644
--- a/Filtration/Views/ToolPanes/SectionBrowserView.xaml.cs
+++ b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml.cs
@@ -1,8 +1,8 @@
 namespace Filtration.Views.ToolPanes
 {
-    public partial class SectionBrowserView
+    public partial class CommentBlockBrowserView
     {
-        public SectionBrowserView()
+        public CommentBlockBrowserView()
         {
             InitializeComponent();
         }
diff --git a/Filtration/WindsorInstallers/ServicesInstaller.cs b/Filtration/WindsorInstallers/ServicesInstaller.cs
index ec3b2e4..d96e5a1 100644
--- a/Filtration/WindsorInstallers/ServicesInstaller.cs
+++ b/Filtration/WindsorInstallers/ServicesInstaller.cs
@@ -2,7 +2,6 @@
 using Castle.MicroKernel.SubSystems.Configuration;
 using Castle.Windsor;
 using Filtration.Services;
-using Filtration.Utilities;
 
 namespace Filtration.WindsorInstallers
 {
@@ -20,11 +19,6 @@ namespace Filtration.WindsorInstallers
                     .ImplementedBy<StaticDataService>()
                     .LifeStyle.Singleton);
 
-            container.Register(
-                Component.For<IBlockGroupMapper>()
-                    .ImplementedBy<BlockGroupMapper>()
-                    .LifeStyle.Singleton);
-
             container.Register(
                 Component.For<IHTTPService>()
                     .ImplementedBy<HTTPService>()
diff --git a/Filtration/WindsorInstallers/ViewModelsInstaller.cs b/Filtration/WindsorInstallers/ViewModelsInstaller.cs
index d002ac1..30afd6e 100644
--- a/Filtration/WindsorInstallers/ViewModelsInstaller.cs
+++ b/Filtration/WindsorInstallers/ViewModelsInstaller.cs
@@ -3,6 +3,7 @@ using Castle.MicroKernel.Registration;
 using Castle.MicroKernel.SubSystems.Configuration;
 using Castle.Windsor;
 using Filtration.ViewModels;
+using Filtration.ViewModels.Factories;
 using Filtration.ViewModels.ToolPanes;
 
 namespace Filtration.WindsorInstallers
@@ -26,6 +27,11 @@ namespace Filtration.WindsorInstallers
                     .ImplementedBy<ItemFilterBlockViewModel>()
                     .LifeStyle.Transient);
 
+            container.Register(
+                Component.For<IItemFilterCommentBlockViewModel>()
+                    .ImplementedBy<ItemFilterCommentBlockViewModel>()
+                    .LifeStyle.Transient);
+
             container.Register(
                 Component.For<IItemFilterScriptViewModel>()
                     .ImplementedBy<ItemFilterScriptViewModel>()
@@ -42,8 +48,8 @@ namespace Filtration.WindsorInstallers
                     .LifeStyle.Singleton);
 
             container.Register(
-                Component.For<ISectionBrowserViewModel>()
-                    .ImplementedBy<SectionBrowserViewModel>()
+                Component.For<ICommentBlockBrowserViewModel>()
+                    .ImplementedBy<CommentBlockBrowserViewModel>()
                     .LifeStyle.Singleton);
 
             container.Register(
@@ -69,8 +75,16 @@ namespace Filtration.WindsorInstallers
             container.Register(
                 Component.For<IItemFilterBlockViewModelFactory>().AsFactory());
 
+            container.Register(
+                Component.For<IItemFilterCommentBlockViewModelFactory>().AsFactory());
+
             container.Register(
                 Component.For<IItemFilterScriptViewModelFactory>().AsFactory());
+            
+            container.Register(
+                Component.For<IItemFilterBlockBaseViewModelFactory>()
+                    .ImplementedBy<ItemFilterBlockBaseViewModelFactory>()
+                    .LifeStyle.Singleton);
         }
     }
 }
diff --git a/Filtration/packages.config b/Filtration/packages.config
index da3f499..d24e04a 100644
--- a/Filtration/packages.config
+++ b/Filtration/packages.config
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="4.2.1" targetFramework="net461" />
+  <package id="AutoMapper" version="6.0.2" targetFramework="net461" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
+  <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
-  <package id="ControlzEx" version="2.1.2.3" targetFramework="net461" />
+  <package id="ControlzEx" version="2.2.0.4" targetFramework="net461" />
   <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net461" />
   <package id="Fluent.Ribbon" version="4.0.3.394" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.2.4.0" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.3.7" targetFramework="net461" />
+  <package id="NLog" version="4.4.9" targetFramework="net461" />
   <package id="NLog.Config" version="4.3.7" targetFramework="net461" />
-  <package id="NLog.Schema" version="4.3.7" targetFramework="net461" />
+  <package id="NLog.Schema" version="4.4.9" targetFramework="net461" />
   <package id="WpfAnimatedGif" version="1.4.14" targetFramework="net461" />
   <package id="WPFToolkit" version="3.5.50211.1" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..56a2d0c
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,7 @@
+version: 1.0.{build}-{branch}
+image: Visual Studio 2017
+before_build:
+  - nuget restore
+build:
+  parallel: true
+  verbosity: minimal
\ No newline at end of file